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

package/src/coinbase/coinbase.js

@@ -1,103 +1,93 @@
 'use client'
 import { __rest, __awaiter } from '../../_virtual/_tslib.js';
-import { createWalletClient, custom } from 'viem';
-import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
+import { toHex, toBytes, createWalletClient, custom } from 'viem';
 import { eventListenerHandlers } from '@dynamic-labs/wallet-connector-core';
-import { EthProviderHelper } from '../ethProviderHelper.js';
+import { chainsMap } from '@dynamic-labs/viem-utils';
 import { EthWalletConnector } from '../EthWalletConnector.js';
-import { getCoinbaseClient, getAddress, signMessage, killCoinbaseSession } from './client/client.js';
+import { getCoinbaseProvider } from './helpers.js';
 
 class Coinbase extends EthWalletConnector {
     constructor(_a) {
-        var { appName, appLogoUrl, evmNetworks } = _a, props = __rest(_a, ["appName", "appLogoUrl", "evmNetworks"]);
+        var { appName, appLogoUrl, evmNetworks, coinbaseWalletPreference } = _a, props = __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 = findWalletBookWallet(this.walletBook, this.key);
-        if (!wallet)
-            return;
-        this.ethProviderHelper = new 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 = 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 createWalletClient({
-            transport: custom(getCoinbaseClient({
-                opts: this.coinbaseProviderOpts,
-            }).provider),
+    getConnectedAccounts() {
+        return __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 __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 getAddress(this.coinbaseProviderOpts, opts);
+            const [address] = yield this.coinbaseProvider.request({
+                method: 'eth_requestAccounts',
+            });
+            this.setActiveAccount(address);
+            return address;
         });
     }
     signMessage(messageToSign) {
         return __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: [toHex(toBytes(messageToSign)), address.toLowerCase()],
+                });
+            }
+            catch (err) {
+                return undefined;
             }
-            return signMessage(this.coinbaseProviderOpts, messageToSign);
-        });
-    }
-    endSession() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.isInstalledOnBrowser())
-                return;
-            killCoinbaseSession();
         });
     }
-    setupCoinbaseProviderEventListeners() {
-        const { provider } = getCoinbaseClient({
-            opts: this.coinbaseProviderOpts,
-        });
-        if (!provider) {
-            return;
-        }
+    setupEventListeners() {
         const { handleAccountChange, handleChainChange, handleDisconnect } = 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 createWalletClient({
+            account: this.getActiveAccount(),
+            chain: chainId ? chainsMap[chainId] : undefined,
+            transport: custom(this.coinbaseProvider),
+        });
+    }
 }
 
 export { Coinbase };

package/src/coinbase/helpers.cjs

@@ -0,0 +1,38 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var walletSdk = require('@coinbase/wallet-sdk');
+
+// storing a reference to the coinbase provider because the provider methods work better when
+// they are called on the same instance
+let coinbaseProvider;
+const baseSepolia = 84532;
+const baseMainnet = 8453;
+const getCoinbaseProvider = ({ opts: { appLogoUrl, appName, evmNetworks, walletPreference } = {}, }) => {
+    const appChainIds = evmNetworks === null || evmNetworks === void 0 ? void 0 : evmNetworks.map((network) => Number(network.chainId));
+    // just brings base sepolia to the front of the list, because that is treated as the default chain
+    const hasBaseSepolia = evmNetworks === null || evmNetworks === void 0 ? void 0 : evmNetworks.some((network) => network.chainId === baseSepolia);
+    if (hasBaseSepolia) {
+        appChainIds === null || appChainIds === void 0 ? void 0 : appChainIds.sort((a, b) => a === baseSepolia ? -1 : b === baseSepolia ? 1 : 0);
+    }
+    // just brings base mainnet to the front, because that that is treated as the default chain
+    const hasBaseMainnet = evmNetworks === null || evmNetworks === void 0 ? void 0 : evmNetworks.some((network) => network.chainId === baseMainnet);
+    if (hasBaseMainnet) {
+        appChainIds === null || appChainIds === void 0 ? void 0 : appChainIds.sort((a, b) => a === baseMainnet ? -1 : b === baseMainnet ? 1 : 0);
+    }
+    if (!coinbaseProvider) {
+        const coinbaseSdk = new walletSdk.CoinbaseWalletSDK({
+            appChainIds,
+            appLogoUrl,
+            appName,
+        });
+        coinbaseProvider = coinbaseSdk.makeWeb3Provider({
+            options: walletPreference !== null && walletPreference !== void 0 ? walletPreference : 'all',
+        });
+    }
+    return coinbaseProvider;
+};
+
+exports.getCoinbaseProvider = getCoinbaseProvider;

package/src/coinbase/helpers.d.ts

@@ -0,0 +1,3 @@
+import { type GetCoinbaseProvider } from './types';
+export declare const getCoinbaseProvider: GetCoinbaseProvider;
+export declare const resetCoinbaseProvider: () => void;

package/src/coinbase/helpers.js

@@ -0,0 +1,34 @@
+'use client'
+import { CoinbaseWalletSDK } from '@coinbase/wallet-sdk';
+
+// storing a reference to the coinbase provider because the provider methods work better when
+// they are called on the same instance
+let coinbaseProvider;
+const baseSepolia = 84532;
+const baseMainnet = 8453;
+const getCoinbaseProvider = ({ opts: { appLogoUrl, appName, evmNetworks, walletPreference } = {}, }) => {
+    const appChainIds = evmNetworks === null || evmNetworks === void 0 ? void 0 : evmNetworks.map((network) => Number(network.chainId));
+    // just brings base sepolia to the front of the list, because that is treated as the default chain
+    const hasBaseSepolia = evmNetworks === null || evmNetworks === void 0 ? void 0 : evmNetworks.some((network) => network.chainId === baseSepolia);
+    if (hasBaseSepolia) {
+        appChainIds === null || appChainIds === void 0 ? void 0 : appChainIds.sort((a, b) => a === baseSepolia ? -1 : b === baseSepolia ? 1 : 0);
+    }
+    // just brings base mainnet to the front, because that that is treated as the default chain
+    const hasBaseMainnet = evmNetworks === null || evmNetworks === void 0 ? void 0 : evmNetworks.some((network) => network.chainId === baseMainnet);
+    if (hasBaseMainnet) {
+        appChainIds === null || appChainIds === void 0 ? void 0 : appChainIds.sort((a, b) => a === baseMainnet ? -1 : b === baseMainnet ? 1 : 0);
+    }
+    if (!coinbaseProvider) {
+        const coinbaseSdk = new CoinbaseWalletSDK({
+            appChainIds,
+            appLogoUrl,
+            appName,
+        });
+        coinbaseProvider = coinbaseSdk.makeWeb3Provider({
+            options: walletPreference !== null && walletPreference !== void 0 ? walletPreference : 'all',
+        });
+    }
+    return coinbaseProvider;
+};
+
+export { getCoinbaseProvider };

package/src/coinbase/types.d.ts

@@ -0,0 +1,21 @@
+import { type ProviderInterface } from '@coinbase/wallet-sdk';
+import { type CoinbaseWalletPreference, type GenericNetwork } from '@dynamic-labs/types';
+import { type EthWalletConnectorOpts } from '../EthWalletConnector';
+export type GetCoinbaseProviderOpts = {
+    appLogoUrl?: string;
+    appName?: string;
+    evmNetworks?: GenericNetwork[];
+    walletPreference?: CoinbaseWalletPreference;
+};
+export type CoinbaseProviderHandlerOpts = {
+    onDisconnect(): Promise<void>;
+};
+export type GetCoinbaseProvider = (args: {
+    handlers?: CoinbaseProviderHandlerOpts;
+    opts?: GetCoinbaseProviderOpts;
+}) => ProviderInterface;
+export type CoinbaseOpts = EthWalletConnectorOpts & {
+    appLogoUrl?: string;
+    appName?: string;
+    coinbaseWalletPreference?: CoinbaseWalletPreference;
+};

package/src/ethProviderHelper.cjs

@@ -63,9 +63,9 @@ class EthProviderHelper {
         }
         return providers;
     }
-    installedProviderLookup(providerFlags) {
+    installedProviderLookup(extensionLocators) {
         const allInstalledProviders = this.installedProviders();
-        return walletConnectorCore.ProviderLookup(allInstalledProviders, providerFlags);
+        return walletConnectorCore.ProviderLookup(allInstalledProviders, extensionLocators);
     }
     eip6963ProviderLookup(rdns) {
         var _a;

package/src/ethProviderHelper.d.ts

@@ -1,7 +1,7 @@
 import { Hex, WalletClient } from 'viem';
 import { ProviderCondition, WalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { WalletSchema } from '@dynamic-labs/wallet-book';
-import { IEthereum, ProviderFlag } from './types';
+import { IEthereum, ExtensionLocator } from './types';
 import { EthWalletConnector } from '.';
 export declare class EthProviderHelper {
     private wallet;
@@ -25,7 +25,7 @@ export declare class EthProviderHelper {
         windowLocations?: string[] | undefined;
     } | undefined;
     installedProviders(): IEthereum[];
-    installedProviderLookup(providerFlags: Array<ProviderCondition<ProviderFlag>>): IEthereum | undefined;
+    installedProviderLookup(extensionLocators: Array<ProviderCondition<ExtensionLocator>>): IEthereum | undefined;
     eip6963ProviderLookup(rdns: string): IEthereum | undefined;
     isInstalledHelper(): boolean;
     findProvider(): IEthereum | undefined;

package/src/ethProviderHelper.js

@@ -59,9 +59,9 @@ class EthProviderHelper {
         }
         return providers;
     }
-    installedProviderLookup(providerFlags) {
+    installedProviderLookup(extensionLocators) {
         const allInstalledProviders = this.installedProviders();
-        return ProviderLookup(allInstalledProviders, providerFlags);
+        return ProviderLookup(allInstalledProviders, extensionLocators);
     }
     eip6963ProviderLookup(rdns) {
         var _a;

package/src/index.cjs

@@ -7,6 +7,7 @@ require('./polyfills.cjs');
 var turnkey = require('@dynamic-labs/turnkey');
 var PhantomEvm = require('./injected/PhantomEvm.cjs');
 var ExodusEvm = require('./injected/ExodusEvm.cjs');
+var UnknownInjected = require('./injected/UnknownInjected.cjs');
 var fetchInjectedWalletConnectors = require('./injected/fetchInjectedWalletConnectors.cjs');
 require('./walletConnect/walletConnect.cjs');
 var fetchWalletConnectWallets = require('./walletConnect/fetchWalletConnectWallets.cjs');
@@ -24,11 +25,13 @@ const EthereumWalletConnectors = (props) => [
     ...fetchWalletConnectWallets.fetchWalletConnectWallets(props),
     ...turnkey.TurnkeyEVMWalletConnectors(props),
     coinbase.Coinbase,
+    UnknownInjected.UnknownInjected,
     fetchWalletConnectWallets.getWalletConnectConnector(),
 ];
 
 exports.PhantomEvm = PhantomEvm.PhantomEvm;
 exports.ExodusEvm = ExodusEvm.ExodusEvm;
+exports.UnknownInjected = UnknownInjected.UnknownInjected;
 exports.fetchInjectedWalletConnector = fetchInjectedWalletConnectors.fetchInjectedWalletConnector;
 exports.injectedWalletOverrides = fetchInjectedWalletConnectors.injectedWalletOverrides;
 exports.EthWalletConnector = EthWalletConnector.EthWalletConnector;

package/src/index.js

@@ -3,6 +3,8 @@ import './polyfills.js';
 import { TurnkeyEVMWalletConnectors } from '@dynamic-labs/turnkey';
 export { PhantomEvm } from './injected/PhantomEvm.js';
 export { ExodusEvm } from './injected/ExodusEvm.js';
+import { UnknownInjected } from './injected/UnknownInjected.js';
+export { UnknownInjected } from './injected/UnknownInjected.js';
 import { injectedWalletOverrides, fetchInjectedWalletConnector } from './injected/fetchInjectedWalletConnectors.js';
 export { fetchInjectedWalletConnector, injectedWalletOverrides } from './injected/fetchInjectedWalletConnectors.js';
 import './walletConnect/walletConnect.js';
@@ -21,6 +23,7 @@ const EthereumWalletConnectors = (props) => [
     ...fetchWalletConnectWallets(props),
     ...TurnkeyEVMWalletConnectors(props),
     Coinbase,
+    UnknownInjected,
     getWalletConnectConnector(),
 ];
 

package/src/injected/PhantomEvm.cjs

@@ -11,7 +11,7 @@ var InjectedWalletBase = require('./InjectedWalletBase.cjs');
 class PhantomEvm extends InjectedWalletBase {
     constructor(props) {
         super(props);
-        this.name = 'PhantomEvm';
+        this.name = 'Phantom';
         this.overrideKey = 'phantomevm';
         this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
     }

package/src/injected/PhantomEvm.js

@@ -7,7 +7,7 @@ import InjectedWalletBase from './InjectedWalletBase.js';
 class PhantomEvm extends InjectedWalletBase {
     constructor(props) {
         super(props);
-        this.name = 'PhantomEvm';
+        this.name = 'Phantom';
         this.overrideKey = 'phantomevm';
         this.wallet = findWalletBookWallet(this.walletBook, this.key);
     }

package/src/injected/UnknownInjected.cjs

@@ -0,0 +1,21 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var walletBook = require('@dynamic-labs/wallet-book');
+var InjectedWalletBase = require('./InjectedWalletBase.cjs');
+
+class UnknownInjected extends InjectedWalletBase {
+    constructor(props) {
+        super(props);
+        this.name = 'Unknown';
+        this.overrideKey = 'unknown';
+        this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
+    }
+    isInstalledOnBrowser() {
+        return false;
+    }
+}
+
+exports.UnknownInjected = UnknownInjected;

package/src/injected/UnknownInjected.d.ts

@@ -0,0 +1,8 @@
+import { EthWalletConnectorOpts } from '..';
+import InjectedWalletBase from './InjectedWalletBase';
+export declare class UnknownInjected extends InjectedWalletBase {
+    name: string;
+    overrideKey: string;
+    constructor(props: EthWalletConnectorOpts);
+    isInstalledOnBrowser(): boolean;
+}

package/src/injected/UnknownInjected.js

@@ -0,0 +1,17 @@
+'use client'
+import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
+import InjectedWalletBase from './InjectedWalletBase.js';
+
+class UnknownInjected extends InjectedWalletBase {
+    constructor(props) {
+        super(props);
+        this.name = 'Unknown';
+        this.overrideKey = 'unknown';
+        this.wallet = findWalletBookWallet(this.walletBook, this.key);
+    }
+    isInstalledOnBrowser() {
+        return false;
+    }
+}
+
+export { UnknownInjected };

package/src/injected/fetchInjectedWalletConnectors.cjs

@@ -8,18 +8,15 @@ var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var InjectedWalletBase = require('./InjectedWalletBase.cjs');
 var PhantomEvm = require('./PhantomEvm.cjs');
 var ExodusEvm = require('./ExodusEvm.cjs');
-var Zerion = require('./Zerion.cjs');
 
 const injectedWalletOverrides = [
     PhantomEvm.PhantomEvm,
     ExodusEvm.ExodusEvm,
-    Zerion.Zerion,
 ];
 const filteredInjectedWalletKeysOverrides = [
     'phantomevm',
     'coinbase',
     'exodusevm',
-    'zerion',
 ];
 const fetchInjectedWalletConnector = ({ walletBook, }) => {
     var _a;

package/src/injected/fetchInjectedWalletConnectors.js

@@ -4,18 +4,15 @@ import { logger } from '@dynamic-labs/wallet-connector-core';
 import InjectedWalletBase from './InjectedWalletBase.js';
 import { PhantomEvm } from './PhantomEvm.js';
 import { ExodusEvm } from './ExodusEvm.js';
-import { Zerion } from './Zerion.js';
 
 const injectedWalletOverrides = [
     PhantomEvm,
     ExodusEvm,
-    Zerion,
 ];
 const filteredInjectedWalletKeysOverrides = [
     'phantomevm',
     'coinbase',
     'exodusevm',
-    'zerion',
 ];
 const fetchInjectedWalletConnector = ({ walletBook, }) => {
     var _a;

package/src/injected/index.d.ts

@@ -1,3 +1,4 @@
 export * from './PhantomEvm';
 export * from './ExodusEvm';
+export * from './UnknownInjected';
 export * from './fetchInjectedWalletConnectors';

package/src/types.d.ts

@@ -17,15 +17,15 @@ declare global {
     }
 }
 export type IEthereum = {
-    [key in ProviderFlag]: boolean;
+    [key in ExtensionLocator]: boolean;
 } & {
     providers?: object[];
     request: <T extends string>(params: {
         method: T;
     } | object) => Promise<T extends 'eth_requestAccounts' ? [string] : object>;
 } & EventEmitter;
-export type ProviderFlag = 'isDawn' | 'isBraveWallet' | 'isCoinbaseWallet' | 'isFrame' | 'isGamestop' | 'isMetaMask' | 'isExodus' | 'isOpera' | 'isBlocto' | 'isTrustWallet' | 'isZerion' | 'isPhantom' | 'isSuperb' | 'isRabby' | 'isOkxWallet';
-export type EthProviderCondition = ProviderCondition<ProviderFlag>;
+export type ExtensionLocator = 'isDawn' | 'isBraveWallet' | 'isCoinbaseWallet' | 'isFrame' | 'isGamestop' | 'isMetaMask' | 'isExodus' | 'isOpera' | 'isBlocto' | 'isTrustWallet' | 'isZerion' | 'isPhantom' | 'isSuperb' | 'isRabby' | 'isOkxWallet';
+export type EthProviderCondition = ProviderCondition<ExtensionLocator>;
 export type Provider = () => PublicClient | undefined;
 export type ExternalProviderEventEmitter = PublicClient & {
     on: (event: string, listener: (...args: Array<any>) => unknown) => void;