@dynamic-labs/ethereum-aa 4.16.0 → 4.18.0

package/CHANGELOG.md

@@ -1,4 +1,31 @@
 
+## [4.18.0](https://github.com/dynamic-labs/dynamic-auth/compare/v4.17.0...v4.18.0) (2025-05-07)
+
+
+### Features
+
+* 7702 authorization now happens on the first transaction and could use sponsored user operation if paymaster provided (IMPORTANT: viem need to be upgraded to at least 2.28.4)
+
+
+### Bug Fixes
+
+* inline email submit button color when active ([#8663](https://github.com/dynamic-labs/dynamic-auth/issues/8663)) ([ea556e9](https://github.com/dynamic-labs/dynamic-auth/commit/ea556e9116e876fb2180870e74b6c8c6a13faecb))
+
+## [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)
 
 

package/package.cjs

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

package/package.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/ethereum-aa",
-  "version": "4.16.0",
+  "version": "4.18.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.16.0",
-    "@dynamic-labs/ethereum-aa-core": "4.16.0",
-    "@dynamic-labs/ethereum-core": "4.16.0",
-    "@dynamic-labs/logger": "4.16.0",
-    "@dynamic-labs/types": "4.16.0",
-    "@dynamic-labs/utils": "4.16.0",
-    "@dynamic-labs/wallet-book": "4.16.0",
-    "@dynamic-labs/wallet-connector-core": "4.16.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.18.0",
+    "@dynamic-labs/ethereum-aa-core": "4.18.0",
+    "@dynamic-labs/ethereum-core": "4.18.0",
+    "@dynamic-labs/logger": "4.18.0",
+    "@dynamic-labs/types": "4.18.0",
+    "@dynamic-labs/utils": "4.18.0",
+    "@dynamic-labs/wallet-book": "4.18.0",
+    "@dynamic-labs/wallet-connector-core": "4.18.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');
@@ -17,7 +18,7 @@ var createEcdsaKernelAccountClient = require('./utils/createEcdsaKernelAccountCl
 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) {
@@ -32,6 +33,12 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
         this.supportedChains = ['ETH', 'EVM'];
         this.isEmbeddedWallet = true;
         this.providersFromApi = [];
+        /**
+         * Cache for prepared user operations indexed by transaction details.
+         * The key is a concatenation of from-to-data to uniquely identify transactions.
+         * Used to avoid re-preparing the same user operation multiple times.
+         */
+        this.userOperationCache = {};
         this.name = 'ZeroDev';
         this.overrideKey = 'zerodev';
         this.walletFallback = {
@@ -41,9 +48,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 +133,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,48 +176,13 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
             }
         });
     }
-    getOrCreateAuthorization() {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
-            var _a;
-            if (!this.eoaConnector)
-                throw new utils.DynamicError('No EOA connector');
-            if (!isEVMAuthorizationCapable.isEVMAuthorizationCapable(this.eoaConnector)) {
-                throw new utils.DynamicError('Connector does not support EVM authorization');
-            }
-            const ZERODEV_AUTHORIZATION = 'zerodev_authorization';
-            try {
-                const storedAuthorization = utils.StorageService.getItem(ZERODEV_AUTHORIZATION);
-                if (storedAuthorization) {
-                    return storedAuthorization;
-                }
-                const kernelVersion = constants$1.KERNEL_V3_3_BETA;
-                const authorization = yield this.eoaConnector.experimental_signAuthorization({
-                    contractAddress: (_a = ZeroDevConnector.kernelDelegationAddress) !== null && _a !== void 0 ? _a : constants$1.KernelVersionToAddressesMap[kernelVersion]
-                        .accountImplementationAddress,
-                });
-                if (authorization) {
-                    const serializedAuth = Object.entries(authorization).reduce((acc, [key, value]) => {
-                        acc[key] = typeof value === 'bigint' ? value.toString() : value;
-                        return acc;
-                    }, {});
-                    utils.StorageService.setItem(ZERODEV_AUTHORIZATION, serializedAuth);
-                }
-                return {
-                    address: authorization.contractAddress,
-                    chainId: authorization.chainId,
-                    nonce: authorization.nonce,
-                    r: authorization.r,
-                    s: authorization.s,
-                    v: authorization.v,
-                    yParity: authorization.yParity,
-                };
-            }
-            catch (error) {
-                logger.logger.error('Failed to get/set authorization:', error);
-                utils.StorageService.removeItem(ZERODEV_AUTHORIZATION);
-                return undefined;
-            }
-        });
+    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, }) {
@@ -230,10 +213,6 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
                 yield this.eoaConnector.getConnectedAccounts();
             }
             const signer = yield this.eoaConnector.getSigner();
-            signer.account = accounts.toAccount(eoaAddress);
-            if (this.enableEIP7702Mode) {
-                this.authorization = yield this.getOrCreateAuthorization();
-            }
             yield this.generateProviderMap(signer);
             this.kernelClientDeferredPromise.resolve();
         });
@@ -271,7 +250,6 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
                         signer,
                     }),
                     this.createKernelClient({
-                        authorization: this.authorization,
                         chainId: chain,
                         paymaster: 'SPONSOR',
                         projectId: clientId,
@@ -295,7 +273,7 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
         });
     }
     createKernelClient(_a) {
-        return _tslib.__awaiter(this, arguments, void 0, function* ({ chainId, projectId, signer, paymaster, authorization, }) {
+        return _tslib.__awaiter(this, arguments, void 0, function* ({ chainId, projectId, signer, paymaster, }) {
             var _b;
             if (chainId && this.providerMap[chainId]) {
                 return paymaster === 'SPONSOR'
@@ -309,38 +287,24 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
             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) {
-                kernelClient = yield createEcdsaKernelAccountClient.createEcdsaKernelAccountClientWith7702({
-                    authorization,
-                    bundlerRpc: ZeroDevConnector.bundlerRpc,
-                    chain,
-                    ecdsaValidator: getEcdsaValidator.getEcdsaValidator(this.ecdsaProviderType),
-                    enableKernelV3Migration: this.enableKernelV3Migration,
-                    entryPoint: this.entryPoint,
-                    kernelVersion: constants$1.KERNEL_V3_3_BETA,
-                    paymaster,
-                    paymasterRpc: ZeroDevConnector.paymasterRpc,
-                    projectId,
-                    provider: ZeroDevConnector.bundlerProvider,
-                    publicClientRpc,
-                    signer,
-                });
+            const params = {
+                bundlerRpc: ZeroDevConnector.bundlerRpc,
+                chain,
+                enableKernelV3Migration: this.enableKernelV3Migration,
+                entryPoint: this.entryPoint,
+                kernelVersion: this.kernelVersion,
+                paymaster,
+                paymasterRpc: ZeroDevConnector.paymasterRpc,
+                projectId,
+                provider: ZeroDevConnector.bundlerProvider,
+                publicClientRpc,
+                signer,
+            };
+            if (this.shouldUseEIP7702Mode) {
+                kernelClient = yield createEcdsaKernelAccountClient.createEcdsaKernelAccountClientWith7702(Object.assign(Object.assign({}, params), { kernelVersion: constants$1.KERNEL_V3_3 }));
             }
             else {
-                kernelClient = yield createEcdsaKernelAccountClient.createEcdsaKernelAccountClient({
-                    bundlerRpc: ZeroDevConnector.bundlerRpc,
-                    chain,
-                    ecdsaValidator: getEcdsaValidator.getEcdsaValidator(this.ecdsaProviderType),
-                    enableKernelV3Migration: this.enableKernelV3Migration,
-                    entryPoint: this.entryPoint,
-                    kernelVersion: this.kernelVersion,
-                    paymaster,
-                    paymasterRpc: ZeroDevConnector.paymasterRpc,
-                    projectId,
-                    provider: ZeroDevConnector.bundlerProvider,
-                    publicClientRpc,
-                    signer,
-                });
+                kernelClient = yield createEcdsaKernelAccountClient.createEcdsaKernelAccountClient(Object.assign(Object.assign({}, params), { ecdsaValidator: getEcdsaValidator.getEcdsaValidator(this.ecdsaProviderType) }));
             }
             utils.wrapMethodWithCallback(kernelClient, 'sendUserOperation', (original, ...args) => {
                 this._walletUiUtils.disabledConfirmationOnce();
@@ -352,7 +316,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);
@@ -393,7 +357,14 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
                     if (!effectiveProvider) {
                         throw new utils.DynamicError('No provider');
                     }
-                    const response = yield effectiveProvider.sendTransaction(ethereumCore.unFormatTransaction(transaction));
+                    const unformattedTransaction = ethereumCore.unFormatTransaction(transaction);
+                    const key = `${unformattedTransaction.from}-${unformattedTransaction.to}-${unformattedTransaction.data}`;
+                    const cachedTransaction = this.userOperationCache[key];
+                    if (cachedTransaction) {
+                        const signedTransaction = yield effectiveProvider.signUserOperation(cachedTransaction.userOperation);
+                        return effectiveProvider.sendUserOperation(signedTransaction);
+                    }
+                    const response = yield effectiveProvider.sendTransaction(unformattedTransaction);
                     return response;
                 }
                 catch (err) {
@@ -506,6 +477,10 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
     getCurrentUserOperation(transaction) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             var _a, _b;
+            const key = `${transaction.from}-${transaction.to}-${transaction.data}`;
+            if (this.userOperationCache[key]) {
+                return this.userOperationCache[key];
+            }
             try {
                 const { kernelClientWithSponsorship } = this;
                 if (!kernelClientWithSponsorship) {
@@ -532,6 +507,11 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
                         callData,
                     }));
                 }
+                // Cache the result
+                this.userOperationCache[key] = {
+                    sponsored: (sponsorResult === null || sponsorResult === void 0 ? void 0 : sponsorResult.paymasterAndData) !== '0x',
+                    userOperation: sponsorResult !== null && sponsorResult !== void 0 ? sponsorResult : unsponsoredResult,
+                };
                 if ((sponsorResult === null || sponsorResult === void 0 ? void 0 : sponsorResult.paymasterAndData) === '0x')
                     return { sponsored: false, userOperation: sponsorResult };
                 return sponsorResult
@@ -573,7 +553,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');
@@ -594,6 +574,23 @@ class ZeroDevConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
             });
         });
     }
+    isAtomicSupported(chainId) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            logger.logger.debug('[ZeroDevConnector] isAtomicSupported - is supported', {
+                chainId,
+            });
+            return true;
+        });
+    }
+    isPaymasterServiceSupported(chainId) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            logger.logger.debug('[ZeroDevConnector] isPaymasterServiceSupported - not supported', {
+                chainId,
+            });
+            // TODO: update this to return true once we add support for paymaster url
+            return false;
+        });
+    }
 }
 
 exports.ZeroDevConnector = ZeroDevConnector;

package/src/ZeroDevConnector.d.ts

@@ -1,11 +1,10 @@
 import { KernelAccountClient } from '@zerodev/sdk/clients';
 import { SmartAccount, EntryPointVersion } from 'viem/account-abstraction';
 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';
@@ -20,7 +19,6 @@ type ZeroDevConnectorProps = AccountAbstractionConnectorProps & {
     walletUiUtils: WalletUiUtils<InternalWalletConnector>;
     bundlerProvider: BundlerProvider | undefined;
     enableEIP7702?: boolean;
-    authorization?: SignAuthorizationReturnType;
     providersConfig?: RegisterEvmProvidersConfig;
 };
 type KernelClient = KernelAccountClient<Transport, ViemChain, SmartAccount, Client, RpcSchema>;
@@ -51,6 +49,12 @@ export declare class ZeroDevConnector extends AccountAbstractionBaseConnector im
      * This is needed because the provider is set asynchronously.
      */
     private kernelClientDeferredPromise;
+    /**
+     * Cache for prepared user operations indexed by transaction details.
+     * The key is a concatenation of from-to-data to uniquely identify transactions.
+     * Used to avoid re-preparing the same user operation multiple times.
+     */
+    private userOperationCache;
     name: string;
     overrideKey: string;
     walletFallback: {
@@ -60,8 +64,12 @@ export declare class ZeroDevConnector extends AccountAbstractionBaseConnector im
         };
         name: string;
     };
-    enableEIP7702Mode: boolean;
-    private authorization?;
+    is7702EnabledOnDashboard: boolean;
+    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,23 +87,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 getOrCreateAuthorization;
+    private determineSmartAccountStatus;
     private setEoaConnector;
     private warnIfProjectChainNotEnabled;
     /**
@@ -159,5 +169,7 @@ export declare class ZeroDevConnector extends AccountAbstractionBaseConnector im
     getBalance(address: string): Promise<string | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;
     validateActiveWallet(expectedAddress: string): Promise<void>;
+    isAtomicSupported(chainId?: number): Promise<boolean>;
+    isPaymasterServiceSupported(chainId?: number): Promise<boolean>;
 }
 export {};

package/src/ZeroDevConnector.js

@@ -2,9 +2,10 @@
 import { __awaiter, __rest } from '../_virtual/_tslib.js';
 import { publicActions, custom, createWalletClient, toHex, formatEther } from 'viem';
 import { toAccount } from 'viem/accounts';
-import { KERNEL_V3_3_BETA, KernelVersionToAddressesMap, getEntryPoint as getEntryPoint$1 } from '@zerodev/sdk/constants';
+import { KERNEL_V3_3, 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';
@@ -13,7 +14,7 @@ import { createEcdsaKernelAccountClientWith7702, createEcdsaKernelAccountClient
 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) {
@@ -28,6 +29,12 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
         this.supportedChains = ['ETH', 'EVM'];
         this.isEmbeddedWallet = true;
         this.providersFromApi = [];
+        /**
+         * Cache for prepared user operations indexed by transaction details.
+         * The key is a concatenation of from-to-data to uniquely identify transactions.
+         * Used to avoid re-preparing the same user operation multiple times.
+         */
+        this.userOperationCache = {};
         this.name = 'ZeroDev';
         this.overrideKey = 'zerodev';
         this.walletFallback = {
@@ -37,9 +44,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 +129,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,48 +172,13 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
             }
         });
     }
-    getOrCreateAuthorization() {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            if (!this.eoaConnector)
-                throw new DynamicError('No EOA connector');
-            if (!isEVMAuthorizationCapable(this.eoaConnector)) {
-                throw new DynamicError('Connector does not support EVM authorization');
-            }
-            const ZERODEV_AUTHORIZATION = 'zerodev_authorization';
-            try {
-                const storedAuthorization = StorageService.getItem(ZERODEV_AUTHORIZATION);
-                if (storedAuthorization) {
-                    return storedAuthorization;
-                }
-                const kernelVersion = KERNEL_V3_3_BETA;
-                const authorization = yield this.eoaConnector.experimental_signAuthorization({
-                    contractAddress: (_a = ZeroDevConnector.kernelDelegationAddress) !== null && _a !== void 0 ? _a : KernelVersionToAddressesMap[kernelVersion]
-                        .accountImplementationAddress,
-                });
-                if (authorization) {
-                    const serializedAuth = Object.entries(authorization).reduce((acc, [key, value]) => {
-                        acc[key] = typeof value === 'bigint' ? value.toString() : value;
-                        return acc;
-                    }, {});
-                    StorageService.setItem(ZERODEV_AUTHORIZATION, serializedAuth);
-                }
-                return {
-                    address: authorization.contractAddress,
-                    chainId: authorization.chainId,
-                    nonce: authorization.nonce,
-                    r: authorization.r,
-                    s: authorization.s,
-                    v: authorization.v,
-                    yParity: authorization.yParity,
-                };
-            }
-            catch (error) {
-                logger.error('Failed to get/set authorization:', error);
-                StorageService.removeItem(ZERODEV_AUTHORIZATION);
-                return undefined;
-            }
-        });
+    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, }) {
@@ -226,10 +209,6 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
                 yield this.eoaConnector.getConnectedAccounts();
             }
             const signer = yield this.eoaConnector.getSigner();
-            signer.account = toAccount(eoaAddress);
-            if (this.enableEIP7702Mode) {
-                this.authorization = yield this.getOrCreateAuthorization();
-            }
             yield this.generateProviderMap(signer);
             this.kernelClientDeferredPromise.resolve();
         });
@@ -267,7 +246,6 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
                         signer,
                     }),
                     this.createKernelClient({
-                        authorization: this.authorization,
                         chainId: chain,
                         paymaster: 'SPONSOR',
                         projectId: clientId,
@@ -291,7 +269,7 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
         });
     }
     createKernelClient(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ chainId, projectId, signer, paymaster, authorization, }) {
+        return __awaiter(this, arguments, void 0, function* ({ chainId, projectId, signer, paymaster, }) {
             var _b;
             if (chainId && this.providerMap[chainId]) {
                 return paymaster === 'SPONSOR'
@@ -305,38 +283,24 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
             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) {
-                kernelClient = yield createEcdsaKernelAccountClientWith7702({
-                    authorization,
-                    bundlerRpc: ZeroDevConnector.bundlerRpc,
-                    chain,
-                    ecdsaValidator: getEcdsaValidator(this.ecdsaProviderType),
-                    enableKernelV3Migration: this.enableKernelV3Migration,
-                    entryPoint: this.entryPoint,
-                    kernelVersion: KERNEL_V3_3_BETA,
-                    paymaster,
-                    paymasterRpc: ZeroDevConnector.paymasterRpc,
-                    projectId,
-                    provider: ZeroDevConnector.bundlerProvider,
-                    publicClientRpc,
-                    signer,
-                });
+            const params = {
+                bundlerRpc: ZeroDevConnector.bundlerRpc,
+                chain,
+                enableKernelV3Migration: this.enableKernelV3Migration,
+                entryPoint: this.entryPoint,
+                kernelVersion: this.kernelVersion,
+                paymaster,
+                paymasterRpc: ZeroDevConnector.paymasterRpc,
+                projectId,
+                provider: ZeroDevConnector.bundlerProvider,
+                publicClientRpc,
+                signer,
+            };
+            if (this.shouldUseEIP7702Mode) {
+                kernelClient = yield createEcdsaKernelAccountClientWith7702(Object.assign(Object.assign({}, params), { kernelVersion: KERNEL_V3_3 }));
             }
             else {
-                kernelClient = yield createEcdsaKernelAccountClient({
-                    bundlerRpc: ZeroDevConnector.bundlerRpc,
-                    chain,
-                    ecdsaValidator: getEcdsaValidator(this.ecdsaProviderType),
-                    enableKernelV3Migration: this.enableKernelV3Migration,
-                    entryPoint: this.entryPoint,
-                    kernelVersion: this.kernelVersion,
-                    paymaster,
-                    paymasterRpc: ZeroDevConnector.paymasterRpc,
-                    projectId,
-                    provider: ZeroDevConnector.bundlerProvider,
-                    publicClientRpc,
-                    signer,
-                });
+                kernelClient = yield createEcdsaKernelAccountClient(Object.assign(Object.assign({}, params), { ecdsaValidator: getEcdsaValidator(this.ecdsaProviderType) }));
             }
             wrapMethodWithCallback(kernelClient, 'sendUserOperation', (original, ...args) => {
                 this._walletUiUtils.disabledConfirmationOnce();
@@ -348,7 +312,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);
@@ -389,7 +353,14 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
                     if (!effectiveProvider) {
                         throw new DynamicError('No provider');
                     }
-                    const response = yield effectiveProvider.sendTransaction(unFormatTransaction(transaction));
+                    const unformattedTransaction = unFormatTransaction(transaction);
+                    const key = `${unformattedTransaction.from}-${unformattedTransaction.to}-${unformattedTransaction.data}`;
+                    const cachedTransaction = this.userOperationCache[key];
+                    if (cachedTransaction) {
+                        const signedTransaction = yield effectiveProvider.signUserOperation(cachedTransaction.userOperation);
+                        return effectiveProvider.sendUserOperation(signedTransaction);
+                    }
+                    const response = yield effectiveProvider.sendTransaction(unformattedTransaction);
                     return response;
                 }
                 catch (err) {
@@ -502,6 +473,10 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
     getCurrentUserOperation(transaction) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
+            const key = `${transaction.from}-${transaction.to}-${transaction.data}`;
+            if (this.userOperationCache[key]) {
+                return this.userOperationCache[key];
+            }
             try {
                 const { kernelClientWithSponsorship } = this;
                 if (!kernelClientWithSponsorship) {
@@ -528,6 +503,11 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
                         callData,
                     }));
                 }
+                // Cache the result
+                this.userOperationCache[key] = {
+                    sponsored: (sponsorResult === null || sponsorResult === void 0 ? void 0 : sponsorResult.paymasterAndData) !== '0x',
+                    userOperation: sponsorResult !== null && sponsorResult !== void 0 ? sponsorResult : unsponsoredResult,
+                };
                 if ((sponsorResult === null || sponsorResult === void 0 ? void 0 : sponsorResult.paymasterAndData) === '0x')
                     return { sponsored: false, userOperation: sponsorResult };
                 return sponsorResult
@@ -569,7 +549,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');
@@ -590,6 +570,23 @@ class ZeroDevConnector extends AccountAbstractionBaseConnector {
             });
         });
     }
+    isAtomicSupported(chainId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            logger.debug('[ZeroDevConnector] isAtomicSupported - is supported', {
+                chainId,
+            });
+            return true;
+        });
+    }
+    isPaymasterServiceSupported(chainId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            logger.debug('[ZeroDevConnector] isPaymasterServiceSupported - not supported', {
+                chainId,
+            });
+            // TODO: update this to return true once we add support for paymaster url
+            return false;
+        });
+    }
 }
 
 export { ZeroDevConnector };

package/src/utils/createEcdsaKernelAccountClient.cjs

@@ -97,27 +97,27 @@ 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, publicClientRpc, }) {
+const createEcdsaKernelAccountClientWith7702 = (_c) => _tslib.__awaiter(void 0, [_c], void 0, function* ({ bundlerRpc, chain, paymasterRpc, projectId, signer, provider, paymaster = 'SPONSOR', entryPoint, kernelVersion, 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, publicClientRpc);
-    const validator = yield ecdsaValidator(publicClient, {
+    const account = yield ecdsaValidator.create7702KernelAccount(publicClient, {
         entryPoint,
         kernelVersion,
-        signer,
+        signer: signer.account,
     });
-    const account = yield accounts.createKernelAccount(publicClient, {
-        address: signer.account.address,
-        eip7702Auth: authorization,
-        entryPoint,
-        kernelVersion,
-        plugins: {
-            sudo: validator,
+    const paymasterHandler = createPaymasterHandler(paymaster, zerodevPaymaster);
+    const kernelClient = ecdsaValidator.create7702KernelAccountClient({
+        account: account, // TODO: check with zerodev team why this type is broken
+        bundlerTransport: viem.http(resolvedBundlerRpc),
+        chain,
+        client: publicClient,
+        paymaster: paymasterHandler,
+        userOperation: {
+            estimateFeesPerGas: (_d) => _tslib.__awaiter(void 0, [_d], void 0, function* ({ bundlerClient }) { return actions.getUserOperationGasPrice(bundlerClient); }),
         },
     });
-    const paymasterHandler = createPaymasterHandler(paymaster, zerodevPaymaster);
-    const clientConfig = createKernelClientConfig(account, resolvedBundlerRpc, chain, publicClient, paymasterHandler);
-    return clients.createKernelAccountClient(clientConfig);
+    return kernelClient;
 });
 
 exports.createEcdsaKernelAccountClient = createEcdsaKernelAccountClient;

package/src/utils/createEcdsaKernelAccountClient.d.ts

@@ -3,7 +3,6 @@ import { KernelAccountClient } from '@zerodev/sdk/clients';
 import { type Chain as ViemChain } from 'viem/chains';
 import { Address, WalletClient, Account, type Chain, type Client, type RpcSchema, type Transport } from 'viem';
 import { EntryPointType, GetKernelVersion } from '@zerodev/sdk/types';
-import { SignAuthorizationReturnType } from 'viem/experimental';
 export type BundlerProvider = 'STACKUP' | 'PIMLICO' | 'ALCHEMY' | 'GELATO';
 export type ERC20Paymaster = Address;
 export type PaymasterType = 'NONE' | 'SPONSOR' | ERC20Paymaster;
@@ -19,12 +18,11 @@ type CommonClientParams<TChain extends Chain | undefined = Chain | undefined> =
     entryPoint: EntryPointType<EntryPointVersion>;
     provider?: BundlerProvider;
     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, 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;
+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> & {
+    ecdsaValidator: any;
 }) => Promise<KernelAccountClient<Transport, ViemChain, SmartAccount, Client, RpcSchema>>;
+export declare const createEcdsaKernelAccountClientWith7702: <TChain extends ViemChain | undefined = ViemChain | undefined>({ bundlerRpc, chain, paymasterRpc, projectId, signer, provider, paymaster, entryPoint, kernelVersion, publicClientRpc, }: CommonClientParams<TChain>) => Promise<KernelAccountClient<Transport, ViemChain, SmartAccount, Client, RpcSchema>>;
 export {};

package/src/utils/createEcdsaKernelAccountClient.js

@@ -4,7 +4,7 @@ import { createKernelAccount } from '@zerodev/sdk/accounts';
 import { createKernelAccountClient, createZeroDevPaymasterClient } from '@zerodev/sdk/clients';
 import { getUserOperationGasPrice } from '@zerodev/sdk/actions';
 import { createPublicClient, http, isAddress } from 'viem';
-import { createEcdsaKernelMigrationAccount } from '@zerodev/ecdsa-validator';
+import { createEcdsaKernelMigrationAccount, create7702KernelAccount, create7702KernelAccountClient } from '@zerodev/ecdsa-validator';
 import { KERNEL_V3_1 } from '@zerodev/sdk/constants';
 
 const getZeroDevBundlerRPC = (projectId, provider) => {
@@ -93,27 +93,27 @@ 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, publicClientRpc, }) {
+const createEcdsaKernelAccountClientWith7702 = (_c) => __awaiter(void 0, [_c], void 0, function* ({ bundlerRpc, chain, paymasterRpc, projectId, signer, provider, paymaster = 'SPONSOR', entryPoint, kernelVersion, 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, publicClientRpc);
-    const validator = yield ecdsaValidator(publicClient, {
+    const account = yield create7702KernelAccount(publicClient, {
         entryPoint,
         kernelVersion,
-        signer,
+        signer: signer.account,
     });
-    const account = yield createKernelAccount(publicClient, {
-        address: signer.account.address,
-        eip7702Auth: authorization,
-        entryPoint,
-        kernelVersion,
-        plugins: {
-            sudo: validator,
+    const paymasterHandler = createPaymasterHandler(paymaster, zerodevPaymaster);
+    const kernelClient = create7702KernelAccountClient({
+        account: account, // TODO: check with zerodev team why this type is broken
+        bundlerTransport: http(resolvedBundlerRpc),
+        chain,
+        client: publicClient,
+        paymaster: paymasterHandler,
+        userOperation: {
+            estimateFeesPerGas: (_d) => __awaiter(void 0, [_d], void 0, function* ({ bundlerClient }) { return getUserOperationGasPrice(bundlerClient); }),
         },
     });
-    const paymasterHandler = createPaymasterHandler(paymaster, zerodevPaymaster);
-    const clientConfig = createKernelClientConfig(account, resolvedBundlerRpc, chain, publicClient, paymasterHandler);
-    return createKernelAccountClient(clientConfig);
+    return kernelClient;
 });
 
 export { createEcdsaKernelAccountClient, createEcdsaKernelAccountClientWith7702, getZeroDevBundlerRPC, getZeroDevPaymasterRPC };

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

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

package/src/utils/isEVMAuthorizationCapable.cjs

@@ -1,8 +0,0 @@
-'use client'
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-const isEVMAuthorizationCapable = (connector) => 'experimental_signAuthorization' in connector;
-
-exports.isEVMAuthorizationCapable = isEVMAuthorizationCapable;

package/src/utils/isEVMAuthorizationCapable.d.ts

@@ -1,6 +0,0 @@
-import { InternalWalletConnector, EVMAuthorizationParameters, EVMAuthorizationResult } from '@dynamic-labs/wallet-connector-core';
-type EVMAuthorizationCapableConnector = InternalWalletConnector & {
-    experimental_signAuthorization: (params: EVMAuthorizationParameters) => Promise<EVMAuthorizationResult>;
-};
-export declare const isEVMAuthorizationCapable: (connector: InternalWalletConnector) => connector is EVMAuthorizationCapableConnector;
-export {};

package/src/utils/isEVMAuthorizationCapable.js

@@ -1,4 +0,0 @@
-'use client'
-const isEVMAuthorizationCapable = (connector) => 'experimental_signAuthorization' in connector;
-
-export { isEVMAuthorizationCapable };