@dynamic-labs/ethereum-aa 4.61.5 → 4.61.6

package/CHANGELOG.md

@@ -1,4 +1,11 @@
 
+### [4.61.6](https://github.com/dynamic-labs/dynamic-auth/compare/v4.61.5...v4.61.6) (2026-02-19)
+
+
+### Bug Fixes
+
+* support legacy 4337 + 7702 wallet coexistence ([#10459](https://github.com/dynamic-labs/dynamic-auth/issues/10459)) ([a1e1577](https://github.com/dynamic-labs/dynamic-auth/commit/a1e1577c037059c177c6d5b010746a45610c223b))
+
 ### [4.61.5](https://github.com/dynamic-labs/dynamic-auth/compare/v4.61.4...v4.61.5) (2026-02-19)
 
 

package/package.cjs

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

package/package.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/ethereum-aa",
-  "version": "4.61.5",
+  "version": "4.61.6",
   "description": "A React SDK for implementing wallet web3 authentication and authorization to your website.",
   "author": "Dynamic Labs, Inc.",
   "license": "MIT",
@@ -22,14 +22,14 @@
     "@zerodev/ecdsa-validator": "5.4.9",
     "@zerodev/multi-chain-ecdsa-validator": "5.4.5",
     "@zerodev/sdk": "5.5.7",
-    "@dynamic-labs/assert-package-version": "4.61.5",
-    "@dynamic-labs/ethereum-aa-core": "4.61.5",
-    "@dynamic-labs/ethereum-core": "4.61.5",
-    "@dynamic-labs/logger": "4.61.5",
-    "@dynamic-labs/types": "4.61.5",
-    "@dynamic-labs/utils": "4.61.5",
-    "@dynamic-labs/wallet-book": "4.61.5",
-    "@dynamic-labs/wallet-connector-core": "4.61.5"
+    "@dynamic-labs/assert-package-version": "4.61.6",
+    "@dynamic-labs/ethereum-aa-core": "4.61.6",
+    "@dynamic-labs/ethereum-core": "4.61.6",
+    "@dynamic-labs/logger": "4.61.6",
+    "@dynamic-labs/types": "4.61.6",
+    "@dynamic-labs/utils": "4.61.6",
+    "@dynamic-labs/wallet-book": "4.61.6",
+    "@dynamic-labs/wallet-connector-core": "4.61.6"
   },
   "peerDependencies": {
     "viem": "^2.28.4"

package/src/ZeroDevConnector.cjs

@@ -19,7 +19,6 @@ var createEcdsaKernelAccountClient = require('./utils/createEcdsaKernelAccountCl
 var getEcdsaValidator = require('./utils/getEcdsaValidator.cjs');
 var getEntryPoint = require('./utils/getEntryPoint.cjs');
 var getKernelVersion = require('./utils/getKernelVersion.cjs');
-var hasSmartAccount = require('./utils/hasSmartAccount.cjs');
 
 class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
     constructor(opts) {
@@ -50,11 +49,6 @@ 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;
         // Avoid double-disabling confirmation UI when sendUserOperation is invoked within onSendTransaction
         this.isInOnSendTransactionFlow = false;
         this._walletUiUtils = opts.walletUiUtils;
@@ -122,6 +116,12 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
         var _a;
         return (_a = this.currentNetworkProvider) === null || _a === void 0 ? void 0 : _a.kernelClientWithSponsorship;
     }
+    get isActiveWallet7702() {
+        var _a, _b;
+        if (!this.activeWalletAddress)
+            return false;
+        return (_b = (_a = this.eoaConnectorMap[this.activeWalletAddress]) === null || _a === void 0 ? void 0 : _a.is7702) !== null && _b !== void 0 ? _b : false;
+    }
     supportsNetworkSwitching() {
         if (!this.activeWalletAddress) {
             return false;
@@ -180,43 +180,36 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
     }
     registerEoa(_a) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            var { smartWalletAddress, eoaAddress, eoaConnector, verifiedCredentials, shouldSetEoaConnector = false } = _a, properties = _tslib.__rest(_a, ["smartWalletAddress", "eoaAddress", "eoaConnector", "verifiedCredentials", "shouldSetEoaConnector"]);
+            var { smartWalletAddress, eoaAddress, eoaConnector, shouldSetEoaConnector = false, 
+            // eslint-disable-next-line @typescript-eslint/no-unused-vars
+            verifiedCredentials } = _a, properties = _tslib.__rest(_a, ["smartWalletAddress", "eoaAddress", "eoaConnector", "shouldSetEoaConnector", "verifiedCredentials"]);
             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');
-                }
-            }
+            // Determine per-wallet 7702 mode: address equality is the defining property of EIP-7702
+            // (the EOA itself IS the smart wallet). A 4337 wallet always has a different counterfactual address.
+            const is7702 = this.is7702EnabledOnDashboard &&
+                smartWalletAddress.toLowerCase() === eoaAddress.toLowerCase();
             // Register the EOA connector mapping
             this.eoaConnectorMap[smartWalletAddress] = {
                 eoaAddress,
                 eoaConnector,
+                is7702,
                 properties,
             };
             // Always generate providers for all wallets, but only set active state for primary
             yield this.setEoaConnector({
                 connector: eoaConnector,
                 eoaAddress,
+                is7702,
                 isPrimary: shouldSetEoaConnector,
                 properties,
                 smartWalletAddress,
             });
         });
     }
-    determineSmartAccountStatus(eoaConnector, verifiedCredentials) {
-        if (walletConnectorCore.getWalletProvider(eoaConnector) !== sdkApiCore.WalletProviderEnum.EmbeddedWallet) {
-            return;
-        }
-        this.hasExistingSmartAccount = hasSmartAccount.hasSmartAccount(verifiedCredentials);
-        this.shouldUseEIP7702Mode =
-            this.is7702EnabledOnDashboard && !this.hasExistingSmartAccount;
-    }
     setEoaConnector(_a) {
-        return _tslib.__awaiter(this, arguments, void 0, function* ({ eoaAddress, connector, properties, smartWalletAddress, isPrimary = true, }) {
+        return _tslib.__awaiter(this, arguments, void 0, function* ({ eoaAddress, connector, is7702 = false, properties, smartWalletAddress, isPrimary = true, }) {
             var _b, _c;
             if (!connector) {
                 logger.logger.error('No EOA connector provided');
@@ -251,7 +244,7 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
                 yield connector.getConnectedAccounts();
             }
             const signer = yield connector.getSigner();
-            yield this.generateProviderMap(signer, smartWalletAddress);
+            yield this.generateProviderMap(signer, smartWalletAddress, is7702);
             this.kernelClientDeferredPromise.resolve();
         });
     }
@@ -276,14 +269,15 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
      * @param signer - The wallet client to use for signing transactions
      * @param walletAddress - The smart wallet address to store the providers under
      */
-    generateProviderMap(signer, walletAddress) {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
+    generateProviderMap(signer_1, walletAddress_1) {
+        return _tslib.__awaiter(this, arguments, void 0, function* (signer, walletAddress, is7702 = false) {
             const chainProviderMap = {};
             yield Promise.all(this.providersFromApi.map((provider) => _tslib.__awaiter(this, void 0, void 0, function* () {
                 const { chain, clientId } = provider;
                 const [kernelClient, kernelClientWithSponsorship] = yield Promise.all([
                     this.getOrCreateKernelClient({
                         chainId: chain,
+                        is7702,
                         paymaster: createEcdsaKernelAccountClient.PaymasterTypeEnum.NONE,
                         projectId: clientId,
                         signer,
@@ -291,6 +285,7 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
                     }),
                     this.getOrCreateKernelClient({
                         chainId: chain,
+                        is7702,
                         paymaster: createEcdsaKernelAccountClient.PaymasterTypeEnum.SPONSOR,
                         projectId: clientId,
                         signer,
@@ -315,7 +310,7 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
         });
     }
     createKernelClient(_a) {
-        return _tslib.__awaiter(this, arguments, void 0, function* ({ chainId, projectId, signer, paymaster, paymasterRpcOverride, bundlerRpcOverride, }) {
+        return _tslib.__awaiter(this, arguments, void 0, function* ({ chainId, is7702 = false, projectId, signer, paymaster, paymasterRpcOverride, bundlerRpcOverride, }) {
             if (!signer)
                 throw new utils.DynamicError('No signer provided');
             const chain = ethereumCore.chainsMap[chainId];
@@ -334,7 +329,7 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
                 publicClientRpc: this.getPublicRpcForChain(chainId),
                 signer,
             };
-            if (this.shouldUseEIP7702Mode) {
+            if (is7702) {
                 kernelClient = yield createEcdsaKernelAccountClient.createEcdsaKernelAccountClientWith7702(Object.assign(Object.assign({}, params), { kernelVersion: constants$1.KERNEL_V3_3 }));
             }
             else {
@@ -350,7 +345,7 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
         });
     }
     getOrCreateKernelClient(_a) {
-        return _tslib.__awaiter(this, arguments, void 0, function* ({ chainId, projectId, signer, paymaster, walletAddress, }) {
+        return _tslib.__awaiter(this, arguments, void 0, function* ({ chainId, is7702 = false, projectId, signer, paymaster, walletAddress, }) {
             const walletProviders = this.providerMap[walletAddress];
             if (chainId &&
                 (walletProviders === null || walletProviders === void 0 ? void 0 : walletProviders[chainId]) &&
@@ -361,6 +356,7 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
             }
             return this.createKernelClient({
                 chainId,
+                is7702,
                 paymaster,
                 projectId,
                 signer,
@@ -370,7 +366,7 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
     getAddress() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c;
-            if (this.shouldUseEIP7702Mode) {
+            if (this.isActiveWallet7702) {
                 return this.eoaAddress;
             }
             yield ((_a = this.kernelClientDeferredPromise) === null || _a === void 0 ? void 0 : _a.promise);
@@ -738,7 +734,7 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
             if (!this.kernelClient) {
                 throw new utils.DynamicError('Error fetching signer');
             }
-            if (!this.shouldUseEIP7702Mode) {
+            if (!this.isActiveWallet7702) {
                 return this.kernelClient.signMessage({ message: messageToSign });
             }
             const isDeployed = yield ((_a = this.kernelClient.account) === null || _a === void 0 ? void 0 : _a.isDeployed());
@@ -760,7 +756,7 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
             if (!eoa) {
                 throw new utils.DynamicError('No EOA connector');
             }
-            const { eoaAddress, eoaConnector, properties } = eoa;
+            const { eoaAddress, eoaConnector, is7702, properties } = eoa;
             // Validate the underlying EOA connector
             yield eoaConnector.validateActiveWallet(eoaAddress);
             // Check if we have providers for this wallet with the correct kernel account address
@@ -785,6 +781,7 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
             yield this.setEoaConnector({
                 connector: eoaConnector,
                 eoaAddress,
+                is7702,
                 properties,
                 smartWalletAddress: expectedAddress,
             });

package/src/ZeroDevConnector.d.ts

@@ -58,11 +58,6 @@ export declare class ZeroDevConnector extends AccountAbstractionBaseConnector im
         name: string;
     };
     is7702EnabledOnDashboard: boolean;
-    private hasExistingSmartAccount;
-    /**
-     * Flag for EIP-7702 mode, enabled when EIP-7702 is enabled and no smart account exists
-     */
-    private shouldUseEIP7702Mode;
     private isInOnSendTransactionFlow;
     constructor(opts: ZeroDevConnectorProps);
     confirmTransactionStatus(): Promise<TransactionReceipt>;
@@ -74,6 +69,7 @@ export declare class ZeroDevConnector extends AccountAbstractionBaseConnector im
     get lastUsedChainId(): string;
     get kernelClient(): KernelClient | undefined;
     get kernelClientWithSponsorship(): KernelClient | undefined;
+    private get isActiveWallet7702();
     supportsNetworkSwitching(): boolean;
     private getPublicRpcForChain;
     switchNetwork({ networkChainId, }: {
@@ -91,7 +87,7 @@ export declare class ZeroDevConnector extends AccountAbstractionBaseConnector im
         properties?: SmartWalletProperties;
         verifiedCredentials: JwtVerifiedCredential[];
     }): Promise<void>;
-    registerEoa({ smartWalletAddress, eoaAddress, eoaConnector, verifiedCredentials, shouldSetEoaConnector, ...properties }: {
+    registerEoa({ smartWalletAddress, eoaAddress, eoaConnector, shouldSetEoaConnector, verifiedCredentials, ...properties }: {
         smartWalletAddress: string;
         eoaAddress: string;
         eoaConnector: InternalWalletConnector;
@@ -101,7 +97,6 @@ export declare class ZeroDevConnector extends AccountAbstractionBaseConnector im
         kernelVersion?: ProviderKernelVersionEnum;
         entryPointVersion?: ProviderEntryPointVersionEnum;
     }): Promise<void>;
-    private determineSmartAccountStatus;
     private setEoaConnector;
     private warnIfProjectChainNotEnabled;
     /**

package/src/ZeroDevConnector.js

@@ -6,16 +6,15 @@ import { getUserOperationHash } from 'viem/account-abstraction';
 import { toAccount } from 'viem/accounts';
 import { AccountAbstractionBaseConnector } from '@dynamic-labs/ethereum-aa-core';
 import { EthereumWallet, isEthWalletConnector, chainsMap, confirmationTransport, unFormatTransaction, interceptTransport } from '@dynamic-labs/ethereum-core';
-import { ZerodevBundlerProvider, WalletProviderEnum } from '@dynamic-labs/sdk-api-core';
+import { ZerodevBundlerProvider } from '@dynamic-labs/sdk-api-core';
 import { parseEvmNetworks, StorageService, DynamicError, DeferredPromise, parseChainId, wrapMethodWithCallback, TransactionGasCannotBeSponsoredError, InsufficientFundsError } from '@dynamic-labs/utils';
-import { eventListenerHandlers, getWalletProvider, isDynamicWaasConnector, isTurnkeyWalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { eventListenerHandlers, isDynamicWaasConnector, isTurnkeyWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { ZERO_DEV_LAST_USED_CHAIN_ID_KEY } from './constants.js';
 import { logger } from './utils/logger.js';
 import { PaymasterTypeEnum, createEcdsaKernelAccountClientWith7702, createEcdsaKernelAccountClient } from './utils/createEcdsaKernelAccountClient.js';
 import { getEcdsaValidator } from './utils/getEcdsaValidator.js';
 import { getEntryPoint } from './utils/getEntryPoint.js';
 import { getKernelVersion } from './utils/getKernelVersion.js';
-import { hasSmartAccount } from './utils/hasSmartAccount.js';
 
 class ZeroDevConnector extends AccountAbstractionBaseConnector {
     constructor(opts) {
@@ -46,11 +45,6 @@ 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;
         // Avoid double-disabling confirmation UI when sendUserOperation is invoked within onSendTransaction
         this.isInOnSendTransactionFlow = false;
         this._walletUiUtils = opts.walletUiUtils;
@@ -118,6 +112,12 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
         var _a;
         return (_a = this.currentNetworkProvider) === null || _a === void 0 ? void 0 : _a.kernelClientWithSponsorship;
     }
+    get isActiveWallet7702() {
+        var _a, _b;
+        if (!this.activeWalletAddress)
+            return false;
+        return (_b = (_a = this.eoaConnectorMap[this.activeWalletAddress]) === null || _a === void 0 ? void 0 : _a.is7702) !== null && _b !== void 0 ? _b : false;
+    }
     supportsNetworkSwitching() {
         if (!this.activeWalletAddress) {
             return false;
@@ -176,43 +176,36 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
     }
     registerEoa(_a) {
         return __awaiter(this, void 0, void 0, function* () {
-            var { smartWalletAddress, eoaAddress, eoaConnector, verifiedCredentials, shouldSetEoaConnector = false } = _a, properties = __rest(_a, ["smartWalletAddress", "eoaAddress", "eoaConnector", "verifiedCredentials", "shouldSetEoaConnector"]);
+            var { smartWalletAddress, eoaAddress, eoaConnector, shouldSetEoaConnector = false, 
+            // eslint-disable-next-line @typescript-eslint/no-unused-vars
+            verifiedCredentials } = _a, properties = __rest(_a, ["smartWalletAddress", "eoaAddress", "eoaConnector", "shouldSetEoaConnector", "verifiedCredentials"]);
             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');
-                }
-            }
+            // Determine per-wallet 7702 mode: address equality is the defining property of EIP-7702
+            // (the EOA itself IS the smart wallet). A 4337 wallet always has a different counterfactual address.
+            const is7702 = this.is7702EnabledOnDashboard &&
+                smartWalletAddress.toLowerCase() === eoaAddress.toLowerCase();
             // Register the EOA connector mapping
             this.eoaConnectorMap[smartWalletAddress] = {
                 eoaAddress,
                 eoaConnector,
+                is7702,
                 properties,
             };
             // Always generate providers for all wallets, but only set active state for primary
             yield this.setEoaConnector({
                 connector: eoaConnector,
                 eoaAddress,
+                is7702,
                 isPrimary: shouldSetEoaConnector,
                 properties,
                 smartWalletAddress,
             });
         });
     }
-    determineSmartAccountStatus(eoaConnector, verifiedCredentials) {
-        if (getWalletProvider(eoaConnector) !== WalletProviderEnum.EmbeddedWallet) {
-            return;
-        }
-        this.hasExistingSmartAccount = hasSmartAccount(verifiedCredentials);
-        this.shouldUseEIP7702Mode =
-            this.is7702EnabledOnDashboard && !this.hasExistingSmartAccount;
-    }
     setEoaConnector(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ eoaAddress, connector, properties, smartWalletAddress, isPrimary = true, }) {
+        return __awaiter(this, arguments, void 0, function* ({ eoaAddress, connector, is7702 = false, properties, smartWalletAddress, isPrimary = true, }) {
             var _b, _c;
             if (!connector) {
                 logger.error('No EOA connector provided');
@@ -247,7 +240,7 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
                 yield connector.getConnectedAccounts();
             }
             const signer = yield connector.getSigner();
-            yield this.generateProviderMap(signer, smartWalletAddress);
+            yield this.generateProviderMap(signer, smartWalletAddress, is7702);
             this.kernelClientDeferredPromise.resolve();
         });
     }
@@ -272,14 +265,15 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
      * @param signer - The wallet client to use for signing transactions
      * @param walletAddress - The smart wallet address to store the providers under
      */
-    generateProviderMap(signer, walletAddress) {
-        return __awaiter(this, void 0, void 0, function* () {
+    generateProviderMap(signer_1, walletAddress_1) {
+        return __awaiter(this, arguments, void 0, function* (signer, walletAddress, is7702 = false) {
             const chainProviderMap = {};
             yield Promise.all(this.providersFromApi.map((provider) => __awaiter(this, void 0, void 0, function* () {
                 const { chain, clientId } = provider;
                 const [kernelClient, kernelClientWithSponsorship] = yield Promise.all([
                     this.getOrCreateKernelClient({
                         chainId: chain,
+                        is7702,
                         paymaster: PaymasterTypeEnum.NONE,
                         projectId: clientId,
                         signer,
@@ -287,6 +281,7 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
                     }),
                     this.getOrCreateKernelClient({
                         chainId: chain,
+                        is7702,
                         paymaster: PaymasterTypeEnum.SPONSOR,
                         projectId: clientId,
                         signer,
@@ -311,7 +306,7 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
         });
     }
     createKernelClient(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ chainId, projectId, signer, paymaster, paymasterRpcOverride, bundlerRpcOverride, }) {
+        return __awaiter(this, arguments, void 0, function* ({ chainId, is7702 = false, projectId, signer, paymaster, paymasterRpcOverride, bundlerRpcOverride, }) {
             if (!signer)
                 throw new DynamicError('No signer provided');
             const chain = chainsMap[chainId];
@@ -330,7 +325,7 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
                 publicClientRpc: this.getPublicRpcForChain(chainId),
                 signer,
             };
-            if (this.shouldUseEIP7702Mode) {
+            if (is7702) {
                 kernelClient = yield createEcdsaKernelAccountClientWith7702(Object.assign(Object.assign({}, params), { kernelVersion: KERNEL_V3_3 }));
             }
             else {
@@ -346,7 +341,7 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
         });
     }
     getOrCreateKernelClient(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ chainId, projectId, signer, paymaster, walletAddress, }) {
+        return __awaiter(this, arguments, void 0, function* ({ chainId, is7702 = false, projectId, signer, paymaster, walletAddress, }) {
             const walletProviders = this.providerMap[walletAddress];
             if (chainId &&
                 (walletProviders === null || walletProviders === void 0 ? void 0 : walletProviders[chainId]) &&
@@ -357,6 +352,7 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
             }
             return this.createKernelClient({
                 chainId,
+                is7702,
                 paymaster,
                 projectId,
                 signer,
@@ -366,7 +362,7 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
     getAddress() {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c;
-            if (this.shouldUseEIP7702Mode) {
+            if (this.isActiveWallet7702) {
                 return this.eoaAddress;
             }
             yield ((_a = this.kernelClientDeferredPromise) === null || _a === void 0 ? void 0 : _a.promise);
@@ -734,7 +730,7 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
             if (!this.kernelClient) {
                 throw new DynamicError('Error fetching signer');
             }
-            if (!this.shouldUseEIP7702Mode) {
+            if (!this.isActiveWallet7702) {
                 return this.kernelClient.signMessage({ message: messageToSign });
             }
             const isDeployed = yield ((_a = this.kernelClient.account) === null || _a === void 0 ? void 0 : _a.isDeployed());
@@ -756,7 +752,7 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
             if (!eoa) {
                 throw new DynamicError('No EOA connector');
             }
-            const { eoaAddress, eoaConnector, properties } = eoa;
+            const { eoaAddress, eoaConnector, is7702, properties } = eoa;
             // Validate the underlying EOA connector
             yield eoaConnector.validateActiveWallet(eoaAddress);
             // Check if we have providers for this wallet with the correct kernel account address
@@ -781,6 +777,7 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
             yield this.setEoaConnector({
                 connector: eoaConnector,
                 eoaAddress,
+                is7702,
                 properties,
                 smartWalletAddress: expectedAddress,
             });

package/src/utils/hasSmartAccount.d.ts

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

package/src/utils/hasSmartAccount.cjs

@@ -1,20 +0,0 @@
-'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.js

@@ -1,16 +0,0 @@
-'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 };