@dynamic-labs/ethereum 2.1.0-alpha.9 → 2.1.0

package/src/EthWalletConnector.js

@@ -139,7 +139,11 @@ class EthWalletConnector extends WalletConnectorBase {
                 if (!this.supportsNetworkSwitching()) {
                     throw new DynamicError('Network switching is not supported');
                 }
-                return yield provider.switchChain(getOrMapViemChain(network));
+                yield provider.switchChain(getOrMapViemChain(network));
+                if (this.key === 'magiceden') {
+                    const newChainId = yield provider.getChainId();
+                    this.emit('chainChange', { chain: newChainId.toString() });
+                }
             }
             catch (error) {
                 // we need to check for unrecognized chain error first because it also contains 'rejected' in message

package/src/coinbase/coinbase.cjs

@@ -5,103 +5,93 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../_virtual/_tslib.cjs');
 var viem = require('viem');
-var walletBook = require('@dynamic-labs/wallet-book');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
-var ethProviderHelper = require('../ethProviderHelper.cjs');
+var viemUtils = require('@dynamic-labs/viem-utils');
 var EthWalletConnector = require('../EthWalletConnector.cjs');
-var client = require('./client/client.cjs');
+var helpers = require('./helpers.cjs');
 
 class Coinbase extends EthWalletConnector.EthWalletConnector {
     constructor(_a) {
-        var { appName, appLogoUrl, evmNetworks } = _a, props = _tslib.__rest(_a, ["appName", "appLogoUrl", "evmNetworks"]);
+        var { appName, appLogoUrl, evmNetworks, coinbaseWalletPreference } = _a, props = _tslib.__rest(_a, ["appName", "appLogoUrl", "evmNetworks", "coinbaseWalletPreference"]);
         super(Object.assign({ evmNetworks }, props));
         this.name = 'Coinbase';
         this.overrideKey = 'coinbase';
         this.supportedChains = ['EVM', 'ETH'];
         this.connectedChain = 'EVM';
-        this.canConnectViaQrCode = true;
-        this.coinbaseProviderOpts = {
-            appLogoUrl: appLogoUrl,
-            appName: appName,
-            evmNetworks: evmNetworks,
-        };
-        const wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
-        if (!wallet)
-            return;
-        this.ethProviderHelper = new ethProviderHelper.EthProviderHelper(wallet, this);
-    }
-    setupEventListeners() {
-        var _a, _b, _c;
-        if (!this.isInstalledOnBrowser()) {
-            this.setupCoinbaseProviderEventListeners();
-            return;
-        }
-        const provider = (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.findProvider();
-        if (!provider) {
-            return;
-        }
-        const setupResponse = (_c = (_b = this.ethProviderHelper) === null || _b === void 0 ? void 0 : _b._setupEventListeners) === null || _c === void 0 ? void 0 : _c.call(_b, this);
-        if (!(setupResponse === null || setupResponse === void 0 ? void 0 : setupResponse.tearDownEventListeners))
-            return;
-        this.teardownEventListeners = setupResponse.tearDownEventListeners;
+        this.canConnectViaQrCode = false;
+        this.canConnectViaCustodialService = true;
+        this.coinbaseProvider = helpers.getCoinbaseProvider({
+            opts: {
+                appLogoUrl: appLogoUrl,
+                appName: appName,
+                evmNetworks: evmNetworks,
+                walletPreference: coinbaseWalletPreference,
+            },
+        });
     }
-    getWalletClient(chainId) {
-        var _a;
-        if (this.isInstalledOnBrowser()) {
-            return (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.findWalletClient(chainId);
-        }
-        return viem.createWalletClient({
-            transport: viem.custom(client.getCoinbaseClient({
-                opts: this.coinbaseProviderOpts,
-            }).provider),
+    getConnectedAccounts() {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            try {
+                const accounts = yield this.coinbaseProvider.request({
+                    method: 'eth_accounts',
+                });
+                if (accounts[0]) {
+                    this.setActiveAccount(accounts[0]);
+                }
+                return accounts;
+            }
+            catch (error) {
+                return [];
+            }
         });
     }
     isInstalledOnBrowser() {
         var _a;
-        return ((_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.findProvider()) !== undefined;
+        return Boolean((_a = window === null || window === void 0 ? void 0 : window.coinbaseWalletExtension) === null || _a === void 0 ? void 0 : _a.isCoinbaseWallet);
     }
-    getAddress(opts) {
+    getAddress() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            var _a;
-            if (this.isInstalledOnBrowser()) {
-                return (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.getAddress();
-            }
-            return client.getAddress(this.coinbaseProviderOpts, opts);
+            const [address] = yield this.coinbaseProvider.request({
+                method: 'eth_requestAccounts',
+            });
+            this.setActiveAccount(address);
+            return address;
         });
     }
     signMessage(messageToSign) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            var _a;
-            if (this.isInstalledOnBrowser()) {
-                return (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.signMessage(messageToSign);
+            const [address] = yield this.coinbaseProvider.request({
+                method: 'eth_requestAccounts',
+            });
+            try {
+                return yield this.coinbaseProvider.request({
+                    method: 'personal_sign',
+                    params: [viem.toHex(viem.toBytes(messageToSign)), address.toLowerCase()],
+                });
+            }
+            catch (err) {
+                return undefined;
             }
-            return client.signMessage(this.coinbaseProviderOpts, messageToSign);
-        });
-    }
-    endSession() {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
-            if (this.isInstalledOnBrowser())
-                return;
-            client.killCoinbaseSession();
         });
     }
-    setupCoinbaseProviderEventListeners() {
-        const { provider } = client.getCoinbaseClient({
-            opts: this.coinbaseProviderOpts,
-        });
-        if (!provider) {
-            return;
-        }
+    setupEventListeners() {
         const { handleAccountChange, handleChainChange, handleDisconnect } = walletConnectorCore.eventListenerHandlers(this);
-        provider.on('accountsChanged', handleAccountChange);
-        provider.on('chainChanged', handleChainChange);
-        provider.on('disconnect', handleDisconnect);
+        this.coinbaseProvider.on('accountsChanged', handleAccountChange);
+        this.coinbaseProvider.on('chainChanged', handleChainChange);
+        this.coinbaseProvider.on('disconnect', handleDisconnect);
         this.teardownEventListeners = () => {
-            provider.removeListener('accountsChanged', handleAccountChange);
-            provider.removeListener('chainChanged', handleChainChange);
-            provider.removeListener('disconnect', handleDisconnect);
+            this.coinbaseProvider.removeListener('accountsChanged', handleAccountChange);
+            this.coinbaseProvider.removeListener('chainChanged', handleChainChange);
+            this.coinbaseProvider.removeListener('disconnect', handleDisconnect);
         };
     }
+    getWalletClient(chainId) {
+        return viem.createWalletClient({
+            account: this.getActiveAccount(),
+            chain: chainId ? viemUtils.chainsMap[chainId] : undefined,
+            transport: viem.custom(this.coinbaseProvider),
+        });
+    }
 }
 
 exports.Coinbase = Coinbase;