@dynamic-labs/ethereum 2.1.0-alpha.0 → 2.1.0-alpha.10

package/src/EthWalletConnector.js

@@ -1,14 +1,16 @@
+'use client'
 import { __awaiter } from '../_virtual/_tslib.js';
 import { formatEther } from 'viem';
 import { toAccount } from 'viem/accounts';
 import { WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
 import { parseEvmNetworks, retryableFn, FALLBACK_UNDEFINED, DynamicError, getOrMapViemChain } from '@dynamic-labs/utils';
 import { findEvmNetwork } from './utils/findEvmNetwork.js';
+import { getNameservice } from './utils/getNameservice.js';
 
 class EthWalletConnector extends WalletConnectorBase {
     getPublicClient() {
-        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c;
             const networkId = (_a = (yield this.getNetwork())) !== null && _a !== void 0 ? _a : 1;
             if (this.evmNetworks.length === 0) {
                 return undefined;
@@ -63,19 +65,7 @@ class EthWalletConnector extends WalletConnectorBase {
             if (!address || !rpcProvider) {
                 return;
             }
-            const ensName = yield rpcProvider.getEnsName({
-                address: address,
-            });
-            const ensAvatar = ensName
-                ? yield rpcProvider.getEnsAvatar({
-                    name: ensName,
-                })
-                : undefined;
-            const ensData = {
-                avatar: ensAvatar !== null && ensAvatar !== void 0 ? ensAvatar : undefined,
-                name: ensName !== null && ensName !== void 0 ? ensName : undefined,
-            };
-            return ensData;
+            return getNameservice({ address, rpcProvider });
         });
     }
     getSigner() {
@@ -102,8 +92,8 @@ class EthWalletConnector extends WalletConnectorBase {
     supportsNetworkSwitching() {
         return true;
     }
-    switchNetwork({ networkName, networkChainId, }) {
-        return __awaiter(this, void 0, void 0, function* () {
+    switchNetwork(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ networkName, networkChainId, }) {
             const network = findEvmNetwork({
                 chainId: networkChainId,
                 name: networkName,
@@ -137,9 +127,9 @@ class EthWalletConnector extends WalletConnectorBase {
             return addresses;
         });
     }
-    providerSwitchNetwork({ network, provider, }) {
-        var _a, _b, _c, _d;
-        return __awaiter(this, void 0, void 0, function* () {
+    providerSwitchNetwork(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ network, provider, }) {
+            var _b, _c, _d, _e;
             const { chainId } = network;
             const currentNetworkId = yield this.getNetwork();
             if (currentNetworkId && currentNetworkId === chainId) {
@@ -154,14 +144,14 @@ class EthWalletConnector extends WalletConnectorBase {
             catch (error) {
                 // we need to check for unrecognized chain error first because it also contains 'rejected' in message
                 if (error.code === 4902 ||
-                    ((_a = error.message) === null || _a === void 0 ? void 0 : _a.includes('Unrecognized chain')) ||
+                    ((_b = error.message) === null || _b === void 0 ? void 0 : _b.includes('Unrecognized chain')) ||
                     // https://github.com/MetaMask/metamask-mobile/issues/3312#issuecomment-1065923294
-                    ((_c = (_b = error.data) === null || _b === void 0 ? void 0 : _b.orginalError) === null || _c === void 0 ? void 0 : _c.code) === 4902) {
+                    ((_d = (_c = error.data) === null || _c === void 0 ? void 0 : _c.orginalError) === null || _d === void 0 ? void 0 : _d.code) === 4902) {
                     // error code indicates the chain has not been added yet
                     // https://docs.metamask.io/guide/rpc-api.html#usage-with-wallet-switchethereumchain
                     return this.providerAddNetwork({ network, provider });
                 }
-                else if (((_d = error.message) === null || _d === void 0 ? void 0 : _d.includes('rejected')) ||
+                else if (((_e = error.message) === null || _e === void 0 ? void 0 : _e.includes('rejected')) ||
                     (typeof error === 'string' && error.includes('rejected'))) {
                     throw new DynamicError("User rejected the wallet's request to switch network");
                 }
@@ -171,14 +161,14 @@ class EthWalletConnector extends WalletConnectorBase {
             }
         });
     }
-    providerAddNetwork({ network, provider, }) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
+    providerAddNetwork(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ network, provider, }) {
+            var _b;
             try {
                 return yield provider.addChain({ chain: getOrMapViemChain(network) });
             }
             catch (error) {
-                if (((_a = error.message) === null || _a === void 0 ? void 0 : _a.includes('rejected')) ||
+                if (((_b = error.message) === null || _b === void 0 ? void 0 : _b.includes('rejected')) ||
                     (typeof error === 'string' && error.includes('rejected'))) {
                     throw new DynamicError("User rejected the wallet's request to add network");
                 }

package/src/coinbase/coinbase.cjs

@@ -1,14 +1,13 @@
+'use client'
 'use strict';
 
 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 EthWalletConnector = require('../EthWalletConnector.cjs');
-var client = require('./client/client.cjs');
+var helpers = require('./helpers.cjs');
 
 class Coinbase extends EthWalletConnector.EthWalletConnector {
     constructor(_a) {
@@ -18,89 +17,57 @@ class Coinbase extends EthWalletConnector.EthWalletConnector {
         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;
-    }
-    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),
+        this.canConnectViaQrCode = false;
+        this.canConnectViaCustodialService = true;
+        this.coinbaseProvider = helpers.getCoinbaseProvider({
+            opts: {
+                appLogoUrl: appLogoUrl,
+                appName: appName,
+                evmNetworks: evmNetworks,
+            },
         });
     }
-    isInstalledOnBrowser() {
-        var _a;
-        return ((_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.findProvider()) !== undefined;
-    }
-    getAddress(opts) {
-        var _a;
+    getAddress() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            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',
+            });
+            return address;
         });
     }
     signMessage(messageToSign) {
-        var _a;
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            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() {
+        return viem.createWalletClient({
+            // add account and chain
+            transport: viem.custom(this.coinbaseProvider),
+        });
+    }
 }
 
 exports.Coinbase = Coinbase;