@dynamic-labs/ethereum 0.19.0-alpha.2 → 0.19.0-alpha.21

package/src/walletConnect/fetchWalletConnectWallets.js

@@ -1,57 +1,43 @@
 import { WalletConnectV2 } from './walletConnectV2.js';
 import { WalletConnect } from './walletConnect.js';
 
-// These wallets are either not supported or implement their
-// own WalletConnect connector
-const filteredWalletConnectWallets = [
-    'MetaMask',
-    'Gnosis Safe',
-    'Trust',
-    'lilico',
-    'Keplr',
-    'Zerion',
-    'Rabby',
-    'Exodus',
-    'OKX Wallet',
-];
-const fetchWalletConnectWallets = ({ isWalletConnectV2Enabled, walletBook, }) => {
-    var _a;
-    return Object.values((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {})
-        .filter((wallet) => wallet.walletConnect &&
-        !filteredWalletConnectWallets.includes(wallet.shortName || wallet.name))
-        .map((wallet) => {
-        var _a;
-        const { shortName } = wallet;
-        const name = shortName || wallet.name;
-        // justification: we filtered out null/undefined above
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        if (isWalletConnectV2Enabled &&
-            ((_a = wallet.walletConnect.sdks) === null || _a === void 0 ? void 0 : _a.includes('sign_v2'))) {
-            return class extends WalletConnectV2 {
-                constructor(props) {
-                    super(Object.assign(Object.assign({}, props), { walletName: name }));
-                }
-            };
-        }
-        else {
-            return class extends WalletConnect {
-                constructor(props) {
-                    super(Object.assign(Object.assign({}, props), { walletName: name }));
-                }
-            };
-        }
-    });
-};
-const getWalletConnectConnector = ({ isWalletConnectV2Enabled, }) => isWalletConnectV2Enabled
-    ? class extends WalletConnectV2 {
-        constructor(props) {
-            super(Object.assign(Object.assign({}, props), { walletName: 'WalletConnect' }));
-        }
-    }
-    : class extends WalletConnect {
-        constructor(props) {
-            super(Object.assign(Object.assign({}, props), { walletName: 'WalletConnect' }));
-        }
+const fetchWalletConnectWallets = ({ isWalletConnectV2Enabled, walletBook, }) => {
+    var _a;
+    return Object.values((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {})
+        .filter((wallet) => wallet.walletConnect && !wallet.filterFromWalletConnect)
+        .map((wallet) => {
+        var _a;
+        const { shortName } = wallet;
+        const name = shortName || wallet.name;
+        // justification: we filtered out null/undefined above
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        if (isWalletConnectV2Enabled &&
+            ((_a = wallet.walletConnect.sdks) === null || _a === void 0 ? void 0 : _a.includes('sign_v2'))) {
+            return class extends WalletConnectV2 {
+                constructor(props) {
+                    super(Object.assign(Object.assign({}, props), { walletName: name }));
+                }
+            };
+        }
+        else {
+            return class extends WalletConnect {
+                constructor(props) {
+                    super(Object.assign(Object.assign({}, props), { walletName: name }));
+                }
+            };
+        }
+    });
+};
+const getWalletConnectConnector = ({ isWalletConnectV2Enabled, }) => isWalletConnectV2Enabled
+    ? class extends WalletConnectV2 {
+        constructor(props) {
+            super(Object.assign(Object.assign({}, props), { walletName: 'WalletConnect' }));
+        }
+    }
+    : class extends WalletConnect {
+        constructor(props) {
+            super(Object.assign(Object.assign({}, props), { walletName: 'WalletConnect' }));
+        }
     };
 
-export { fetchWalletConnectWallets, filteredWalletConnectWallets, getWalletConnectConnector };
+export { fetchWalletConnectWallets, getWalletConnectConnector };

package/src/walletConnect/index.d.ts

@@ -1,3 +1,3 @@
-export { WalletConnectV2, type WalletConnectorV2Opts } from './walletConnectV2';
-export { WalletConnect } from './walletConnect';
-export { fetchWalletConnectWallets } from './fetchWalletConnectWallets';
+export { WalletConnectV2, type WalletConnectorV2Opts } from './walletConnectV2';
+export { WalletConnect } from './walletConnect';
+export { fetchWalletConnectWallets } from './fetchWalletConnectWallets';

package/src/walletConnect/walletConnect.cjs

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../_virtual/_tslib.cjs');
 var WalletConnectProvider = require('@walletconnect/ethereum-provider');
-var ethers = require('ethers');
+var viem = require('viem');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var walletBook = require('@dynamic-labs/wallet-book');
 var utils = require('@dynamic-labs/utils');
@@ -16,135 +16,136 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var WalletConnectProvider__default = /*#__PURE__*/_interopDefaultLegacy(WalletConnectProvider);
 
-class WalletConnect extends EthWalletConnector.EthWalletConnector {
-    constructor(_a) {
-        var { walletConnectV1Bridge, walletName } = _a, props = _tslib.__rest(_a, ["walletConnectV1Bridge", "walletName"]);
-        super(props);
-        this.supportedChains = ['EVM', 'ETH'];
-        this.connectedChain = 'EVM';
-        this.bridge = 'https://bridge.walletconnect.org';
-        this.canConnectViaQrCode = true;
-        this.isWalletConnect = true;
-        this.switchNetworkOnlyFromWallet = false;
-        this.name = walletName;
-        if (walletConnectV1Bridge) {
-            this.bridge = walletConnectV1Bridge;
-        }
-    }
-    getClient() {
-        if (this.client) {
-            return this.client;
-        }
-        this.client = client.initClient(walletConnectorCore.normalizeWalletName(this.name), this.bridge, this.clientOptions);
-        return this.client;
-    }
-    supportsNetworkSwitching() {
-        if (this.connectedChain === 'EVM') {
-            return true;
-        }
-        else {
-            const client = this.getClient();
-            return Boolean(client === null || client === void 0 ? void 0 : client.chainId);
-        }
-    }
-    setupEventListeners(listeners) {
-        client.setupWalletConnectEventListeners({
-            onAccountChange: listeners.onAccountChange,
-            onChainChange: listeners.onChainChange,
-            onDisconnect: listeners.onDisconnect,
-        }, this.getClient());
-    }
-    teardownEventListeners() {
-        client.teardownWalletConnectEventListeners(this.getClient());
-    }
-    getWeb3Provider() {
-        const client = this.getClient();
-        return client
-            ? new ethers.ethers.providers.Web3Provider(new WalletConnectProvider__default["default"]({
-                connector: client,
-                infuraId: constants.INFURA_ID,
-                rpc: this.evmNetworkRpcMap(),
-            }), 'any')
-            : undefined;
-    }
-    fetchPublicAddress(opts) {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
-            return client.fetchWalletConnectEVMPublicAddress(walletBook.getWalletBookWallet(this.walletBook, this.name), this.getClient(), Object.assign(Object.assign({}, opts), { onConnect: (payload) => {
-                    var _a;
-                    (_a = opts === null || opts === void 0 ? void 0 : opts.onConnect) === null || _a === void 0 ? void 0 : _a.call(opts, payload);
-                    this.connectedChain = payload.params[0].chainId ? 'EVM' : 'SOL';
-                } }));
-        });
-    }
-    getDeepLink() {
-        var _a;
-        const wallet = walletBook.getWalletBookWallet(this.walletBook, this.name);
-        if (!utils.isMobile() && !((_a = wallet.desktop) === null || _a === void 0 ? void 0 : _a.native)) {
-            return undefined;
-        }
-        return walletConnectorCore.getDeepLink({
-            metadata: wallet,
-            mode: 'regular',
-            uri: this.getClient().uri,
-        });
-    }
-    signMessage(messageToSign) {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
-            return client.signWalletConnectPersonalMessage(messageToSign, walletBook.getWalletBookWallet(this.walletBook, this.name), this.getClient(), 
-            // don't call getRpcProvider until we really need to
-            () => _tslib.__awaiter(this, void 0, void 0, function* () { return this.getRpcProvider(); }));
-        });
-    }
-    endSession() {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
-            client.killWalletConnectSession(this.getClient());
-        });
-    }
-    providerSwitchNetwork({ network, provider, }) {
-        const _super = Object.create(null, {
-            providerSwitchNetwork: { get: () => super.providerSwitchNetwork }
-        });
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
-            const client = this.getClient();
-            const currentNetworkId = yield this.getNetwork();
-            if (currentNetworkId && currentNetworkId === network.chainId) {
-                return;
-            }
-            if (this.switchNetworkOnlyFromWallet !== undefined &&
-                this.switchNetworkOnlyFromWallet) {
-                throw new utils.DynamicError('Network switching is only supported through the wallet');
-            }
-            if (!this.supportsNetworkSwitching()) {
-                throw new utils.DynamicError('Network switching not supported');
-            }
-            if (!client) {
-                throw new utils.DynamicError('Client not found');
-            }
-            if (utils.isMobile()) {
-                const deepLink = walletConnectorCore.getDeepLink({
-                    metadata: walletBook.getWalletBookWallet(this.walletBook, this.name),
-                    mode: 'regular',
-                    uri: client.uri,
-                });
-                window.location.href = deepLink;
-            }
-            return _super.providerSwitchNetwork.call(this, { network, provider });
-        });
-    }
-    getConnectedAccounts() {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
-            const client = this.getClient();
-            if (!client.connected)
-                return [];
-            return client.accounts;
-        });
-    }
-    getSession() {
-        var _a;
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
-            return (_a = this.client) === null || _a === void 0 ? void 0 : _a.session;
-        });
-    }
+class WalletConnect extends EthWalletConnector.EthWalletConnector {
+    constructor(_a) {
+        var { walletConnectV1Bridge, walletName } = _a, props = _tslib.__rest(_a, ["walletConnectV1Bridge", "walletName"]);
+        super(props);
+        this.supportedChains = ['EVM', 'ETH'];
+        this.connectedChain = 'EVM';
+        this.bridge = 'https://bridge.walletconnect.org';
+        this.canConnectViaQrCode = true;
+        this.isWalletConnect = true;
+        this.switchNetworkOnlyFromWallet = false;
+        this.name = walletName;
+        if (walletConnectV1Bridge) {
+            this.bridge = walletConnectV1Bridge;
+        }
+        this.deepLinkPreference = props.deepLinkPreference || 'native';
+    }
+    getClient() {
+        if (this.client) {
+            return this.client;
+        }
+        this.client = client.initClient(walletConnectorCore.normalizeWalletName(this.name), this.bridge, this.clientOptions);
+        return this.client;
+    }
+    supportsNetworkSwitching() {
+        if (this.connectedChain === 'EVM') {
+            return true;
+        }
+        else {
+            const client = this.getClient();
+            return Boolean(client === null || client === void 0 ? void 0 : client.chainId);
+        }
+    }
+    setupEventListeners() {
+        client.setupWalletConnectEventListeners(this, this.getClient());
+    }
+    teardownEventListeners() {
+        client.teardownWalletConnectEventListeners(this.getClient());
+    }
+    getWalletClient() {
+        const client = this.getClient();
+        return client
+            ? viem.createWalletClient({
+                transport: viem.custom(new WalletConnectProvider__default["default"]({
+                    connector: client,
+                    infuraId: constants.INFURA_ID,
+                    rpc: this.evmNetworkRpcMap(),
+                })),
+            })
+            : undefined;
+    }
+    fetchPublicAddress(opts) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            return client.fetchWalletConnectEVMPublicAddress(walletBook.getWalletBookWallet(this.walletBook, this.key), this.getClient(), this.deepLinkPreference, Object.assign(Object.assign({}, opts), { onConnect: (payload) => {
+                    var _a;
+                    (_a = opts === null || opts === void 0 ? void 0 : opts.onConnect) === null || _a === void 0 ? void 0 : _a.call(opts, payload);
+                    this.connectedChain = payload.params[0].chainId ? 'EVM' : 'SOL';
+                } }));
+        });
+    }
+    getDeepLink() {
+        var _a;
+        const wallet = walletBook.getWalletBookWallet(this.walletBook, this.key);
+        if (!utils.isMobile() && !((_a = wallet.desktop) === null || _a === void 0 ? void 0 : _a.native)) {
+            return undefined;
+        }
+        return walletConnectorCore.getDeepLink({
+            metadata: wallet,
+            mode: 'regular',
+            preference: this.deepLinkPreference,
+            uri: this.getClient().uri,
+        });
+    }
+    signMessage(messageToSign) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            return client.signWalletConnectPersonalMessage(messageToSign, walletBook.getWalletBookWallet(this.walletBook, this.key), this.getClient(), this.deepLinkPreference, 
+            // don't call getPublicClient until we really need to
+            () => _tslib.__awaiter(this, void 0, void 0, function* () { return this.getPublicClient(); }));
+        });
+    }
+    endSession() {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            client.killWalletConnectSession(this.getClient());
+        });
+    }
+    providerSwitchNetwork({ network, provider, }) {
+        const _super = Object.create(null, {
+            providerSwitchNetwork: { get: () => super.providerSwitchNetwork }
+        });
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const client = this.getClient();
+            const currentNetworkId = yield this.getNetwork();
+            if (currentNetworkId && currentNetworkId === network.chainId) {
+                return;
+            }
+            if (this.switchNetworkOnlyFromWallet !== undefined &&
+                this.switchNetworkOnlyFromWallet) {
+                throw new utils.DynamicError('Network switching is only supported through the wallet');
+            }
+            if (!this.supportsNetworkSwitching()) {
+                throw new utils.DynamicError('Network switching not supported');
+            }
+            if (!client) {
+                throw new utils.DynamicError('Client not found');
+            }
+            if (utils.isMobile()) {
+                const deepLink = walletConnectorCore.getDeepLink({
+                    metadata: walletBook.getWalletBookWallet(this.walletBook, this.key),
+                    mode: 'regular',
+                    preference: this.deepLinkPreference,
+                    uri: client.uri,
+                });
+                window.location.href = deepLink;
+            }
+            return _super.providerSwitchNetwork.call(this, { network, provider });
+        });
+    }
+    getConnectedAccounts() {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const client = this.getClient();
+            if (!client.connected)
+                return [];
+            return client.accounts;
+        });
+    }
+    getSession() {
+        var _a;
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            return (_a = this.client) === null || _a === void 0 ? void 0 : _a.session;
+        });
+    }
 }
 
 exports.WalletConnect = WalletConnect;

package/src/walletConnect/walletConnect.d.ts

@@ -1,50 +1,52 @@
-import Client from '@walletconnect/client';
-import { ethers } from 'ethers';
-import { Chain, FetchPublicAddressOpts, WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
-import { EvmNetwork } from '@dynamic-labs/types';
-import { EthWalletConnector, EthWalletConnectorOpts } from '../EthWalletConnector';
-type ConnectorSession = {
-    connected: boolean;
-    accounts: string[];
-    chainId: number;
-    bridge: string;
-    key: string;
-    clientId: string;
-    clientMeta: any;
-    peerId: string;
-    peerMeta: any;
-    handshakeId: number;
-    handshakeTopic: string;
-};
-export type WalletConnectOpts = EthWalletConnectorOpts & {
-    walletConnectV1Bridge: string;
-    walletName: string;
-};
-export declare class WalletConnect extends EthWalletConnector {
-    supportedChains: Chain[];
-    connectedChain: Chain;
-    name: string;
-    bridge: string;
-    canConnectViaQrCode: boolean;
-    isWalletConnect: boolean;
-    switchNetworkOnlyFromWallet: boolean;
-    client?: Client;
-    clientOptions?: any;
-    constructor({ walletConnectV1Bridge, walletName, ...props }: WalletConnectOpts);
-    getClient(): Client;
-    supportsNetworkSwitching(): boolean;
-    setupEventListeners(listeners: WalletEventListeners): void;
-    teardownEventListeners(): void;
-    getWeb3Provider(): ethers.providers.Web3Provider | undefined;
-    fetchPublicAddress(opts?: FetchPublicAddressOpts): Promise<string | undefined>;
-    getDeepLink(): string | undefined;
-    signMessage(messageToSign: string): Promise<string | undefined>;
-    endSession(): Promise<void>;
-    providerSwitchNetwork({ network, provider, }: {
-        network: EvmNetwork;
-        provider: ethers.providers.Web3Provider;
-    }): Promise<void>;
-    getConnectedAccounts(): Promise<string[]>;
-    getSession(): Promise<ConnectorSession | undefined>;
-}
-export {};
+import Client from '@walletconnect/client';
+import { Hex, WalletClient } from 'viem';
+import { Chain, FetchPublicAddressOpts, DeepLinkVariant } from '@dynamic-labs/wallet-connector-core';
+import { EvmNetwork } from '@dynamic-labs/types';
+import { EthWalletConnector, EthWalletConnectorOpts } from '../EthWalletConnector';
+type ConnectorSession = {
+    connected: boolean;
+    accounts: string[];
+    chainId: number;
+    bridge: string;
+    key: string;
+    clientId: string;
+    clientMeta: any;
+    peerId: string;
+    peerMeta: any;
+    handshakeId: number;
+    handshakeTopic: string;
+};
+export type WalletConnectOpts = EthWalletConnectorOpts & {
+    walletConnectV1Bridge: string;
+    walletName: string;
+    deepLinkPreference?: DeepLinkVariant;
+};
+export declare class WalletConnect extends EthWalletConnector {
+    supportedChains: Chain[];
+    connectedChain: Chain;
+    name: string;
+    bridge: string;
+    canConnectViaQrCode: boolean;
+    isWalletConnect: boolean;
+    switchNetworkOnlyFromWallet: boolean;
+    private deepLinkPreference;
+    client?: Client;
+    clientOptions?: any;
+    constructor({ walletConnectV1Bridge, walletName, ...props }: WalletConnectOpts);
+    getClient(): Client;
+    supportsNetworkSwitching(): boolean;
+    setupEventListeners(): void;
+    teardownEventListeners(): void;
+    getWalletClient(): WalletClient | undefined;
+    fetchPublicAddress(opts?: FetchPublicAddressOpts): Promise<string | undefined>;
+    getDeepLink(): string | undefined;
+    signMessage(messageToSign: string): Promise<string | undefined>;
+    endSession(): Promise<void>;
+    providerSwitchNetwork({ network, provider, }: {
+        network: EvmNetwork;
+        provider: WalletClient;
+    }): Promise<void>;
+    getConnectedAccounts(): Promise<Hex[]>;
+    getSession(): Promise<ConnectorSession | undefined>;
+}
+export {};