@dynamic-labs/ethereum-aa 4.15.0 → 4.17.0

package/CHANGELOG.md

@@ -1,4 +1,28 @@
 
+## [4.17.0](https://github.com/dynamic-labs/dynamic-auth/compare/v4.16.0...v4.17.0) (2025-05-06)
+
+
+### Features
+
+* add chain id option to create kernel client in react-native ([#8650](https://github.com/dynamic-labs/dynamic-auth/issues/8650)) ([1450bea](https://github.com/dynamic-labs/dynamic-auth/commit/1450bea6f979a82ed4880700aff14fa1ead9dc60))
+* add sendCalls method to EthereumWallet ([#8634](https://github.com/dynamic-labs/dynamic-auth/issues/8634)) ([7c9aef9](https://github.com/dynamic-labs/dynamic-auth/commit/7c9aef95382b4823a40279bebfb084de32c25610))
+
+
+### Bug Fixes
+
+* 7702 do not override existing old aa ([#8630](https://github.com/dynamic-labs/dynamic-auth/issues/8630)) ([a731d9e](https://github.com/dynamic-labs/dynamic-auth/commit/a731d9e77ecd9e1dec3a7704a63989b5f2741a57))
+* improve error message when email login fails ([#8649](https://github.com/dynamic-labs/dynamic-auth/issues/8649)) ([e1c03ac](https://github.com/dynamic-labs/dynamic-auth/commit/e1c03ac6dc83386c63d63db59d31355bc4fe2959))
+* improve react-native stability on android ([#8652](https://github.com/dynamic-labs/dynamic-auth/issues/8652)) ([1617546](https://github.com/dynamic-labs/dynamic-auth/commit/1617546e6053c2ab32f7d385336c47df185d077f))
+
+## [4.16.0](https://github.com/dynamic-labs/dynamic-auth/compare/v4.15.0...v4.16.0) (2025-05-03)
+
+
+### Features
+
+* (GVTY-3020) add send balance to waas sui connector ([#8638](https://github.com/dynamic-labs/dynamic-auth/issues/8638)) ([97f0af0](https://github.com/dynamic-labs/dynamic-auth/commit/97f0af0504a0079ebf0958fde1f8edc34c035927))
+* add isAtomicSupported and isPaymasterServiceSupported methods to EthereumWallet ([#8627](https://github.com/dynamic-labs/dynamic-auth/issues/8627)) ([df82b9e](https://github.com/dynamic-labs/dynamic-auth/commit/df82b9e86eafea9dd6c505227722450bc56d7c57))
+* add solana mpc to global wallets ([#8605](https://github.com/dynamic-labs/dynamic-auth/issues/8605)) ([6261bf9](https://github.com/dynamic-labs/dynamic-auth/commit/6261bf9bec45b1d1afa13869cf5d10cda215783e))
+
 ## [4.15.0](https://github.com/dynamic-labs/dynamic-auth/compare/v4.14.0...v4.15.0) (2025-04-30)
 
 

package/package.cjs

@@ -3,6 +3,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "4.15.0";
+var version = "4.17.0";
 
 exports.version = version;

package/package.js

@@ -1,4 +1,4 @@
 'use client'
-var version = "4.15.0";
+var version = "4.17.0";
 
 export { version };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/ethereum-aa",
-  "version": "4.15.0",
+  "version": "4.17.0",
   "description": "A React SDK for implementing wallet web3 authentication and authorization to your website.",
   "author": "Dynamic Labs, Inc.",
   "license": "MIT",
@@ -19,17 +19,17 @@
   "homepage": "https://www.dynamic.xyz/",
   "dependencies": {
     "@dynamic-labs/sdk-api-core": "0.0.660",
-    "@zerodev/ecdsa-validator": "5.4.4",
-    "@zerodev/multi-chain-ecdsa-validator": "5.4.3",
-    "@zerodev/sdk": "5.4.26",
-    "@dynamic-labs/assert-package-version": "4.15.0",
-    "@dynamic-labs/ethereum-aa-core": "4.15.0",
-    "@dynamic-labs/ethereum-core": "4.15.0",
-    "@dynamic-labs/logger": "4.15.0",
-    "@dynamic-labs/types": "4.15.0",
-    "@dynamic-labs/utils": "4.15.0",
-    "@dynamic-labs/wallet-book": "4.15.0",
-    "@dynamic-labs/wallet-connector-core": "4.15.0"
+    "@zerodev/ecdsa-validator": "5.4.8",
+    "@zerodev/multi-chain-ecdsa-validator": "5.4.5",
+    "@zerodev/sdk": "5.4.34",
+    "@dynamic-labs/assert-package-version": "4.17.0",
+    "@dynamic-labs/ethereum-aa-core": "4.17.0",
+    "@dynamic-labs/ethereum-core": "4.17.0",
+    "@dynamic-labs/logger": "4.17.0",
+    "@dynamic-labs/types": "4.17.0",
+    "@dynamic-labs/utils": "4.17.0",
+    "@dynamic-labs/wallet-book": "4.17.0",
+    "@dynamic-labs/wallet-connector-core": "4.17.0"
   },
   "peerDependencies": {
     "viem": "^2.21.60"

package/src/ZeroDevConnector.cjs

@@ -8,6 +8,7 @@ var viem = require('viem');
 var accounts = require('viem/accounts');
 var constants$1 = require('@zerodev/sdk/constants');
 var ethereumCore = require('@dynamic-labs/ethereum-core');
+var sdkApiCore = require('@dynamic-labs/sdk-api-core');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var utils = require('@dynamic-labs/utils');
 var ethereumAaCore = require('@dynamic-labs/ethereum-aa-core');
@@ -18,6 +19,7 @@ var getEcdsaValidator = require('./utils/getEcdsaValidator.cjs');
 var getEntryPoint = require('./utils/getEntryPoint.cjs');
 var getKernelVersion = require('./utils/getKernelVersion.cjs');
 var isEVMAuthorizationCapable = require('./utils/isEVMAuthorizationCapable.cjs');
+var hasSmartAccount = require('./utils/hasSmartAccount.cjs');
 
 class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
     constructor(opts) {
@@ -41,9 +43,15 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
             },
             name: 'ZeroDev',
         };
+        this.hasExistingSmartAccount = false;
+        /**
+         * Flag for EIP-7702 mode, enabled when EIP-7702 is enabled and no smart account exists
+         */
+        this.shouldUseEIP7702Mode = false;
         this._walletUiUtils = opts.walletUiUtils;
         this.providersConfig = (_a = opts.providersConfig) !== null && _a !== void 0 ? _a : {};
-        this.enableEIP7702Mode = (_c = (_b = opts.apiProviders.zerodev) === null || _b === void 0 ? void 0 : _b.enableEIP7702) !== null && _c !== void 0 ? _c : false;
+        this.is7702EnabledOnDashboard =
+            (_c = (_b = opts.apiProviders.zerodev) === null || _b === void 0 ? void 0 : _b.enableEIP7702) !== null && _c !== void 0 ? _c : false;
         this.entryPoint = getEntryPoint.getEntryPoint((_d = opts.apiProviders.zerodev) === null || _d === void 0 ? void 0 : _d.entryPointVersion);
         this.kernelVersion = getKernelVersion.getKernelVersion((_e = opts.apiProviders.zerodev) === null || _e === void 0 ? void 0 : _e.kernelVersion, this.entryPoint);
         this.enableKernelV3Migration =
@@ -120,17 +128,22 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
         });
     }
     initialize(_a) {
-        return _tslib.__awaiter(this, arguments, void 0, function* ({ smartWalletAddress, eoaAddress, eoaConnector, properties, shouldSetEoaConnector, }) {
+        return _tslib.__awaiter(this, arguments, void 0, function* ({ smartWalletAddress, eoaAddress, eoaConnector, properties, shouldSetEoaConnector, verifiedCredentials, }) {
             yield this.registerEoa(Object.assign({ eoaAddress,
                 eoaConnector,
                 shouldSetEoaConnector,
-                smartWalletAddress }, properties));
+                smartWalletAddress,
+                verifiedCredentials }, properties));
         });
     }
     registerEoa(_a) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            var { smartWalletAddress, eoaAddress, eoaConnector, shouldSetEoaConnector = false } = _a, properties = _tslib.__rest(_a, ["smartWalletAddress", "eoaAddress", "eoaConnector", "shouldSetEoaConnector"]);
-            if (this.enableEIP7702Mode) {
+            var { smartWalletAddress, eoaAddress, eoaConnector, verifiedCredentials, shouldSetEoaConnector = false } = _a, properties = _tslib.__rest(_a, ["smartWalletAddress", "eoaAddress", "eoaConnector", "verifiedCredentials", "shouldSetEoaConnector"]);
+            if (!eoaConnector) {
+                throw new utils.DynamicError('No EOA connector');
+            }
+            this.determineSmartAccountStatus(eoaConnector, verifiedCredentials);
+            if (this.shouldUseEIP7702Mode) {
                 // In EIP-7702, addresses must match
                 if (smartWalletAddress !== eoaAddress) {
                     throw new Error('In EIP-7702 mode, smart wallet and EOA addresses must be the same');
@@ -158,6 +171,14 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
             }
         });
     }
+    determineSmartAccountStatus(eoaConnector, verifiedCredentials) {
+        if (walletConnectorCore.getWalletProvider(eoaConnector) !== sdkApiCore.WalletProviderEnum.EmbeddedWallet) {
+            return;
+        }
+        this.hasExistingSmartAccount = hasSmartAccount.hasSmartAccount(verifiedCredentials);
+        this.shouldUseEIP7702Mode =
+            this.is7702EnabledOnDashboard && !this.hasExistingSmartAccount;
+    }
     getOrCreateAuthorization() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             var _a;
@@ -231,7 +252,7 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
             }
             const signer = yield this.eoaConnector.getSigner();
             signer.account = accounts.toAccount(eoaAddress);
-            if (this.enableEIP7702Mode) {
+            if (this.shouldUseEIP7702Mode) {
                 this.authorization = yield this.getOrCreateAuthorization();
             }
             yield this.generateProviderMap(signer);
@@ -296,6 +317,7 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
     }
     createKernelClient(_a) {
         return _tslib.__awaiter(this, arguments, void 0, function* ({ chainId, projectId, signer, paymaster, authorization, }) {
+            var _b;
             if (chainId && this.providerMap[chainId]) {
                 return paymaster === 'SPONSOR'
                     ? this.providerMap[chainId].kernelClientWithSponsorship
@@ -305,8 +327,10 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
             if (!eoaConnector)
                 throw new utils.DynamicError('No EOA connector');
             const chain = ethereumCore.chainsMap[chainId];
+            const network = this.evmNetworks.find((network) => network.chainId === utils.parseChainId(chainId));
+            const publicClientRpc = (_b = network === null || network === void 0 ? void 0 : network.privateCustomerRpcUrls) === null || _b === void 0 ? void 0 : _b[0];
             let kernelClient;
-            if (this.enableEIP7702Mode) {
+            if (this.shouldUseEIP7702Mode) {
                 kernelClient = yield createEcdsaKernelAccountClient.createEcdsaKernelAccountClientWith7702({
                     authorization,
                     bundlerRpc: ZeroDevConnector.bundlerRpc,
@@ -319,6 +343,7 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
                     paymasterRpc: ZeroDevConnector.paymasterRpc,
                     projectId,
                     provider: ZeroDevConnector.bundlerProvider,
+                    publicClientRpc,
                     signer,
                 });
             }
@@ -334,6 +359,7 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
                     paymasterRpc: ZeroDevConnector.paymasterRpc,
                     projectId,
                     provider: ZeroDevConnector.bundlerProvider,
+                    publicClientRpc,
                     signer,
                 });
             }
@@ -347,7 +373,7 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
     getAddress() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c;
-            if (this.enableEIP7702Mode) {
+            if (this.shouldUseEIP7702Mode) {
                 return this.eoaAddress;
             }
             yield ((_a = this.kernelClientDeferredPromise) === null || _a === void 0 ? void 0 : _a.promise);
@@ -568,7 +594,7 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
     }
     validateActiveWallet(expectedAddress) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            if (this.enableEIP7702Mode) {
+            if (this.shouldUseEIP7702Mode) {
                 const currentAddress = yield this.getAddress();
                 if (currentAddress !== expectedAddress) {
                     throw new utils.DynamicError('Invalid active wallet');

package/src/ZeroDevConnector.d.ts

@@ -1,11 +1,11 @@
 import { KernelAccountClient } from '@zerodev/sdk/clients';
 import { SmartAccount, EntryPointVersion } from 'viem/account-abstraction';
-import { Client, PublicClient, RpcSchema, Transport, WalletClient } from 'viem';
+import { Account, Client, PublicClient, RpcSchema, Transport, WalletClient } from 'viem';
 import { SignAuthorizationReturnType } from 'viem/accounts';
 import { type Chain as ViemChain } from 'viem/chains';
 import { EntryPointType, KERNEL_VERSION_TYPE } from '@zerodev/sdk/types';
 import { EthereumWallet, RegisterEvmProvidersConfig } from '@dynamic-labs/ethereum-core';
-import { EcdsaValidatorOptions, Provider, ProviderEntryPointVersionEnum, ProviderEnum, ProviderKernelVersionEnum, ProviderMultichainAccountAbstractionProviders, SmartWalletProperties } from '@dynamic-labs/sdk-api-core';
+import { EcdsaValidatorOptions, Provider, ProviderEntryPointVersionEnum, ProviderEnum, ProviderKernelVersionEnum, ProviderMultichainAccountAbstractionProviders, SmartWalletProperties, JwtVerifiedCredential } from '@dynamic-labs/sdk-api-core';
 import { Chain, InternalWalletConnector, IZeroDevConnector } from '@dynamic-labs/wallet-connector-core';
 import { WalletBookSchema } from '@dynamic-labs/wallet-book';
 import { GenericNetwork, TransactionReceipt, WalletUiUtils } from '@dynamic-labs/types';
@@ -60,8 +60,13 @@ export declare class ZeroDevConnector extends AccountAbstractionBaseConnector im
         };
         name: string;
     };
-    enableEIP7702Mode: boolean;
+    is7702EnabledOnDashboard: boolean;
     private authorization?;
+    private hasExistingSmartAccount;
+    /**
+     * Flag for EIP-7702 mode, enabled when EIP-7702 is enabled and no smart account exists
+     */
+    private shouldUseEIP7702Mode;
     constructor(opts: ZeroDevConnectorProps);
     confirmTransactionStatus(): Promise<TransactionReceipt>;
     get currentNetworkProvider(): {
@@ -79,22 +84,25 @@ export declare class ZeroDevConnector extends AccountAbstractionBaseConnector im
         withSponsorship?: boolean;
     }): T;
     endSession(): Promise<void>;
-    initialize({ smartWalletAddress, eoaAddress, eoaConnector, properties, shouldSetEoaConnector, }: {
+    initialize({ smartWalletAddress, eoaAddress, eoaConnector, properties, shouldSetEoaConnector, verifiedCredentials, }: {
         smartWalletAddress: string;
         eoaAddress: string;
         eoaConnector: InternalWalletConnector;
         shouldSetEoaConnector: boolean;
         properties?: SmartWalletProperties;
+        verifiedCredentials: JwtVerifiedCredential[];
     }): Promise<void>;
-    registerEoa({ smartWalletAddress, eoaAddress, eoaConnector, shouldSetEoaConnector, ...properties }: {
+    registerEoa({ smartWalletAddress, eoaAddress, eoaConnector, verifiedCredentials, shouldSetEoaConnector, ...properties }: {
         smartWalletAddress: string;
         eoaAddress: string;
         eoaConnector: InternalWalletConnector;
+        verifiedCredentials: JwtVerifiedCredential[];
         shouldSetEoaConnector: boolean;
         ecdsaProviderType?: EcdsaValidatorOptions;
         kernelVersion?: ProviderKernelVersionEnum;
         entryPointVersion?: ProviderEntryPointVersionEnum;
     }): Promise<void>;
+    private determineSmartAccountStatus;
     private getOrCreateAuthorization;
     private setEoaConnector;
     private warnIfProjectChainNotEnabled;
@@ -110,7 +118,7 @@ export declare class ZeroDevConnector extends AccountAbstractionBaseConnector im
     getConnectedAccounts(): Promise<string[]>;
     getNetwork(): Promise<number | undefined>;
     private getTransport;
-    getWalletClient(chainId?: string): WalletClient<Transport, ViemChain> | undefined;
+    getWalletClient(chainId?: string): WalletClient<Transport, ViemChain, Account> | undefined;
     getPublicClient(): Promise<void | PublicClient<Transport, ViemChain> | undefined>;
     formatUserOperation(params: any): Promise<{
         callData: any;

package/src/ZeroDevConnector.js

@@ -4,7 +4,8 @@ import { publicActions, custom, createWalletClient, toHex, formatEther } from 'v
 import { toAccount } from 'viem/accounts';
 import { KERNEL_V3_3_BETA, KernelVersionToAddressesMap, getEntryPoint as getEntryPoint$1 } from '@zerodev/sdk/constants';
 import { EthereumWallet, isEthWalletConnector, chainsMap, confirmationTransport, unFormatTransaction } from '@dynamic-labs/ethereum-core';
-import { eventListenerHandlers } from '@dynamic-labs/wallet-connector-core';
+import { WalletProviderEnum } from '@dynamic-labs/sdk-api-core';
+import { eventListenerHandlers, getWalletProvider } from '@dynamic-labs/wallet-connector-core';
 import { parseEvmNetworks, StorageService, DynamicError, DeferredPromise, parseChainId, wrapMethodWithCallback, TransactionGasCannotBeSponsoredError, InsufficientFundsError } from '@dynamic-labs/utils';
 import { AccountAbstractionBaseConnector } from '@dynamic-labs/ethereum-aa-core';
 import { ZERO_DEV_LAST_USED_CHAIN_ID_KEY } from './constants.js';
@@ -14,6 +15,7 @@ import { getEcdsaValidator } from './utils/getEcdsaValidator.js';
 import { getEntryPoint } from './utils/getEntryPoint.js';
 import { getKernelVersion } from './utils/getKernelVersion.js';
 import { isEVMAuthorizationCapable } from './utils/isEVMAuthorizationCapable.js';
+import { hasSmartAccount } from './utils/hasSmartAccount.js';
 
 class ZeroDevConnector extends AccountAbstractionBaseConnector {
     constructor(opts) {
@@ -37,9 +39,15 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
             },
             name: 'ZeroDev',
         };
+        this.hasExistingSmartAccount = false;
+        /**
+         * Flag for EIP-7702 mode, enabled when EIP-7702 is enabled and no smart account exists
+         */
+        this.shouldUseEIP7702Mode = false;
         this._walletUiUtils = opts.walletUiUtils;
         this.providersConfig = (_a = opts.providersConfig) !== null && _a !== void 0 ? _a : {};
-        this.enableEIP7702Mode = (_c = (_b = opts.apiProviders.zerodev) === null || _b === void 0 ? void 0 : _b.enableEIP7702) !== null && _c !== void 0 ? _c : false;
+        this.is7702EnabledOnDashboard =
+            (_c = (_b = opts.apiProviders.zerodev) === null || _b === void 0 ? void 0 : _b.enableEIP7702) !== null && _c !== void 0 ? _c : false;
         this.entryPoint = getEntryPoint((_d = opts.apiProviders.zerodev) === null || _d === void 0 ? void 0 : _d.entryPointVersion);
         this.kernelVersion = getKernelVersion((_e = opts.apiProviders.zerodev) === null || _e === void 0 ? void 0 : _e.kernelVersion, this.entryPoint);
         this.enableKernelV3Migration =
@@ -116,17 +124,22 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
         });
     }
     initialize(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ smartWalletAddress, eoaAddress, eoaConnector, properties, shouldSetEoaConnector, }) {
+        return __awaiter(this, arguments, void 0, function* ({ smartWalletAddress, eoaAddress, eoaConnector, properties, shouldSetEoaConnector, verifiedCredentials, }) {
             yield this.registerEoa(Object.assign({ eoaAddress,
                 eoaConnector,
                 shouldSetEoaConnector,
-                smartWalletAddress }, properties));
+                smartWalletAddress,
+                verifiedCredentials }, properties));
         });
     }
     registerEoa(_a) {
         return __awaiter(this, void 0, void 0, function* () {
-            var { smartWalletAddress, eoaAddress, eoaConnector, shouldSetEoaConnector = false } = _a, properties = __rest(_a, ["smartWalletAddress", "eoaAddress", "eoaConnector", "shouldSetEoaConnector"]);
-            if (this.enableEIP7702Mode) {
+            var { smartWalletAddress, eoaAddress, eoaConnector, verifiedCredentials, shouldSetEoaConnector = false } = _a, properties = __rest(_a, ["smartWalletAddress", "eoaAddress", "eoaConnector", "verifiedCredentials", "shouldSetEoaConnector"]);
+            if (!eoaConnector) {
+                throw new DynamicError('No EOA connector');
+            }
+            this.determineSmartAccountStatus(eoaConnector, verifiedCredentials);
+            if (this.shouldUseEIP7702Mode) {
                 // In EIP-7702, addresses must match
                 if (smartWalletAddress !== eoaAddress) {
                     throw new Error('In EIP-7702 mode, smart wallet and EOA addresses must be the same');
@@ -154,6 +167,14 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
             }
         });
     }
+    determineSmartAccountStatus(eoaConnector, verifiedCredentials) {
+        if (getWalletProvider(eoaConnector) !== WalletProviderEnum.EmbeddedWallet) {
+            return;
+        }
+        this.hasExistingSmartAccount = hasSmartAccount(verifiedCredentials);
+        this.shouldUseEIP7702Mode =
+            this.is7702EnabledOnDashboard && !this.hasExistingSmartAccount;
+    }
     getOrCreateAuthorization() {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
@@ -227,7 +248,7 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
             }
             const signer = yield this.eoaConnector.getSigner();
             signer.account = toAccount(eoaAddress);
-            if (this.enableEIP7702Mode) {
+            if (this.shouldUseEIP7702Mode) {
                 this.authorization = yield this.getOrCreateAuthorization();
             }
             yield this.generateProviderMap(signer);
@@ -292,6 +313,7 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
     }
     createKernelClient(_a) {
         return __awaiter(this, arguments, void 0, function* ({ chainId, projectId, signer, paymaster, authorization, }) {
+            var _b;
             if (chainId && this.providerMap[chainId]) {
                 return paymaster === 'SPONSOR'
                     ? this.providerMap[chainId].kernelClientWithSponsorship
@@ -301,8 +323,10 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
             if (!eoaConnector)
                 throw new DynamicError('No EOA connector');
             const chain = chainsMap[chainId];
+            const network = this.evmNetworks.find((network) => network.chainId === parseChainId(chainId));
+            const publicClientRpc = (_b = network === null || network === void 0 ? void 0 : network.privateCustomerRpcUrls) === null || _b === void 0 ? void 0 : _b[0];
             let kernelClient;
-            if (this.enableEIP7702Mode) {
+            if (this.shouldUseEIP7702Mode) {
                 kernelClient = yield createEcdsaKernelAccountClientWith7702({
                     authorization,
                     bundlerRpc: ZeroDevConnector.bundlerRpc,
@@ -315,6 +339,7 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
                     paymasterRpc: ZeroDevConnector.paymasterRpc,
                     projectId,
                     provider: ZeroDevConnector.bundlerProvider,
+                    publicClientRpc,
                     signer,
                 });
             }
@@ -330,6 +355,7 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
                     paymasterRpc: ZeroDevConnector.paymasterRpc,
                     projectId,
                     provider: ZeroDevConnector.bundlerProvider,
+                    publicClientRpc,
                     signer,
                 });
             }
@@ -343,7 +369,7 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
     getAddress() {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c;
-            if (this.enableEIP7702Mode) {
+            if (this.shouldUseEIP7702Mode) {
                 return this.eoaAddress;
             }
             yield ((_a = this.kernelClientDeferredPromise) === null || _a === void 0 ? void 0 : _a.promise);
@@ -564,7 +590,7 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
     }
     validateActiveWallet(expectedAddress) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.enableEIP7702Mode) {
+            if (this.shouldUseEIP7702Mode) {
                 const currentAddress = yield this.getAddress();
                 if (currentAddress !== expectedAddress) {
                     throw new DynamicError('Invalid active wallet');

package/src/utils/createEcdsaKernelAccountClient.cjs

@@ -26,10 +26,10 @@ const getZeroDevPaymasterRPC = (projectId, provider) => {
     return rpc;
 };
 const isERC20 = (value) => viem.isAddress(value);
-const createPublicAndPaymasterClients = (bundlerRpc, paymasterRpc, chain) => {
+const createPublicAndPaymasterClients = (bundlerRpc, paymasterRpc, chain, publicClientRpc) => {
     const publicClient = viem.createPublicClient({
         chain,
-        transport: viem.http(bundlerRpc),
+        transport: publicClientRpc ? viem.http(publicClientRpc) : viem.http(bundlerRpc),
     });
     const zerodevPaymaster = clients.createZeroDevPaymasterClient({
         chain,
@@ -65,10 +65,10 @@ const createKernelClientConfig = (account, bundlerRpc, chain, publicClient, paym
         estimateFeesPerGas: (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ bundlerClient }) { return actions.getUserOperationGasPrice(bundlerClient); }),
     },
 });
-const createEcdsaKernelAccountClient = (_b) => _tslib.__awaiter(void 0, [_b], void 0, function* ({ bundlerRpc, chain, paymasterRpc, projectId, signer, provider, paymaster = 'SPONSOR', entryPoint, kernelVersion, ecdsaValidator: ecdsaValidator$1, enableKernelV3Migration, }) {
+const createEcdsaKernelAccountClient = (_b) => _tslib.__awaiter(void 0, [_b], void 0, function* ({ bundlerRpc, chain, paymasterRpc, projectId, signer, provider, paymaster = 'SPONSOR', entryPoint, kernelVersion, ecdsaValidator: ecdsaValidator$1, enableKernelV3Migration, publicClientRpc, }) {
     const resolvedBundlerRpc = bundlerRpc !== null && bundlerRpc !== void 0 ? bundlerRpc : getZeroDevBundlerRPC(projectId, provider);
     const resolvedPaymasterRpc = paymasterRpc !== null && paymasterRpc !== void 0 ? paymasterRpc : getZeroDevPaymasterRPC(projectId, provider);
-    const { publicClient, zerodevPaymaster } = createPublicAndPaymasterClients(resolvedBundlerRpc, resolvedPaymasterRpc, chain);
+    const { publicClient, zerodevPaymaster } = createPublicAndPaymasterClients(resolvedBundlerRpc, resolvedPaymasterRpc, chain, publicClientRpc);
     const validator = yield ecdsaValidator$1(publicClient, {
         entryPoint,
         kernelVersion,
@@ -97,10 +97,10 @@ const createEcdsaKernelAccountClient = (_b) => _tslib.__awaiter(void 0, [_b], vo
     const clientConfig = createKernelClientConfig(selectedAccount, resolvedBundlerRpc, chain, publicClient, paymasterHandler);
     return clients.createKernelAccountClient(clientConfig);
 });
-const createEcdsaKernelAccountClientWith7702 = (_c) => _tslib.__awaiter(void 0, [_c], void 0, function* ({ bundlerRpc, chain, paymasterRpc, projectId, signer, provider, authorization, paymaster = 'SPONSOR', entryPoint, kernelVersion, ecdsaValidator, }) {
+const createEcdsaKernelAccountClientWith7702 = (_c) => _tslib.__awaiter(void 0, [_c], void 0, function* ({ bundlerRpc, chain, paymasterRpc, projectId, signer, provider, authorization, paymaster = 'SPONSOR', entryPoint, kernelVersion, ecdsaValidator, publicClientRpc, }) {
     const resolvedBundlerRpc = bundlerRpc !== null && bundlerRpc !== void 0 ? bundlerRpc : getZeroDevBundlerRPC(projectId, provider);
     const resolvedPaymasterRpc = paymasterRpc !== null && paymasterRpc !== void 0 ? paymasterRpc : getZeroDevPaymasterRPC(projectId, provider);
-    const { publicClient, zerodevPaymaster } = createPublicAndPaymasterClients(resolvedBundlerRpc, resolvedPaymasterRpc, chain);
+    const { publicClient, zerodevPaymaster } = createPublicAndPaymasterClients(resolvedBundlerRpc, resolvedPaymasterRpc, chain, publicClientRpc);
     const validator = yield ecdsaValidator(publicClient, {
         entryPoint,
         kernelVersion,

package/src/utils/createEcdsaKernelAccountClient.d.ts

@@ -21,9 +21,10 @@ type CommonClientParams<TChain extends Chain | undefined = Chain | undefined> =
     kernelVersion: GetKernelVersion<EntryPointVersion>;
     ecdsaValidator: any;
     enableKernelV3Migration: boolean;
+    publicClientRpc?: string;
 };
-export declare const createEcdsaKernelAccountClient: <entryPoint extends EntryPointVersion, TChain extends ViemChain | undefined = ViemChain | undefined>({ bundlerRpc, chain, paymasterRpc, projectId, signer, provider, paymaster, entryPoint, kernelVersion, ecdsaValidator, enableKernelV3Migration, }: CommonClientParams<TChain>) => Promise<KernelAccountClient<Transport, ViemChain, SmartAccount, Client, RpcSchema>>;
-export declare const createEcdsaKernelAccountClientWith7702: <TChain extends ViemChain | undefined = ViemChain | undefined>({ bundlerRpc, chain, paymasterRpc, projectId, signer, provider, authorization, paymaster, entryPoint, kernelVersion, ecdsaValidator, }: CommonClientParams<TChain> & {
+export declare const createEcdsaKernelAccountClient: <entryPoint extends EntryPointVersion, TChain extends ViemChain | undefined = ViemChain | undefined>({ bundlerRpc, chain, paymasterRpc, projectId, signer, provider, paymaster, entryPoint, kernelVersion, ecdsaValidator, enableKernelV3Migration, publicClientRpc, }: CommonClientParams<TChain>) => Promise<KernelAccountClient<Transport, ViemChain, SmartAccount, Client, RpcSchema>>;
+export declare const createEcdsaKernelAccountClientWith7702: <TChain extends ViemChain | undefined = ViemChain | undefined>({ bundlerRpc, chain, paymasterRpc, projectId, signer, provider, authorization, paymaster, entryPoint, kernelVersion, ecdsaValidator, publicClientRpc, }: CommonClientParams<TChain> & {
     authorization?: SignAuthorizationReturnType;
 }) => Promise<KernelAccountClient<Transport, ViemChain, SmartAccount, Client, RpcSchema>>;
 export {};

package/src/utils/createEcdsaKernelAccountClient.js

@@ -22,10 +22,10 @@ const getZeroDevPaymasterRPC = (projectId, provider) => {
     return rpc;
 };
 const isERC20 = (value) => isAddress(value);
-const createPublicAndPaymasterClients = (bundlerRpc, paymasterRpc, chain) => {
+const createPublicAndPaymasterClients = (bundlerRpc, paymasterRpc, chain, publicClientRpc) => {
     const publicClient = createPublicClient({
         chain,
-        transport: http(bundlerRpc),
+        transport: publicClientRpc ? http(publicClientRpc) : http(bundlerRpc),
     });
     const zerodevPaymaster = createZeroDevPaymasterClient({
         chain,
@@ -61,10 +61,10 @@ const createKernelClientConfig = (account, bundlerRpc, chain, publicClient, paym
         estimateFeesPerGas: (_a) => __awaiter(void 0, [_a], void 0, function* ({ bundlerClient }) { return getUserOperationGasPrice(bundlerClient); }),
     },
 });
-const createEcdsaKernelAccountClient = (_b) => __awaiter(void 0, [_b], void 0, function* ({ bundlerRpc, chain, paymasterRpc, projectId, signer, provider, paymaster = 'SPONSOR', entryPoint, kernelVersion, ecdsaValidator, enableKernelV3Migration, }) {
+const createEcdsaKernelAccountClient = (_b) => __awaiter(void 0, [_b], void 0, function* ({ bundlerRpc, chain, paymasterRpc, projectId, signer, provider, paymaster = 'SPONSOR', entryPoint, kernelVersion, ecdsaValidator, enableKernelV3Migration, publicClientRpc, }) {
     const resolvedBundlerRpc = bundlerRpc !== null && bundlerRpc !== void 0 ? bundlerRpc : getZeroDevBundlerRPC(projectId, provider);
     const resolvedPaymasterRpc = paymasterRpc !== null && paymasterRpc !== void 0 ? paymasterRpc : getZeroDevPaymasterRPC(projectId, provider);
-    const { publicClient, zerodevPaymaster } = createPublicAndPaymasterClients(resolvedBundlerRpc, resolvedPaymasterRpc, chain);
+    const { publicClient, zerodevPaymaster } = createPublicAndPaymasterClients(resolvedBundlerRpc, resolvedPaymasterRpc, chain, publicClientRpc);
     const validator = yield ecdsaValidator(publicClient, {
         entryPoint,
         kernelVersion,
@@ -93,10 +93,10 @@ const createEcdsaKernelAccountClient = (_b) => __awaiter(void 0, [_b], void 0, f
     const clientConfig = createKernelClientConfig(selectedAccount, resolvedBundlerRpc, chain, publicClient, paymasterHandler);
     return createKernelAccountClient(clientConfig);
 });
-const createEcdsaKernelAccountClientWith7702 = (_c) => __awaiter(void 0, [_c], void 0, function* ({ bundlerRpc, chain, paymasterRpc, projectId, signer, provider, authorization, paymaster = 'SPONSOR', entryPoint, kernelVersion, ecdsaValidator, }) {
+const createEcdsaKernelAccountClientWith7702 = (_c) => __awaiter(void 0, [_c], void 0, function* ({ bundlerRpc, chain, paymasterRpc, projectId, signer, provider, authorization, paymaster = 'SPONSOR', entryPoint, kernelVersion, ecdsaValidator, publicClientRpc, }) {
     const resolvedBundlerRpc = bundlerRpc !== null && bundlerRpc !== void 0 ? bundlerRpc : getZeroDevBundlerRPC(projectId, provider);
     const resolvedPaymasterRpc = paymasterRpc !== null && paymasterRpc !== void 0 ? paymasterRpc : getZeroDevPaymasterRPC(projectId, provider);
-    const { publicClient, zerodevPaymaster } = createPublicAndPaymasterClients(resolvedBundlerRpc, resolvedPaymasterRpc, chain);
+    const { publicClient, zerodevPaymaster } = createPublicAndPaymasterClients(resolvedBundlerRpc, resolvedPaymasterRpc, chain, publicClientRpc);
     const validator = yield ecdsaValidator(publicClient, {
         entryPoint,
         kernelVersion,

package/src/utils/hasSmartAccount.cjs

@@ -0,0 +1,20 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const hasSmartAccount = (verifiedCredentials) => {
+    const embeddedWallet = verifiedCredentials.find((vc) => vc.walletProvider === 'embeddedWallet' &&
+        (vc.walletName === 'dynamicwaas' ||
+            vc.walletName === 'turnkey' ||
+            vc.walletName === 'turnkeyhd'));
+    if (!embeddedWallet)
+        return false;
+    const hasSmartContractWallet = verifiedCredentials.find((vc) => vc.walletProvider === 'smartContractWallet' &&
+        vc.signerRefId === embeddedWallet.id);
+    if (!hasSmartContractWallet)
+        return false;
+    return !hasSmartContractWallet.id.includes('zerodev');
+};
+
+exports.hasSmartAccount = hasSmartAccount;

package/src/utils/hasSmartAccount.d.ts

@@ -0,0 +1,2 @@
+import { JwtVerifiedCredential } from '@dynamic-labs/sdk-api-core';
+export declare const hasSmartAccount: (verifiedCredentials: JwtVerifiedCredential[]) => boolean;

package/src/utils/hasSmartAccount.js

@@ -0,0 +1,16 @@
+'use client'
+const hasSmartAccount = (verifiedCredentials) => {
+    const embeddedWallet = verifiedCredentials.find((vc) => vc.walletProvider === 'embeddedWallet' &&
+        (vc.walletName === 'dynamicwaas' ||
+            vc.walletName === 'turnkey' ||
+            vc.walletName === 'turnkeyhd'));
+    if (!embeddedWallet)
+        return false;
+    const hasSmartContractWallet = verifiedCredentials.find((vc) => vc.walletProvider === 'smartContractWallet' &&
+        vc.signerRefId === embeddedWallet.id);
+    if (!hasSmartContractWallet)
+        return false;
+    return !hasSmartContractWallet.id.includes('zerodev');
+};
+
+export { hasSmartAccount };

package/src/utils/index.d.ts

@@ -6,3 +6,4 @@ export * from './getEcdsaValidator';
 export * from './getEntryPoint';
 export * from './getKernelVersion';
 export * from './isEVMAuthorizationCapable';
+export * from './hasSmartAccount';