@dynamic-labs/multi-wallet 0.16.11 → 0.16.12-viem.1

package/src/wallets/ethereum/MagicConnector/MagicWalletConnector/MagicWalletConnector.js

@@ -1,8 +1,6 @@
 import { __awaiter } from 'tslib';
-import { ethers } from 'ethers';
-import { DynamicError } from '../../../../errors.js';
+import { formatEther, createWalletClient, custom, createPublicClient, fromHex } from 'viem';
 import { logger } from '../../../../utils/logger.js';
-import { assignConfirmationScreenToProvider } from '../../../../utils/assignConfirmationScreenToProvider/assignConfirmationScreenToProvider.js';
 import { CancellablePromise } from '../../../../utils/CancellablePromise/CancellablePromise.js';
 import { MagicClientNetworkHandler } from '../MagicClientNetworkHandler/MagicClientNetworkHandler.js';
 
@@ -80,12 +78,10 @@ class MagicWalletConnector extends MagicClientNetworkHandler {
     }
     getBalance() {
         return __awaiter(this, void 0, void 0, function* () {
+            const signer = yield this.getSigner();
             const provider = yield this.getWeb3Provider();
-            if (!provider)
-                throw new DynamicError('No provider');
-            const signer = provider.getSigner();
-            const userAddress = yield signer.getAddress();
-            return ethers.utils.formatEther(yield provider.getBalance(userAddress));
+            const [userAddress] = yield signer.getAddresses();
+            return formatEther(yield provider.getBalance({ address: userAddress }));
         });
     }
     getConnectedAccounts() {
@@ -109,15 +105,37 @@ class MagicWalletConnector extends MagicClientNetworkHandler {
     getSigner() {
         return __awaiter(this, void 0, void 0, function* () {
             const provider = yield this.getWeb3Provider();
-            return provider.getSigner();
+            return createWalletClient({ transport: custom(provider) });
         });
     }
     getWeb3Provider() {
         return __awaiter(this, void 0, void 0, function* () {
             const client = this.getClient();
-            const provider = new ethers.providers.Web3Provider(client.rpcProvider);
-            assignConfirmationScreenToProvider(provider, this._walletUiUtils);
-            return provider;
+            const publicClient = createPublicClient({
+                transport: custom({
+                    request: (args) => __awaiter(this, void 0, void 0, function* () {
+                        var _a, _b;
+                        if (args.method === 'personal_sign') {
+                            return this._walletUiUtils.signMessage({
+                                handler: () => client.rpcProvider.request(args),
+                                message: fromHex((_a = args.params) === null || _a === void 0 ? void 0 : _a[0], 'string'),
+                            });
+                        }
+                        else if (args.method === 'eth_sendTransaction') {
+                            return this._walletUiUtils.sendTransaction({
+                                handler: () => client.rpcProvider.request(args),
+                                transaction: (_b = args.params) === null || _b === void 0 ? void 0 : _b[0],
+                            });
+                        }
+                        else {
+                            return client.rpcProvider.request(args);
+                        }
+                    }),
+                }, {
+                    retryCount: 0,
+                }),
+            });
+            return publicClient;
         });
     }
     isInstalledOnBrowser() {
@@ -136,8 +154,11 @@ class MagicWalletConnector extends MagicClientNetworkHandler {
     }
     signMessage(messageToSign) {
         return __awaiter(this, void 0, void 0, function* () {
-            const provider = yield this.getWeb3Provider();
-            return provider.getSigner().signMessage(messageToSign);
+            const signer = yield this.getSigner();
+            return signer.signMessage({
+                account: (yield this.fetchPublicAddress()),
+                message: messageToSign,
+            });
         });
     }
     supportsNetworkSwitching() {

package/src/wallets/ethereum/coinbase.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
 var tslib = require('tslib');
-var ethers = require('ethers');
+var viem = require('viem');
 var coinbase = require('../clients/coinbase/coinbase.cjs');
 var normalizeWalletName = require('../../utils/normalizeWalletName/normalizeWalletName.cjs');
 var ethProviderHelper = require('./ethProviderHelper.cjs');
@@ -27,18 +27,29 @@ class Coinbase extends ethProvider.EthProvider {
         return normalizeWalletName.normalizeWalletName(this.name);
     }
     setupEventListeners(listeners) {
-        return this.ethProviderHelper._setupEventListeners(listeners, this.getWeb3Provider());
+        const provider = this.ethProviderHelper.findProvider(this.name);
+        if (!provider) {
+            return () => { };
+        }
+        return this.ethProviderHelper._setupEventListeners(listeners, this.name, viem.createPublicClient({
+            transport: viem.custom(provider),
+        }));
     }
     teardownEventListeners() {
         return this.ethProviderHelper._teardownEventListeners(this.name);
     }
     getWeb3Provider() {
-        if (this.isInstalledOnBrowser()) {
-            return this.ethProviderHelper.findProvider(this.name);
+        const provider = this.ethProviderHelper.findProvider(this.name);
+        if (this.isInstalledOnBrowser() && provider) {
+            return viem.createWalletClient({
+                transport: viem.custom(provider),
+            });
         }
-        return new ethers.ethers.providers.Web3Provider(coinbase.getCoinbaseProvider({
-            opts: this.coinbaseProviderOpts,
-        }), 'any');
+        return viem.createWalletClient({
+            transport: viem.custom(coinbase.getCoinbaseProvider({
+                opts: this.coinbaseProviderOpts,
+            })),
+        });
     }
     isInstalledOnBrowser() {
         return this.ethProviderHelper.isInstalledHelper(this.name);