@dynamic-labs/multi-wallet 0.16.17-viem.0 → 0.16.17

package/CHANGELOG.md

@@ -1,10 +1,11 @@
 
-### [0.16.17-viem.0](https://github.com/dynamic-labs/DynamicAuth/compare/v0.16.16...v0.16.17-viem.0) (2023-05-12)
+### [0.16.17](https://github.com/dynamic-labs/DynamicAuth/compare/v0.16.16...v0.16.17) (2023-05-30)
 
 
-### Features
+### Bug Fixes
 
-* replace ethers with viem ([995baa0](https://github.com/dynamic-labs/DynamicAuth/commit/995baa05fe13681e24388c55a6639779a88d78df))
+* **DYN-2327:** user profile is not loaded properly on the first load ([#2125](https://github.com/dynamic-labs/DynamicAuth/issues/2125)) ([aeeb5c2](https://github.com/dynamic-labs/DynamicAuth/commit/aeeb5c24e5d62caab0b17575b03a0fb452a7e6a2))
+* use getWalletLinks in handleMobileWalletFilter ([#2185](https://github.com/dynamic-labs/DynamicAuth/issues/2185)) ([#2186](https://github.com/dynamic-labs/DynamicAuth/issues/2186)) ([c542f3c](https://github.com/dynamic-labs/DynamicAuth/commit/c542f3c83cc229daa60a2de146823530285ea028))
 
 ### [0.16.16](https://github.com/dynamic-labs/DynamicAuth/compare/v0.16.15...v0.16.16) (2023-05-11)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/multi-wallet",
-  "version": "0.16.17-viem.0",
+  "version": "0.16.17",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -10,9 +10,9 @@
     "buffer": "^6.0.3",
     "deepmerge": "^4.3.1",
     "@dynamic-labs/sdk-api": "0.0.174",
-    "@dynamic-labs/wallet-book": "^0.0.14",
+    "@dynamic-labs/wallet-book": "^0.0.18",
     "starknet": "^3.19.0",
-    "viem": "^0.3.22",
+    "ethers": "^5.7.2",
     "@randlabs/myalgo-connect": "^1.4.2",
     "@solana/web3.js": "^1.70.1",
     "@coinbase/wallet-sdk": "^3.6.4",
@@ -28,8 +28,8 @@
     "magic-sdk": "^16.0.1",
     "@keplr-wallet/provider": "0.11.56",
     "@keplr-wallet/types": "^0.11.51",
-    "@dynamic-labs/logger": "0.16.17-viem.0",
-    "@dynamic-labs/wallet-connector-core": "0.16.17-viem.0"
+    "@dynamic-labs/logger": "0.16.17",
+    "@dynamic-labs/wallet-connector-core": "0.16.17"
   },
   "devDependencies": {
     "@walletconnect/types": "^2.2.1"

package/src/multi-wallet.cjs

@@ -24,6 +24,7 @@ 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');
@@ -33,7 +34,7 @@ var getWalletConnectConnector = require('./wallets/getWalletConnectConnector.cjs
 var initializeWalletProviders = require('./wallets/initializeWalletProviders.cjs');
 var Dawn = require('./wallets/ethereum/injected/Dawn.cjs');
 var PhantomEvm = require('./wallets/ethereum/injected/PhantomEvm.cjs');
-require('viem');
+require('ethers');
 require('./utils/logger.cjs');
 require('./wallets/ethereum/MagicConnector/MagicClientNetworkHandler/MagicClientNetworkHandler.cjs');
 var EmailOTPMagicWalletConnector = require('./wallets/ethereum/MagicConnector/EmailOTPMagicWalletConnector/EmailOTPMagicWalletConnector.cjs');
@@ -112,7 +113,7 @@ const getSupportedWallets = ({ appLogoUrl, appName, isWalletConnectV2Enabled, ne
         new slope({ solNetworks: solanaNetworkConfigs }),
         new dapper({ appLogoUrl, appName }),
         new blocto({ appLogoUrl, appName }),
-        // new BloctoEvm({ evmNetworks: evmNetworkConfigs }),
+        new BloctoEvm({ evmNetworks: evmNetworkConfigs }),
         new BloctoInjected({ evmNetworks: evmNetworkConfigs }),
         getWalletConnectConnector.getWalletConnectConnector({
             evmNetworks: evmNetworkConfigs,
@@ -191,10 +192,10 @@ const filterWalletsForPlatform = (wallets) => wallets.filter((wallet) => {
         return true;
     }
     else {
-        return handleMobileWalletFilter(wallet, metadata);
+        return handleMobileWalletFilter(wallet.name, metadata);
     }
 });
-const handleMobileWalletFilter = (wallet, metadata) => {
+const handleMobileWalletFilter = (walletName, metadata) => {
     if (!metadata.mobile)
         return false;
     /**
@@ -205,20 +206,14 @@ const handleMobileWalletFilter = (wallet, metadata) => {
      */
     const hasWalletConnectLink = Boolean(metadata.mobile.universal) || Boolean(metadata.mobile.native);
     const isWalletConnectWallet = metadata.walletConnect !== undefined;
-    /**
-     * wallets-links.json is the source of truth for wallet support on mobile platforms.
-     * 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()) {
-        const hasIOSLink = metadata.mobile.iosId !== undefined;
+        const hasIOSLink = Boolean(walletBook.getWalletLinks(walletName).ios);
         return !isWalletConnectWallet
             ? hasIOSLink
             : hasIOSLink && hasWalletConnectLink;
-        // It is an android device
     }
     else {
-        const hasAndroidLink = metadata.mobile.androidId !== undefined;
+        const hasAndroidLink = Boolean(walletBook.getWalletLinks(walletName).android);
         return !isWalletConnectWallet
             ? hasAndroidLink
             : hasAndroidLink && hasWalletConnectLink;

package/src/multi-wallet.js

@@ -1,5 +1,5 @@
 import { __awaiter } from 'tslib';
-import { getWalletBookWallet } from '@dynamic-labs/wallet-book';
+import { getWalletBookWallet, getWalletLinks } 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';
@@ -20,6 +20,7 @@ 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';
@@ -30,7 +31,7 @@ import { getWalletConnectConnector } from './wallets/getWalletConnectConnector.j
 import { initializeWalletProviders } from './wallets/initializeWalletProviders.js';
 import Dawn from './wallets/ethereum/injected/Dawn.js';
 import PhantomEvm from './wallets/ethereum/injected/PhantomEvm.js';
-import 'viem';
+import 'ethers';
 import './utils/logger.js';
 import './wallets/ethereum/MagicConnector/MagicClientNetworkHandler/MagicClientNetworkHandler.js';
 import { EmailOTPMagicWalletConnector } from './wallets/ethereum/MagicConnector/EmailOTPMagicWalletConnector/EmailOTPMagicWalletConnector.js';
@@ -109,7 +110,7 @@ const getSupportedWallets = ({ appLogoUrl, appName, isWalletConnectV2Enabled, ne
         new Slope({ solNetworks: solanaNetworkConfigs }),
         new Dapper({ appLogoUrl, appName }),
         new Blocto({ appLogoUrl, appName }),
-        // new BloctoEvm({ evmNetworks: evmNetworkConfigs }),
+        new BloctoEvm({ evmNetworks: evmNetworkConfigs }),
         new BloctoInjected({ evmNetworks: evmNetworkConfigs }),
         getWalletConnectConnector({
             evmNetworks: evmNetworkConfigs,
@@ -188,10 +189,10 @@ const filterWalletsForPlatform = (wallets) => wallets.filter((wallet) => {
         return true;
     }
     else {
-        return handleMobileWalletFilter(wallet, metadata);
+        return handleMobileWalletFilter(wallet.name, metadata);
     }
 });
-const handleMobileWalletFilter = (wallet, metadata) => {
+const handleMobileWalletFilter = (walletName, metadata) => {
     if (!metadata.mobile)
         return false;
     /**
@@ -202,20 +203,14 @@ const handleMobileWalletFilter = (wallet, metadata) => {
      */
     const hasWalletConnectLink = Boolean(metadata.mobile.universal) || Boolean(metadata.mobile.native);
     const isWalletConnectWallet = metadata.walletConnect !== undefined;
-    /**
-     * wallets-links.json is the source of truth for wallet support on mobile platforms.
-     * 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 (isIPad() || isIPhone()) {
-        const hasIOSLink = metadata.mobile.iosId !== undefined;
+        const hasIOSLink = Boolean(getWalletLinks(walletName).ios);
         return !isWalletConnectWallet
             ? hasIOSLink
             : hasIOSLink && hasWalletConnectLink;
-        // It is an android device
     }
     else {
-        const hasAndroidLink = metadata.mobile.androidId !== undefined;
+        const hasAndroidLink = Boolean(getWalletLinks(walletName).android);
         return !isWalletConnectWallet
             ? hasAndroidLink
             : hasAndroidLink && hasWalletConnectLink;

package/src/rpcProviders.cjs

@@ -2,9 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var viem = require('viem');
 var web3_js = require('@solana/web3.js');
-var getOrMapViemChain = require('./getOrMapViemChain.cjs');
+var ethers = require('ethers');
 
 const getRpcProviders = (configurations) => {
     const rpcProviders = {};
@@ -12,10 +11,7 @@ const getRpcProviders = (configurations) => {
         rpcProviders.evm = configurations.evm.map((network) => {
             var _a;
             const rpcUrl = ((_a = network.privateCustomerRpcUrls) === null || _a === void 0 ? void 0 : _a[0]) || network.rpcUrls[0];
-            const provider = viem.createPublicClient({
-                chain: getOrMapViemChain.getOrMapViemChain(network),
-                transport: viem.http(rpcUrl),
-            });
+            const provider = new ethers.ethers.providers.JsonRpcProvider(rpcUrl, network.chainId);
             return {
                 chainId: network.chainId,
                 chainName: network.chainName,

package/src/rpcProviders.js

@@ -1,6 +1,5 @@
-import { createPublicClient, http } from 'viem';
 import { Connection } from '@solana/web3.js';
-import { getOrMapViemChain } from './getOrMapViemChain.js';
+import { ethers } from 'ethers';
 
 const getRpcProviders = (configurations) => {
     const rpcProviders = {};
@@ -8,10 +7,7 @@ const getRpcProviders = (configurations) => {
         rpcProviders.evm = configurations.evm.map((network) => {
             var _a;
             const rpcUrl = ((_a = network.privateCustomerRpcUrls) === null || _a === void 0 ? void 0 : _a[0]) || network.rpcUrls[0];
-            const provider = createPublicClient({
-                chain: getOrMapViemChain(network),
-                transport: http(rpcUrl),
-            });
+            const provider = new ethers.providers.JsonRpcProvider(rpcUrl, network.chainId);
             return {
                 chainId: network.chainId,
                 chainName: network.chainName,

package/src/types.d.ts

@@ -1,5 +1,5 @@
 import { Connection } from '@solana/web3.js';
-import { PublicClient, TransactionReceipt, TransactionRequest } from 'viem';
+import { ethers } from 'ethers';
 import type { NetworkConfiguration } from '@dynamic-labs/sdk-api';
 import { WalletConnector, Chain } from '@dynamic-labs/wallet-connector-core';
 import { EvmNetwork } from './wallets/ethereum/evm-network';
@@ -10,7 +10,7 @@ export type VendorCredentials = {
 export type EvmRpcProvider = {
     chainId: number;
     chainName: string;
-    provider: PublicClient;
+    provider: ethers.providers.JsonRpcProvider;
 };
 export type SolanaRpcProvider = {
     chainId?: number;
@@ -40,23 +40,16 @@ export type GetSupportedWalletsOpts = {
     walletUiUtils?: WalletUiUtils;
 };
 export type GetSupportedWallets = (opts?: GetSupportedWalletsOpts) => Promise<WalletConnector[]>;
-export type Deferrable<T> = {
-    [K in keyof T]: T[K] | Promise<T[K]>;
-};
-interface ArrayLike<T> {
-    readonly [n: number]: T;
-    readonly length: number;
-}
-export type Bytes = ArrayLike<number>;
 export type WalletUiUtils = {
     enableInternalSign: () => void;
     sendTransaction: (props: {
-        handler: (transaction: TransactionRequest) => Promise<TransactionReceipt>;
-        transaction: TransactionRequest;
-    }) => Promise<TransactionReceipt>;
+        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: () => Promise<string>;
-        message: string | Bytes;
+        handler: (message: string | ethers.utils.Bytes) => Promise<string>;
+        message: string | ethers.utils.Bytes;
     }) => Promise<string>;
 };
 export type ChainInfo = {
@@ -69,4 +62,3 @@ export type ChainWihtIcon = {
     icon?: string;
     name: string | undefined;
 };
-export {};

package/src/utils/assignConfirmationScreenToProvider/assignConfirmationScreenToProvider.cjs

@@ -0,0 +1,54 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var tslib = require('tslib');
+var isFunction = require('../isFunction/isFunction.cjs');
+
+const applyJsonRpcSignerGates = (jsonRpcSigner, walletUiUtils, provider) => {
+    const originalSignMessage = jsonRpcSigner.signMessage;
+    const originalSendUncheckedTransaction = jsonRpcSigner.sendUncheckedTransaction;
+    if (isFunction.isFunction(originalSignMessage)) {
+        Object.assign(jsonRpcSigner, {
+            signMessage: (message) => tslib.__awaiter(void 0, void 0, void 0, function* () {
+                return walletUiUtils.signMessage({
+                    handler: originalSignMessage.bind(jsonRpcSigner),
+                    message,
+                });
+            }),
+        });
+    }
+    if (isFunction.isFunction(originalSendUncheckedTransaction)) {
+        Object.assign(jsonRpcSigner, {
+            sendUncheckedTransaction: (transaction) => tslib.__awaiter(void 0, void 0, void 0, function* () {
+                return walletUiUtils.sendTransaction({
+                    handler: originalSendUncheckedTransaction.bind(jsonRpcSigner),
+                    provider,
+                    transaction,
+                });
+            }),
+        });
+    }
+};
+const assignConfirmationScreenToIntermediaryMethods = (parent, walletUiUtils, provider) => {
+    const methods = ['getSigner', 'getUncheckedSigner', 'connectUnchecked'];
+    methods.forEach((methodName) => {
+        const method = parent[methodName];
+        if (!isFunction.isFunction(method)) {
+            return;
+        }
+        Object.assign(parent, {
+            [methodName]: (...args) => {
+                const result = method.bind(parent)(...args);
+                if (typeof result === 'object' && result !== null) {
+                    assignConfirmationScreenToIntermediaryMethods(result, walletUiUtils, provider);
+                    applyJsonRpcSignerGates(result, walletUiUtils, provider);
+                }
+                return result;
+            },
+        });
+    });
+};
+const assignConfirmationScreenToProvider = (provider, walletUiUtils) => assignConfirmationScreenToIntermediaryMethods(provider, walletUiUtils, provider);
+
+exports.assignConfirmationScreenToProvider = assignConfirmationScreenToProvider;

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

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

package/src/utils/assignConfirmationScreenToProvider/assignConfirmationScreenToProvider.js

@@ -0,0 +1,50 @@
+import { __awaiter } from 'tslib';
+import { isFunction } from '../isFunction/isFunction.js';
+
+const applyJsonRpcSignerGates = (jsonRpcSigner, walletUiUtils, provider) => {
+    const originalSignMessage = jsonRpcSigner.signMessage;
+    const originalSendUncheckedTransaction = jsonRpcSigner.sendUncheckedTransaction;
+    if (isFunction(originalSignMessage)) {
+        Object.assign(jsonRpcSigner, {
+            signMessage: (message) => __awaiter(void 0, void 0, void 0, function* () {
+                return walletUiUtils.signMessage({
+                    handler: originalSignMessage.bind(jsonRpcSigner),
+                    message,
+                });
+            }),
+        });
+    }
+    if (isFunction(originalSendUncheckedTransaction)) {
+        Object.assign(jsonRpcSigner, {
+            sendUncheckedTransaction: (transaction) => __awaiter(void 0, void 0, void 0, function* () {
+                return walletUiUtils.sendTransaction({
+                    handler: originalSendUncheckedTransaction.bind(jsonRpcSigner),
+                    provider,
+                    transaction,
+                });
+            }),
+        });
+    }
+};
+const assignConfirmationScreenToIntermediaryMethods = (parent, walletUiUtils, provider) => {
+    const methods = ['getSigner', 'getUncheckedSigner', 'connectUnchecked'];
+    methods.forEach((methodName) => {
+        const method = parent[methodName];
+        if (!isFunction(method)) {
+            return;
+        }
+        Object.assign(parent, {
+            [methodName]: (...args) => {
+                const result = method.bind(parent)(...args);
+                if (typeof result === 'object' && result !== null) {
+                    assignConfirmationScreenToIntermediaryMethods(result, walletUiUtils, provider);
+                    applyJsonRpcSignerGates(result, walletUiUtils, provider);
+                }
+                return result;
+            },
+        });
+    });
+};
+const assignConfirmationScreenToProvider = (provider, walletUiUtils) => assignConfirmationScreenToIntermediaryMethods(provider, walletUiUtils, provider);
+
+export { assignConfirmationScreenToProvider };

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

@@ -0,0 +1 @@
+export { assignConfirmationScreenToProvider } from './assignConfirmationScreenToProvider';

package/src/utils/isFunction/isFunction.cjs

@@ -0,0 +1,8 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+// eslint-disable-next-line @typescript-eslint/ban-types
+const isFunction = (value) => typeof value === 'function';
+
+exports.isFunction = isFunction;

package/src/utils/isFunction/isFunction.js

@@ -0,0 +1,4 @@
+// eslint-disable-next-line @typescript-eslint/ban-types
+const isFunction = (value) => typeof value === 'function';
+
+export { isFunction };

package/src/utils/message.cjs

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var viem = require('viem');
+var utils = require('ethers/lib/utils');
 var logger = require('./logger.cjs');
 var getChainInfo = require('./getChainInfo/getChainInfo.cjs');
 
@@ -44,7 +44,7 @@ const generateMessageToSign = ({ blockchain, domain, chainId, nonce, uri, public
 const getEip55Address = (publicKey, chainId) => {
     try {
         if (chainId) {
-            return viem.getAddress(publicKey);
+            return utils.getAddress(publicKey);
         }
     }
     catch (err) {

package/src/utils/message.js

@@ -1,4 +1,4 @@
-import { getAddress } from 'viem';
+import { getAddress } from 'ethers/lib/utils.js';
 import { logger } from './logger.js';
 import { getChainInfo } from './getChainInfo/getChainInfo.js';
 

package/src/wallets/algorand/myalgo.d.ts

@@ -1,4 +1,5 @@
 import { Connection } from '@solana/web3.js';
+import { ethers } from 'ethers';
 import { Chain, WalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { IMyAlgoSigner } from './myalgoSigner';
 declare class MyAlgo implements WalletConnector {
@@ -25,7 +26,7 @@ declare class MyAlgo implements WalletConnector {
     isInstalledOnBrowser(): boolean;
     supportsNetworkSwitching(): boolean;
     switchNetwork(): Promise<void>;
-    getWeb3Provider(): void | Connection | undefined;
+    getWeb3Provider(): void | ethers.providers.Web3Provider | Connection | undefined;
     getRpcProvider(): Promise<void>;
     setupEventListeners(): void;
     teardownEventListeners(): void;

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

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var walletSdk = require('@coinbase/wallet-sdk');
-var viem = require('viem');
+var utils = require('ethers/lib/utils');
 var errors = require('../../../errors.cjs');
 var constants = require('../../constants.cjs');
 
@@ -58,7 +58,7 @@ const signMessage = (coinbaseProviderOpts, messageToSign) => tslib.__awaiter(voi
     try {
         return yield provider.request({
             method: 'personal_sign',
-            params: [viem.toHex(viem.toBytes(messageToSign)), address.toLowerCase()],
+            params: [utils.hexlify(utils.toUtf8Bytes(messageToSign)), address.toLowerCase()],
         });
     }
     catch (err) {

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

@@ -1,6 +1,6 @@
 import { __awaiter } from 'tslib';
 import { CoinbaseWalletSDK } from '@coinbase/wallet-sdk';
-import { toHex, toBytes } from 'viem';
+import { hexlify, toUtf8Bytes } from 'ethers/lib/utils.js';
 import { DynamicError } from '../../../errors.js';
 import { infuraId } from '../../constants.js';
 
@@ -54,7 +54,7 @@ const signMessage = (coinbaseProviderOpts, messageToSign) => __awaiter(void 0, v
     try {
         return yield provider.request({
             method: 'personal_sign',
-            params: [toHex(toBytes(messageToSign)), address.toLowerCase()],
+            params: [hexlify(toUtf8Bytes(messageToSign)), address.toLowerCase()],
         });
     }
     catch (err) {

package/src/wallets/clients/walletConnect/walletConnect.cjs

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var Client = require('@walletconnect/client');
-var viem = require('viem');
+var ethers = require('ethers');
 var isMobile = require('../../../utils/isMobile.cjs');
 var isSameAddress = require('../../../utils/isSameAddress/isSameAddress.cjs');
 var logger = require('../../../utils/logger.cjs');
@@ -213,7 +213,8 @@ const waitForSafeTransactionOrTimeout = (accountPublicAddress, signature, messag
         if (!rpcProvider) {
             return;
         }
-        const safeTransactionPromise = waitForSafeTransaction(accountPublicAddress, signature, messageToSign, yield rpcProvider());
+        const contract = new ethers.Contract(accountPublicAddress, IS_VALID_SIGNATURE_ABI, yield rpcProvider());
+        const safeTransactionPromise = waitForSafeTransaction(signature, messageToSign, contract);
         const timeoutPromise = new Promise((resolve) => {
             setTimeout(resolve, 120000);
         });
@@ -225,18 +226,13 @@ const waitForSafeTransactionOrTimeout = (accountPublicAddress, signature, messag
 // the transaction is recorded first on the blockchain
 // redcoast verify WILL fail if it attempts to verify the signature
 // that has not yet been properly processed!
-const waitForSafeTransaction = (address, signature, messageToSign, client) => tslib.__awaiter(void 0, void 0, void 0, function* () {
+const waitForSafeTransaction = (signature, messageToSign, contract) => tslib.__awaiter(void 0, void 0, void 0, function* () {
     // wait for safe wallet to finish txn on the blockchain contract
     for (let i = 0; i < 120; i++) {
         try {
             // this will result in an exception if the transaction is still not ready
             // we need to catch it below
-            const result = yield (client === null || client === void 0 ? void 0 : client.readContract({
-                abi: IS_VALID_SIGNATURE_ABI,
-                address: address,
-                args: [viem.hashMessage(messageToSign), signature],
-                functionName: 'isValidSignature',
-            }));
+            const result = yield contract.isValidSignature(ethers.ethers.utils.hashMessage(messageToSign), signature);
             if (result === MAGIC_VALUE)
                 return;
         }

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

@@ -1,5 +1,5 @@
 import Client from '@walletconnect/client';
-import { PublicClient } from 'viem';
+import { ethers } from 'ethers';
 import { FetchPublicAddressOpts, PayloadParams, WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
 import { WalletSchema } from '@dynamic-labs/wallet-book';
 import { KeplrWalletConnectV1 } from '../../cosmos/wcClient';
@@ -20,4 +20,4 @@ export declare const createSession: (client: Client) => Promise<PayloadParams>;
 export declare const useDeepLink: (metadata: WalletSchema, wcClient: Client, opts?: FetchPublicAddressOpts) => void;
 export declare const fetchWalletConnectCosmosPublicAddress: (metadata: WalletSchema, wcClient: Client, provider: KeplrWalletConnectV1, opts: FetchPublicAddressOpts & Required<Pick<FetchPublicAddressOpts, 'chainId'>>) => Promise<string>;
 export declare const fetchWalletConnectEVMPublicAddress: (metadata: WalletSchema, wcClient: Client, opts?: FetchPublicAddressOpts) => Promise<string | undefined>;
-export declare const signWalletConnectPersonalMessage: (messageToSign: string, metadata: WalletSchema, client: Client, rpcProvider?: () => Promise<PublicClient | undefined>) => Promise<string | undefined>;
+export declare const signWalletConnectPersonalMessage: (messageToSign: string, metadata: WalletSchema, client: Client, rpcProvider?: () => Promise<ethers.providers.JsonRpcProvider | undefined>) => Promise<string | undefined>;

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

@@ -1,6 +1,6 @@
 import { __awaiter } from 'tslib';
 import Client from '@walletconnect/client';
-import { hashMessage } from 'viem';
+import { Contract, ethers } from 'ethers';
 import { isMobile, isIOS } from '../../../utils/isMobile.js';
 import { isSameAddress } from '../../../utils/isSameAddress/isSameAddress.js';
 import { logger } from '../../../utils/logger.js';
@@ -205,7 +205,8 @@ const waitForSafeTransactionOrTimeout = (accountPublicAddress, signature, messag
         if (!rpcProvider) {
             return;
         }
-        const safeTransactionPromise = waitForSafeTransaction(accountPublicAddress, signature, messageToSign, yield rpcProvider());
+        const contract = new Contract(accountPublicAddress, IS_VALID_SIGNATURE_ABI, yield rpcProvider());
+        const safeTransactionPromise = waitForSafeTransaction(signature, messageToSign, contract);
         const timeoutPromise = new Promise((resolve) => {
             setTimeout(resolve, 120000);
         });
@@ -217,18 +218,13 @@ const waitForSafeTransactionOrTimeout = (accountPublicAddress, signature, messag
 // the transaction is recorded first on the blockchain
 // redcoast verify WILL fail if it attempts to verify the signature
 // that has not yet been properly processed!
-const waitForSafeTransaction = (address, signature, messageToSign, client) => __awaiter(void 0, void 0, void 0, function* () {
+const waitForSafeTransaction = (signature, messageToSign, contract) => __awaiter(void 0, void 0, void 0, function* () {
     // wait for safe wallet to finish txn on the blockchain contract
     for (let i = 0; i < 120; i++) {
         try {
             // this will result in an exception if the transaction is still not ready
             // we need to catch it below
-            const result = yield (client === null || client === void 0 ? void 0 : client.readContract({
-                abi: IS_VALID_SIGNATURE_ABI,
-                address: address,
-                args: [hashMessage(messageToSign), signature],
-                functionName: 'isValidSignature',
-            }));
+            const result = yield contract.isValidSignature(ethers.utils.hashMessage(messageToSign), signature);
             if (result === MAGIC_VALUE)
                 return;
         }