@dynamic-labs/ethereum 3.0.0-alpha.5 → 3.0.0-alpha.50

package/src/EthWalletConnector.d.ts

@@ -1,6 +1,6 @@
 import { Account, Hex, PublicClient, Transport, Chain as ViemChain, WalletClient } from 'viem';
 import { IChainRpcProviders } from '@dynamic-labs/rpc-provider-ethereum';
-import { EvmNetwork, GenericNetwork, IUITransaction } from '@dynamic-labs/types';
+import { EvmNetwork, GenericNetwork, IUITransaction, TransactionReceipt } from '@dynamic-labs/types';
 import { WalletBookSchema } from '@dynamic-labs/wallet-book';
 import { ISendBalanceWalletConnector, NameServiceData, WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
 export type SwitchNetworkOps = {
@@ -23,7 +23,7 @@ export declare abstract class EthWalletConnector extends WalletConnectorBase imp
     getPublicClient(): Promise<void | PublicClient<Transport, ViemChain> | undefined>;
     constructor(props: EthWalletConnectorOpts);
     getNetwork(): Promise<number | undefined>;
-    getNameService(): Promise<NameServiceData | undefined>;
+    getNameService(address: string): Promise<NameServiceData | undefined>;
     isTestnet(): Promise<boolean>;
     parseAddress(address: string): string;
     getSigner(): Promise<{
@@ -3064,7 +3064,7 @@ export declare abstract class EthWalletConnector extends WalletConnectorBase imp
             uid?: undefined;
         } & import("viem").ExactPartial<Pick<import("viem").PublicActions<Transport, ViemChain, Account>, "call" | "createContractEventFilter" | "createEventFilter" | "estimateContractGas" | "estimateGas" | "getBlock" | "getBlockNumber" | "getChainId" | "getContractEvents" | "getEnsText" | "getFilterChanges" | "getGasPrice" | "getLogs" | "getTransaction" | "getTransactionCount" | "getTransactionReceipt" | "prepareTransactionRequest" | "readContract" | "sendRawTransaction" | "simulateContract" | "uninstallFilter" | "watchBlockNumber" | "watchContractEvent"> & Pick<import("viem").WalletActions<ViemChain, Account>, "sendTransaction" | "writeContract">>>(fn: (client: import("viem").Client<Transport, ViemChain, Account, import("viem").WalletRpcSchema, import("viem").WalletActions<ViemChain, Account>>) => client) => import("viem").Client<Transport, ViemChain, Account, import("viem").WalletRpcSchema, { [K_1 in keyof client]: client[K_1]; } & import("viem").WalletActions<ViemChain, Account>>;
     } | undefined>;
-    getBalance(): Promise<string | undefined>;
+    getBalance(address: string): Promise<string | undefined>;
     supportsNetworkSwitching(): boolean;
     switchNetwork({ networkName, networkChainId, }: SwitchNetworkOps): Promise<void>;
     getConnectedAccounts(): Promise<string[]>;
@@ -3082,5 +3082,6 @@ export declare abstract class EthWalletConnector extends WalletConnectorBase imp
     setActiveChain(chain: ViemChain | undefined): void;
     getActiveChain(): ViemChain | undefined;
     createUiTransaction(from: string): Promise<IUITransaction>;
+    confirmTransactionStatus(txHash: string): Promise<TransactionReceipt>;
 }
 export {};

package/src/EthWalletConnector.js

@@ -3,7 +3,7 @@ import { __awaiter } from '../_virtual/_tslib.js';
 import { getAddress, formatEther } from 'viem';
 import { toAccount } from 'viem/accounts';
 import { parseEvmNetworks, retryableFn, FALLBACK_UNDEFINED, DynamicError } from '@dynamic-labs/utils';
-import { chainsMap, getOrMapViemChain, createViemUiTransaction } from '@dynamic-labs/viem-utils';
+import { chainsMap, getOrMapViemChain, createViemUiTransaction } from '@dynamic-labs/ethereum-core';
 import { WalletConnectorBase, logger } from '@dynamic-labs/wallet-connector-core';
 import { findEvmNetwork } from './utils/findEvmNetwork.js';
 import { getNameservice } from './utils/getNameservice.js';
@@ -62,13 +62,10 @@ class EthWalletConnector extends WalletConnectorBase {
             return chainId;
         });
     }
-    getNameService() {
+    getNameService(address) {
         return __awaiter(this, void 0, void 0, function* () {
-            const [[address], rpcProvider] = yield Promise.all([
-                this.getConnectedAccounts(),
-                this.getPublicClient(),
-            ]);
-            if (!address || !rpcProvider) {
+            const rpcProvider = yield this.getPublicClient();
+            if (!rpcProvider) {
                 return;
             }
             return getNameservice({ address, rpcProvider });
@@ -96,13 +93,8 @@ class EthWalletConnector extends WalletConnectorBase {
             return this.getWalletClient();
         });
     }
-    getBalance() {
+    getBalance(address) {
         return __awaiter(this, void 0, void 0, function* () {
-            // This is equivalent to getSigner().getAddress() but does not crash
-            // if the signer is not available
-            const [address] = yield this.getConnectedAccounts();
-            if (!address)
-                return;
             const client = yield this.getPublicClient();
             const result = yield (client === null || client === void 0 ? void 0 : client.getBalance({
                 address: address,
@@ -142,7 +134,7 @@ class EthWalletConnector extends WalletConnectorBase {
                 return [];
             const addresses = yield retryableFn(provider.getAddresses, {
                 fallbackValue: [],
-                timeoutMs: 300,
+                timeoutMs: 500,
             });
             if (addresses.length) {
                 this.setActiveAccount(addresses[0]);
@@ -228,7 +220,25 @@ class EthWalletConnector extends WalletConnectorBase {
             if (!publicClient || !walletClient) {
                 throw new DynamicError('No public client available');
             }
-            return createViemUiTransaction({ from, publicClient, walletClient });
+            return createViemUiTransaction({
+                from,
+                publicClient,
+                walletClient,
+            });
+        });
+    }
+    confirmTransactionStatus(txHash) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const publicClient = yield this.getPublicClient();
+            if (!publicClient) {
+                throw new DynamicError('No public client available');
+            }
+            // The number of confirmations (blocks that have passed) to wait before resolving.
+            const confirmations = 3;
+            return publicClient.waitForTransactionReceipt({
+                confirmations,
+                hash: txHash,
+            });
         });
     }
 }

package/src/coinbase/coinbase.cjs

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../_virtual/_tslib.cjs');
 var viem = require('viem');
-var viemUtils = require('@dynamic-labs/viem-utils');
+var ethereumCore = require('@dynamic-labs/ethereum-core');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var EthWalletConnector = require('../EthWalletConnector.cjs');
 var helpers = require('./helpers.cjs');
@@ -19,7 +19,7 @@ class Coinbase extends EthWalletConnector.EthWalletConnector {
         this.supportedChains = ['EVM', 'ETH'];
         this.connectedChain = 'EVM';
         this.canConnectViaQrCode = false;
-        this.canConnectViaCustodialService = true;
+        this.canConnectViaCustodialService = !this.isInstalledOnBrowser();
         this.coinbaseProviderOpts = {
             appLogoUrl: appLogoUrl,
             appName: appName,
@@ -89,7 +89,7 @@ class Coinbase extends EthWalletConnector.EthWalletConnector {
     getWalletClient(chainId) {
         return viem.createWalletClient({
             account: this.getActiveAccount(),
-            chain: chainId ? viemUtils.chainsMap[chainId] : undefined,
+            chain: chainId ? ethereumCore.chainsMap[chainId] : undefined,
             transport: viem.custom(this.coinbaseProvider),
         });
     }

package/src/coinbase/coinbase.d.ts

@@ -9,12 +9,12 @@ export declare class Coinbase extends EthWalletConnector {
     supportedChains: Chain[];
     connectedChain: Chain;
     canConnectViaQrCode: boolean;
-    canConnectViaCustodialService: boolean;
     coinbaseProviderOpts: GetCoinbaseProviderOpts;
     constructor({ appName, appLogoUrl, evmNetworks, coinbaseWalletPreference, ...props }: CoinbaseOpts);
     get coinbaseProvider(): ProviderInterface;
     getConnectedAccounts(): Promise<string[]>;
     isInstalledOnBrowser(): boolean;
+    canConnectViaCustodialService: boolean;
     getAddress(): Promise<string | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;
     setupEventListeners(): void;

package/src/coinbase/coinbase.js

@@ -1,7 +1,7 @@
 'use client'
 import { __rest, __awaiter } from '../../_virtual/_tslib.js';
 import { toHex, toBytes, createWalletClient, custom } from 'viem';
-import { chainsMap } from '@dynamic-labs/viem-utils';
+import { chainsMap } from '@dynamic-labs/ethereum-core';
 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

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

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 { chainsMap } from '@dynamic-labs/viem-utils';
-import { Eip6963ProviderSingleton } from './eip6963Provider.js';
+import { getProvidersFromWindow, Eip6963ProviderSingleton } from '@dynamic-labs/utils';
+import { chainsMap } from '@dynamic-labs/ethereum-core';
 
 class EthProviderHelper {
     constructor(wallet, connector) {
@@ -66,7 +65,7 @@ class EthProviderHelper {
     eip6963ProviderLookup(rdns) {
         var _a;
         const { providers } = Eip6963ProviderSingleton.get();
-        return (_a = providers.find((provider) => provider.info.rdns === rdns)) === null || _a === void 0 ? void 0 : _a.provider;
+        return (_a = providers.find((provider) => { var _a; return ((_a = provider === null || provider === void 0 ? void 0 : provider.info) === null || _a === void 0 ? void 0 : _a.rdns) === rdns; })) === null || _a === void 0 ? void 0 : _a.provider;
     }
     isInstalledHelper() {
         return this.findProvider() !== undefined;

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.cjs

@@ -39,7 +39,7 @@ class InjectedWalletBase extends EthWalletConnector.EthWalletConnector {
         // when the user is in a webview, customers should set the deepLinkPreference prop to universal,
         // in which case this condition will be false, and the SDK will use WalletConnect (if available)
         if (((_b = (_a = this.wallet) === null || _a === void 0 ? void 0 : _a.mobile) === null || _b === void 0 ? void 0 : _b.inAppBrowser) &&
-            this.constructorProps.deepLinkPreference !== 'universal' &&
+            this.mobileExperience === 'in-app-browser' &&
             utils.isMobile()) {
             return this;
         }

package/src/injected/InjectedWalletBase.js

@@ -37,7 +37,7 @@ class InjectedWalletBase extends EthWalletConnector {
         // when the user is in a webview, customers should set the deepLinkPreference prop to universal,
         // in which case this condition will be false, and the SDK will use WalletConnect (if available)
         if (((_b = (_a = this.wallet) === null || _a === void 0 ? void 0 : _a.mobile) === null || _b === void 0 ? void 0 : _b.inAppBrowser) &&
-            this.constructorProps.deepLinkPreference !== 'universal' &&
+            this.mobileExperience === 'in-app-browser' &&
             isMobile()) {
             return this;
         }

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';