@dynamic-labs/ethereum 3.0.0-alpha.2 → 3.0.0-alpha.21

package/src/coinbase/coinbase.js

@@ -1,8 +1,8 @@
 'use client'
 import { __rest, __awaiter } from '../../_virtual/_tslib.js';
 import { toHex, toBytes, createWalletClient, custom } from 'viem';
-import { eventListenerHandlers } from '@dynamic-labs/wallet-connector-core';
 import { chainsMap } from '@dynamic-labs/viem-utils';
+import { eventListenerHandlers } from '@dynamic-labs/wallet-connector-core';
 import { EthWalletConnector } from '../EthWalletConnector.js';
 import { getCoinbaseProvider } from './helpers.js';
 
@@ -15,7 +15,7 @@ class Coinbase extends EthWalletConnector {
         this.supportedChains = ['EVM', 'ETH'];
         this.connectedChain = 'EVM';
         this.canConnectViaQrCode = false;
-        this.canConnectViaCustodialService = true;
+        this.canConnectViaCustodialService = !this.isInstalledOnBrowser();
         this.coinbaseProviderOpts = {
             appLogoUrl: appLogoUrl,
             appName: appName,

package/src/ethProviderHelper.cjs

@@ -8,7 +8,6 @@ var viem = require('viem');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var utils = require('@dynamic-labs/utils');
 var viemUtils = require('@dynamic-labs/viem-utils');
-var eip6963Provider = require('./eip6963Provider.cjs');
 
 class EthProviderHelper {
     constructor(wallet, connector) {
@@ -69,7 +68,7 @@ class EthProviderHelper {
     }
     eip6963ProviderLookup(rdns) {
         var _a;
-        const { providers } = eip6963Provider.Eip6963ProviderSingleton.get();
+        const { providers } = utils.Eip6963ProviderSingleton.get();
         return (_a = providers.find((provider) => provider.info.rdns === rdns)) === null || _a === void 0 ? void 0 : _a.provider;
     }
     isInstalledHelper() {
@@ -85,7 +84,7 @@ class EthProviderHelper {
         }
         return viem.createWalletClient({
             account: this.connector.getActiveAccount(),
-            chain: chainId ? viemUtils.chainsMap[chainId] : undefined,
+            chain: chainId ? viemUtils.chainsMap[chainId] : this.connector.getActiveChain(),
             transport: viem.custom(provider),
         });
     }

package/src/ethProviderHelper.d.ts

@@ -1,4 +1,4 @@
-import { Hex, WalletClient } from 'viem';
+import { Hex, WalletClient, Account, Transport, Chain as ViemChain } from 'viem';
 import { ProviderCondition, WalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { WalletSchema } from '@dynamic-labs/wallet-book';
 import { IEthereum, ExtensionLocator } from './types';
@@ -22,6 +22,10 @@ export declare class EthProviderHelper {
             features: string[];
             name: string;
         } | undefined;
+        walletStandardLocators?: {
+            name: string;
+            locator: string;
+        }[] | undefined;
         windowLocations?: string[] | undefined;
     } | undefined;
     installedProviders(): IEthereum[];
@@ -29,7 +33,7 @@ export declare class EthProviderHelper {
     eip6963ProviderLookup(rdns: string): IEthereum | undefined;
     isInstalledHelper(): boolean;
     findProvider(): IEthereum | undefined;
-    findWalletClient(chainId?: string): WalletClient | undefined;
+    findWalletClient(chainId?: string): WalletClient<Transport, ViemChain, Account> | undefined;
     getAddress(): Promise<Hex | undefined>;
     getAddressWithProvider(client: WalletClient): Promise<Hex | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;

package/src/ethProviderHelper.js

@@ -2,9 +2,8 @@
 import { __awaiter } from '../_virtual/_tslib.js';
 import { createWalletClient, custom, getAddress } from 'viem';
 import { ProviderLookup, eventListenerHandlers, logger } from '@dynamic-labs/wallet-connector-core';
-import { getProvidersFromWindow } from '@dynamic-labs/utils';
+import { getProvidersFromWindow, Eip6963ProviderSingleton } from '@dynamic-labs/utils';
 import { chainsMap } from '@dynamic-labs/viem-utils';
-import { Eip6963ProviderSingleton } from './eip6963Provider.js';
 
 class EthProviderHelper {
     constructor(wallet, connector) {
@@ -81,7 +80,7 @@ class EthProviderHelper {
         }
         return createWalletClient({
             account: this.connector.getActiveAccount(),
-            chain: chainId ? chainsMap[chainId] : undefined,
+            chain: chainId ? chainsMap[chainId] : this.connector.getActiveChain(),
             transport: custom(provider),
         });
     }

package/src/index.cjs

@@ -4,10 +4,11 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 require('./polyfills.cjs');
-var turnkey = require('@dynamic-labs/turnkey');
+var embeddedWalletEvm = require('@dynamic-labs/embedded-wallet-evm');
 var PhantomEvm = require('./injected/PhantomEvm.cjs');
 var ExodusEvm = require('./injected/ExodusEvm.cjs');
 var UnknownInjected = require('./injected/UnknownInjected.cjs');
+var FallbackEvmConnector = require('./injected/FallbackEvmConnector.cjs');
 var fetchInjectedWalletConnectors = require('./injected/fetchInjectedWalletConnectors.cjs');
 require('./walletConnect/walletConnect.cjs');
 var fetchWalletConnectWallets = require('./walletConnect/fetchWalletConnectWallets.cjs');
@@ -23,15 +24,17 @@ const EthereumWalletConnectors = (props) => [
     ...fetchInjectedWalletConnectors.injectedWalletOverrides,
     ...fetchInjectedWalletConnectors.fetchInjectedWalletConnector(props),
     ...fetchWalletConnectWallets.fetchWalletConnectWallets(props),
-    ...turnkey.TurnkeyEVMWalletConnectors(props),
+    ...embeddedWalletEvm.TurnkeyEVMWalletConnectors(props),
     coinbase.Coinbase,
     UnknownInjected.UnknownInjected,
+    FallbackEvmConnector.FallbackEvmConnector,
     fetchWalletConnectWallets.getWalletConnectConnector(),
 ];
 
 exports.PhantomEvm = PhantomEvm.PhantomEvm;
 exports.ExodusEvm = ExodusEvm.ExodusEvm;
 exports.UnknownInjected = UnknownInjected.UnknownInjected;
+exports.FallbackEvmConnector = FallbackEvmConnector.FallbackEvmConnector;
 exports.fetchInjectedWalletConnector = fetchInjectedWalletConnectors.fetchInjectedWalletConnector;
 exports.injectedWalletOverrides = fetchInjectedWalletConnectors.injectedWalletOverrides;
 exports.EthWalletConnector = EthWalletConnector.EthWalletConnector;

package/src/index.js

@@ -1,10 +1,12 @@
 'use client'
 import './polyfills.js';
-import { TurnkeyEVMWalletConnectors } from '@dynamic-labs/turnkey';
+import { TurnkeyEVMWalletConnectors } from '@dynamic-labs/embedded-wallet-evm';
 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 { FallbackEvmConnector } from './injected/FallbackEvmConnector.js';
+export { FallbackEvmConnector } from './injected/FallbackEvmConnector.js';
 import { injectedWalletOverrides, fetchInjectedWalletConnector } from './injected/fetchInjectedWalletConnectors.js';
 export { fetchInjectedWalletConnector, injectedWalletOverrides } from './injected/fetchInjectedWalletConnectors.js';
 import './walletConnect/walletConnect.js';
@@ -24,6 +26,7 @@ const EthereumWalletConnectors = (props) => [
     ...TurnkeyEVMWalletConnectors(props),
     Coinbase,
     UnknownInjected,
+    FallbackEvmConnector,
     getWalletConnectConnector(),
 ];
 

package/src/injected/FallbackEvmConnector.cjs

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

package/src/injected/FallbackEvmConnector.d.ts

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

package/src/injected/FallbackEvmConnector.js

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

package/src/injected/InjectedWalletBase.d.ts

@@ -1,4 +1,4 @@
-import { WalletClient } from 'viem';
+import { WalletClient, Transport, Account, Chain as ViemChain } from 'viem';
 import { Chain } from '@dynamic-labs/wallet-connector-core';
 import { EvmNetwork } from '@dynamic-labs/types';
 import { WalletSchema } from '@dynamic-labs/wallet-book';
@@ -14,7 +14,7 @@ declare abstract class InjectedWalletBase extends EthWalletConnector {
     getEthProviderHelper(): EthProviderHelper | undefined;
     getMobileOrInstalledWallet(): InjectedWalletBase;
     setupEventListeners(): void;
-    getWalletClient(chainId?: string): WalletClient | undefined;
+    getWalletClient(chainId?: string): WalletClient<Transport, ViemChain, Account> | undefined;
     isInstalledOnBrowser(): boolean;
     getAddress(): Promise<string | undefined>;
     connect(): Promise<void>;

package/src/injected/index.d.ts

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