@dynamic-labs/ethereum-aa 4.6.2 → 4.7.0

package/CHANGELOG.md

@@ -1,4 +1,25 @@
 
+## [4.7.0](https://github.com/dynamic-labs/dynamic-auth/compare/v4.6.3...v4.7.0) (2025-02-20)
+
+
+### Features
+
+* 7702 support ([14ee3cd](https://github.com/dynamic-labs/dynamic-auth/commit/14ee3cd3513ac8b3e8e866cc2026b042c706b7e6))
+
+
+### Bug Fixes
+
+* fallback to empty array when token balances is called with an invalid chain ID ([#8108](https://github.com/dynamic-labs/dynamic-auth/issues/8108)) ([7d14ded](https://github.com/dynamic-labs/dynamic-auth/commit/7d14ded6afa0de604901bbc8bc13620d03dc2e8c))
+* improve global connectivity sign typed data reliability ([#8103](https://github.com/dynamic-labs/dynamic-auth/issues/8103)) ([8b0d2dd](https://github.com/dynamic-labs/dynamic-auth/commit/8b0d2ddbeb62a11732a9d59bc6cd4b72d82b9855))
+* **QNTM-2902:** ensure react updates icons ([#8105](https://github.com/dynamic-labs/dynamic-auth/issues/8105)) ([1182c4c](https://github.com/dynamic-labs/dynamic-auth/commit/1182c4cc103c599e6bbff89af9b1312fb96b6d05))
+
+### [4.6.3](https://github.com/dynamic-labs/dynamic-auth/compare/v4.6.2...v4.6.3) (2025-02-14)
+
+
+### Bug Fixes
+
+* optimize zerodev connector initialization ([dff1b4d](https://github.com/dynamic-labs/dynamic-auth/commit/dff1b4d410ab06c45635e0114823cbba4b8c1905))
+
 ### [4.6.2](https://github.com/dynamic-labs/dynamic-auth/compare/v4.6.1...v4.6.2) (2025-02-14)
 
 

package/_virtual/_tslib.cjs

@@ -18,6 +18,18 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 ***************************************************************************** */
 
+function __rest(s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+}
+
 function __awaiter(thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -34,3 +46,4 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
 };
 
 exports.__awaiter = __awaiter;
+exports.__rest = __rest;

package/_virtual/_tslib.js

@@ -14,6 +14,18 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 ***************************************************************************** */
 
+function __rest(s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+}
+
 function __awaiter(thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -29,4 +41,4 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
-export { __awaiter };
+export { __awaiter, __rest };

package/package.cjs

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

package/package.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/ethereum-aa",
-  "version": "4.6.2",
+  "version": "4.7.0",
   "description": "A React SDK for implementing wallet web3 authentication and authorization to your website.",
   "author": "Dynamic Labs, Inc.",
   "license": "MIT",
@@ -18,17 +18,17 @@
   },
   "homepage": "https://www.dynamic.xyz/",
   "dependencies": {
-    "@dynamic-labs/sdk-api-core": "0.0.627",
-    "@zerodev/ecdsa-validator": "5.4.3",
-    "@zerodev/multi-chain-ecdsa-validator": "5.4.2",
-    "@zerodev/sdk": "5.4.17",
-    "@dynamic-labs/assert-package-version": "4.6.2",
-    "@dynamic-labs/ethereum-core": "4.6.2",
-    "@dynamic-labs/logger": "4.6.2",
-    "@dynamic-labs/types": "4.6.2",
-    "@dynamic-labs/utils": "4.6.2",
-    "@dynamic-labs/wallet-book": "4.6.2",
-    "@dynamic-labs/wallet-connector-core": "4.6.2"
+    "@dynamic-labs/sdk-api-core": "0.0.628",
+    "@zerodev/ecdsa-validator": "5.4.4",
+    "@zerodev/multi-chain-ecdsa-validator": "5.4.3",
+    "@zerodev/sdk": "5.4.21",
+    "@dynamic-labs/assert-package-version": "4.7.0",
+    "@dynamic-labs/ethereum-core": "4.7.0",
+    "@dynamic-labs/logger": "4.7.0",
+    "@dynamic-labs/types": "4.7.0",
+    "@dynamic-labs/utils": "4.7.0",
+    "@dynamic-labs/wallet-book": "4.7.0",
+    "@dynamic-labs/wallet-connector-core": "4.7.0"
   },
   "peerDependencies": {
     "viem": "^2.21.55"

package/src/ZeroDevConnector.cjs

@@ -19,7 +19,7 @@ var getKernelVersion = require('./utils/getKernelVersion.cjs');
 
 class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
     constructor(opts) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         super(opts);
         // provider map maintains the kernel clients per chain
         this.providerMap = {};
@@ -41,21 +41,23 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
             name: 'ZeroDev',
         };
         this._walletUiUtils = opts.walletUiUtils;
-        this.evmNetworks = utils.parseEvmNetworks(opts.evmNetworks);
-        this.entryPoint = getEntryPoint.getEntryPoint((_a = opts.apiProviders.zerodev) === null || _a === void 0 ? void 0 : _a.entryPointVersion);
-        this.kernelVersion = getKernelVersion.getKernelVersion((_b = opts.apiProviders.zerodev) === null || _b === void 0 ? void 0 : _b.kernelVersion, this.entryPoint);
+        this.enableEIP7702Mode = (_b = (_a = opts.apiProviders.zerodev) === null || _a === void 0 ? void 0 : _a.enableEIP7702) !== null && _b !== void 0 ? _b : false;
+        this.entryPoint = getEntryPoint.getEntryPoint((_c = opts.apiProviders.zerodev) === null || _c === void 0 ? void 0 : _c.entryPointVersion);
+        this.kernelVersion = getKernelVersion.getKernelVersion((_d = opts.apiProviders.zerodev) === null || _d === void 0 ? void 0 : _d.kernelVersion, this.entryPoint);
         this.enableKernelV3Migration =
-            (_d = (_c = opts.apiProviders.zerodev) === null || _c === void 0 ? void 0 : _c.enableKernelV3Migration) !== null && _d !== void 0 ? _d : false;
+            (_f = (_e = opts.apiProviders.zerodev) === null || _e === void 0 ? void 0 : _e.enableKernelV3Migration) !== null && _f !== void 0 ? _f : false;
         // this is the list of providers from the api that are used for multi-chain account abstraction
         this.providersFromApi =
-            ((_e = opts.apiProviders.zerodev) === null || _e === void 0 ? void 0 : _e.multichainAccountAbstractionProviders) || [];
+            ((_g = opts.apiProviders.zerodev) === null || _g === void 0 ? void 0 : _g.multichainAccountAbstractionProviders) || [];
+        const enabledZerodevNetworks = this.providersFromApi.map((provider) => provider.chain);
+        this.evmNetworks = utils.parseEvmNetworks(opts.evmNetworks).filter((network) => enabledZerodevNetworks.includes(network.chainId.toString()));
         const [defaultProvider] = this.providersFromApi;
         this.clientId = defaultProvider === null || defaultProvider === void 0 ? void 0 : defaultProvider.clientId;
         if (!this.clientId) {
             throw new Error('Missing ZeroDev project ID provided. Add your ZeroDev project id to your project configuration via the Dynamic Labs dashboard.');
         }
         this.defaultChainId = defaultProvider === null || defaultProvider === void 0 ? void 0 : defaultProvider.chain;
-        this.ecdsaProviderType = (_f = opts.apiProviders.zerodev) === null || _f === void 0 ? void 0 : _f.ecdsaProviderType;
+        this.ecdsaProviderType = (_h = opts.apiProviders.zerodev) === null || _h === void 0 ? void 0 : _h.ecdsaProviderType;
     }
     get currentNetworkProvider() {
         // check if the last used chain id is in the provider map
@@ -120,26 +122,69 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
         });
     }
     registerEoa(_a) {
-        return _tslib.__awaiter(this, arguments, void 0, function* ({ smartWalletAddress, eoaAddress, eoaConnector, shouldSetEoaConnector = false, ecdsaProviderType, kernelVersion, entryPointVersion, enableKernelV3Migration, }) {
-            const properties = {
-                ecdsaProviderType,
-                enableKernelV3Migration,
-                entryPointVersion,
-                kernelVersion,
-            };
-            this.eoaConnectorMap[smartWalletAddress] = {
-                eoaAddress,
-                eoaConnector,
-                properties,
-            };
-            // if this is the primary wallet, set the eoa connector and kernel clients
-            if (shouldSetEoaConnector && this.eoaAddress !== eoaAddress) {
+        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) {
+                // 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');
+                }
                 yield this.setEoaConnector({
                     connector: eoaConnector,
                     eoaAddress,
                     properties,
                 });
             }
+            else {
+                // Existing implementation for regular ZeroDev
+                this.eoaConnectorMap[smartWalletAddress] = {
+                    eoaAddress,
+                    eoaConnector,
+                    properties,
+                };
+                if (shouldSetEoaConnector) {
+                    yield this.setEoaConnector({
+                        connector: eoaConnector,
+                        eoaAddress,
+                        properties,
+                    });
+                }
+            }
+        });
+    }
+    getOrCreateAuthorization() {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            if (!this.eoaConnector)
+                throw new utils.DynamicError('No EOA connector');
+            if (!walletConnectorCore.isTurnkeyWalletConnector(this.eoaConnector)) {
+                throw new utils.DynamicError('No EOA connector');
+            }
+            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 ((_a = this.eoaConnector) === null || _a === void 0 ? void 0 : _a.experimental_signAuthorization({
+                    contractAddress: (_b = ZeroDevConnector.kernelDelegationAddress) !== null && _b !== void 0 ? _b : 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 authorization;
+            }
+            catch (error) {
+                logger.logger.error('Failed to get/set authorization:', error);
+                utils.StorageService.removeItem(ZERODEV_AUTHORIZATION);
+                return undefined;
+            }
         });
     }
     setEoaConnector(_a) {
@@ -170,8 +215,10 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
             }
             const signer = yield this.eoaConnector.getSigner();
             signer.account = accounts.toAccount(eoaAddress);
+            if (this.enableEIP7702Mode) {
+                this.authorization = yield this.getOrCreateAuthorization();
+            }
             yield this.generateProviderMap(signer);
-            this.evmNetworks = this.evmNetworks.filter((network) => Boolean(this.providerMap[network.chainId]));
             this.kernelClientDeferredPromise.resolve();
         });
     }
@@ -196,13 +243,15 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
             yield Promise.all(this.providersFromApi.map((provider) => _tslib.__awaiter(this, void 0, void 0, function* () {
                 if (!this.providerMap[provider.chain]) {
                     const [kernelClient, kernelClientWithSponsorship] = yield Promise.all([
-                        this.getKernelClientWithoutSponsorshipValidation({
+                        this.createKernelClient({
                             chainId: provider.chain,
+                            paymaster: 'NONE',
                             projectId: provider.clientId,
                             signer,
                         }),
-                        this.getKernelClientWithSponsorshipValidation({
+                        this.createKernelClient({
                             chainId: provider.chain,
+                            paymaster: 'SPONSOR',
                             projectId: provider.clientId,
                             signer,
                         }),
@@ -216,27 +265,47 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
             })));
         });
     }
-    getKernelClientWithoutSponsorshipValidation(_a) {
-        return _tslib.__awaiter(this, arguments, void 0, function* ({ projectId, signer, chainId, }) {
+    createKernelClient(_a) {
+        return _tslib.__awaiter(this, arguments, void 0, function* ({ chainId, projectId, signer, paymaster, }) {
             if (chainId && this.providerMap[chainId]) {
                 return this.providerMap[chainId].kernelClient;
             }
             const { eoaConnector } = this;
             if (!eoaConnector)
                 throw new utils.DynamicError('No EOA connector');
-            const kernelClient = yield createEcsdaKernelAccountClient.createEcdsaKernelAccountClient({
-                bundlerRpc: ZeroDevConnector.bundlerRpc,
-                chain: ethereumCore.chainsMap[chainId],
-                ecdsaValidator: getEcdsaValidator.getEcdsaValidator(this.ecdsaProviderType),
-                enableKernelV3Migration: this.enableKernelV3Migration,
-                entryPoint: this.entryPoint,
-                kernelVersion: this.kernelVersion,
-                paymaster: 'NONE',
-                paymasterRpc: ZeroDevConnector.paymasterRpc,
-                projectId,
-                provider: ZeroDevConnector.bundlerProvider,
-                signer,
-            });
+            const chain = ethereumCore.chainsMap[chainId];
+            let kernelClient;
+            if (this.enableEIP7702Mode && this.authorization) {
+                kernelClient = yield createEcsdaKernelAccountClient.createEcdsaKernelAccountClientWith7702({
+                    authorization: this.authorization,
+                    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,
+                    signer,
+                });
+            }
+            else {
+                kernelClient = yield createEcsdaKernelAccountClient.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,
+                    signer,
+                });
+            }
             utils.wrapMethodWithCallback(kernelClient, 'sendUserOperation', (original, ...args) => {
                 this._walletUiUtils.disabledConfirmationOnce();
                 return original(...args);
@@ -244,37 +313,12 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
             return kernelClient;
         });
     }
-    getKernelClientWithSponsorshipValidation(_a) {
-        return _tslib.__awaiter(this, arguments, void 0, function* ({ projectId, signer, chainId, }) {
-            if (chainId && this.providerMap[chainId]) {
-                return this.providerMap[chainId].kernelClientWithSponsorship;
-            }
-            const { eoaConnector } = this;
-            if (!eoaConnector)
-                throw new utils.DynamicError('No EOA connector');
-            const kernelClientWithSponsorship = yield createEcsdaKernelAccountClient.createEcdsaKernelAccountClient({
-                bundlerRpc: ZeroDevConnector.bundlerRpc,
-                chain: ethereumCore.chainsMap[chainId],
-                ecdsaValidator: getEcdsaValidator.getEcdsaValidator(this.ecdsaProviderType),
-                enableKernelV3Migration: this.enableKernelV3Migration,
-                entryPoint: this.entryPoint,
-                kernelVersion: this.kernelVersion,
-                paymaster: 'SPONSOR',
-                paymasterRpc: ZeroDevConnector.paymasterRpc,
-                projectId,
-                provider: ZeroDevConnector.bundlerProvider,
-                signer,
-            });
-            utils.wrapMethodWithCallback(kernelClientWithSponsorship, 'sendUserOperation', (original, ...args) => {
-                this._walletUiUtils.disabledConfirmationOnce();
-                return original(...args);
-            });
-            return kernelClientWithSponsorship;
-        });
-    }
     getAddress() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c;
+            if (this.enableEIP7702Mode) {
+                return this.eoaAddress;
+            }
             yield ((_a = this.kernelClientDeferredPromise) === null || _a === void 0 ? void 0 : _a.promise);
             return (_c = (_b = this.kernelClient) === null || _b === void 0 ? void 0 : _b.account) === null || _c === void 0 ? void 0 : _c.address;
         });
@@ -290,9 +334,7 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
     }
     getNetwork() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
-            yield ((_a = this.kernelClientDeferredPromise) === null || _a === void 0 ? void 0 : _a.promise);
-            return (_c = (_b = this.kernelClient) === null || _b === void 0 ? void 0 : _b.chain) === null || _c === void 0 ? void 0 : _c.id;
+            return Number(this.lastUsedChainId);
         });
     }
     getTransport(provider) {
@@ -512,6 +554,14 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
     }
     validateActiveWallet(expectedAddress) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
+            if (this.enableEIP7702Mode) {
+                const currentAddress = yield this.getAddress();
+                if (currentAddress !== expectedAddress) {
+                    throw new utils.DynamicError('Invalid active wallet');
+                }
+                return;
+            }
+            // Existing implementation for regular ZeroDev
             const eoa = this.eoaConnectorMap[expectedAddress];
             if (!eoa) {
                 throw new utils.DynamicError('No EOA connector');

package/src/ZeroDevConnector.d.ts

@@ -1,6 +1,7 @@
 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 } from '@dynamic-labs/ethereum-core';
@@ -17,6 +18,8 @@ type ZeroDevConnectorProps = {
     walletBook: WalletBookSchema;
     walletUiUtils: WalletUiUtils<InternalWalletConnector>;
     bundlerProvider: BundlerProvider | undefined;
+    enableEIP7702?: boolean;
+    authorization?: SignAuthorizationReturnType;
 };
 type KernelClient = KernelAccountClient<Transport, ViemChain, SmartAccount, Client, RpcSchema>;
 export declare class ZeroDevConnector extends WalletConnectorBase<typeof EthereumWallet> implements IZeroDevConnector {
@@ -40,6 +43,7 @@ export declare class ZeroDevConnector extends WalletConnectorBase<typeof Ethereu
     static bundlerProvider: BundlerProvider | undefined;
     static bundlerRpc: string | undefined;
     static paymasterRpc: string | undefined;
+    static kernelDelegationAddress: `0x${string}` | undefined;
     /**
      * Deferred promise that resolves when the ZeroDev provider is set.
      * This is used to make sure that the provider is set before any other method is called.
@@ -55,7 +59,9 @@ export declare class ZeroDevConnector extends WalletConnectorBase<typeof Ethereu
         };
         name: string;
     };
+    enableEIP7702Mode: boolean;
     private _walletUiUtils;
+    private authorization?;
     constructor(opts: ZeroDevConnectorProps);
     get currentNetworkProvider(): {
         kernelClient: KernelClient;
@@ -77,7 +83,7 @@ export declare class ZeroDevConnector extends WalletConnectorBase<typeof Ethereu
         withSponsorship?: boolean;
     }): KernelClient | undefined;
     endSession(): Promise<void>;
-    registerEoa({ smartWalletAddress, eoaAddress, eoaConnector, shouldSetEoaConnector, ecdsaProviderType, kernelVersion, entryPointVersion, enableKernelV3Migration, }: {
+    registerEoa({ smartWalletAddress, eoaAddress, eoaConnector, shouldSetEoaConnector, ...properties }: {
         smartWalletAddress: string;
         eoaAddress: string;
         eoaConnector: InternalWalletConnector;
@@ -85,13 +91,12 @@ export declare class ZeroDevConnector extends WalletConnectorBase<typeof Ethereu
         ecdsaProviderType?: EcdsaValidatorOptions;
         kernelVersion?: ProviderKernelVersionEnum;
         entryPointVersion?: ProviderEntryPointVersionEnum;
-        enableKernelV3Migration?: boolean;
     }): Promise<void>;
+    private getOrCreateAuthorization;
     private setEoaConnector;
     private warnIfProjectChainNotEnabled;
     private generateProviderMap;
-    private getKernelClientWithoutSponsorshipValidation;
-    private getKernelClientWithSponsorshipValidation;
+    private createKernelClient;
     getAddress(): Promise<string | undefined>;
     getConnectedAccounts(): Promise<string[]>;
     getNetwork(): Promise<number | undefined>;

package/src/ZeroDevConnector.js

@@ -1,21 +1,21 @@
 'use client'
-import { __awaiter } from '../_virtual/_tslib.js';
+import { __awaiter, __rest } from '../_virtual/_tslib.js';
 import { publicActions, custom, createWalletClient, toHex, formatEther } from 'viem';
 import { toAccount } from 'viem/accounts';
-import { getEntryPoint as getEntryPoint$1 } from '@zerodev/sdk/constants';
+import { KERNEL_V3_3_BETA, KernelVersionToAddressesMap, getEntryPoint as getEntryPoint$1 } from '@zerodev/sdk/constants';
 import { EthereumWallet, isEthWalletConnector, chainsMap, confirmationTransport, unFormatTransaction, createViemUiTransaction } from '@dynamic-labs/ethereum-core';
-import { WalletConnectorBase, eventListenerHandlers } from '@dynamic-labs/wallet-connector-core';
-import { parseEvmNetworks, StorageService, DeferredPromise, parseChainId, DynamicError, wrapMethodWithCallback, TransactionGasCannotBeSponsoredError, InsufficientFundsError } from '@dynamic-labs/utils';
+import { WalletConnectorBase, eventListenerHandlers, isTurnkeyWalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { parseEvmNetworks, StorageService, DynamicError, DeferredPromise, parseChainId, wrapMethodWithCallback, TransactionGasCannotBeSponsoredError, InsufficientFundsError } from '@dynamic-labs/utils';
 import { ZERO_DEV_LAST_USED_CHAIN_ID_KEY } from './constants.js';
 import { logger } from './utils/logger.js';
-import { createEcdsaKernelAccountClient } from './utils/createEcsdaKernelAccountClient.js';
+import { createEcdsaKernelAccountClientWith7702, createEcdsaKernelAccountClient } from './utils/createEcsdaKernelAccountClient.js';
 import { getEcdsaValidator } from './utils/getEcdsaValidator.js';
 import { getEntryPoint } from './utils/getEntryPoint.js';
 import { getKernelVersion } from './utils/getKernelVersion.js';
 
 class ZeroDevConnector extends WalletConnectorBase {
     constructor(opts) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         super(opts);
         // provider map maintains the kernel clients per chain
         this.providerMap = {};
@@ -37,21 +37,23 @@ class ZeroDevConnector extends WalletConnectorBase {
             name: 'ZeroDev',
         };
         this._walletUiUtils = opts.walletUiUtils;
-        this.evmNetworks = parseEvmNetworks(opts.evmNetworks);
-        this.entryPoint = getEntryPoint((_a = opts.apiProviders.zerodev) === null || _a === void 0 ? void 0 : _a.entryPointVersion);
-        this.kernelVersion = getKernelVersion((_b = opts.apiProviders.zerodev) === null || _b === void 0 ? void 0 : _b.kernelVersion, this.entryPoint);
+        this.enableEIP7702Mode = (_b = (_a = opts.apiProviders.zerodev) === null || _a === void 0 ? void 0 : _a.enableEIP7702) !== null && _b !== void 0 ? _b : false;
+        this.entryPoint = getEntryPoint((_c = opts.apiProviders.zerodev) === null || _c === void 0 ? void 0 : _c.entryPointVersion);
+        this.kernelVersion = getKernelVersion((_d = opts.apiProviders.zerodev) === null || _d === void 0 ? void 0 : _d.kernelVersion, this.entryPoint);
         this.enableKernelV3Migration =
-            (_d = (_c = opts.apiProviders.zerodev) === null || _c === void 0 ? void 0 : _c.enableKernelV3Migration) !== null && _d !== void 0 ? _d : false;
+            (_f = (_e = opts.apiProviders.zerodev) === null || _e === void 0 ? void 0 : _e.enableKernelV3Migration) !== null && _f !== void 0 ? _f : false;
         // this is the list of providers from the api that are used for multi-chain account abstraction
         this.providersFromApi =
-            ((_e = opts.apiProviders.zerodev) === null || _e === void 0 ? void 0 : _e.multichainAccountAbstractionProviders) || [];
+            ((_g = opts.apiProviders.zerodev) === null || _g === void 0 ? void 0 : _g.multichainAccountAbstractionProviders) || [];
+        const enabledZerodevNetworks = this.providersFromApi.map((provider) => provider.chain);
+        this.evmNetworks = parseEvmNetworks(opts.evmNetworks).filter((network) => enabledZerodevNetworks.includes(network.chainId.toString()));
         const [defaultProvider] = this.providersFromApi;
         this.clientId = defaultProvider === null || defaultProvider === void 0 ? void 0 : defaultProvider.clientId;
         if (!this.clientId) {
             throw new Error('Missing ZeroDev project ID provided. Add your ZeroDev project id to your project configuration via the Dynamic Labs dashboard.');
         }
         this.defaultChainId = defaultProvider === null || defaultProvider === void 0 ? void 0 : defaultProvider.chain;
-        this.ecdsaProviderType = (_f = opts.apiProviders.zerodev) === null || _f === void 0 ? void 0 : _f.ecdsaProviderType;
+        this.ecdsaProviderType = (_h = opts.apiProviders.zerodev) === null || _h === void 0 ? void 0 : _h.ecdsaProviderType;
     }
     get currentNetworkProvider() {
         // check if the last used chain id is in the provider map
@@ -116,26 +118,69 @@ class ZeroDevConnector extends WalletConnectorBase {
         });
     }
     registerEoa(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ smartWalletAddress, eoaAddress, eoaConnector, shouldSetEoaConnector = false, ecdsaProviderType, kernelVersion, entryPointVersion, enableKernelV3Migration, }) {
-            const properties = {
-                ecdsaProviderType,
-                enableKernelV3Migration,
-                entryPointVersion,
-                kernelVersion,
-            };
-            this.eoaConnectorMap[smartWalletAddress] = {
-                eoaAddress,
-                eoaConnector,
-                properties,
-            };
-            // if this is the primary wallet, set the eoa connector and kernel clients
-            if (shouldSetEoaConnector && this.eoaAddress !== eoaAddress) {
+        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) {
+                // 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');
+                }
                 yield this.setEoaConnector({
                     connector: eoaConnector,
                     eoaAddress,
                     properties,
                 });
             }
+            else {
+                // Existing implementation for regular ZeroDev
+                this.eoaConnectorMap[smartWalletAddress] = {
+                    eoaAddress,
+                    eoaConnector,
+                    properties,
+                };
+                if (shouldSetEoaConnector) {
+                    yield this.setEoaConnector({
+                        connector: eoaConnector,
+                        eoaAddress,
+                        properties,
+                    });
+                }
+            }
+        });
+    }
+    getOrCreateAuthorization() {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            if (!this.eoaConnector)
+                throw new DynamicError('No EOA connector');
+            if (!isTurnkeyWalletConnector(this.eoaConnector)) {
+                throw new DynamicError('No EOA connector');
+            }
+            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 ((_a = this.eoaConnector) === null || _a === void 0 ? void 0 : _a.experimental_signAuthorization({
+                    contractAddress: (_b = ZeroDevConnector.kernelDelegationAddress) !== null && _b !== void 0 ? _b : 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 authorization;
+            }
+            catch (error) {
+                logger.error('Failed to get/set authorization:', error);
+                StorageService.removeItem(ZERODEV_AUTHORIZATION);
+                return undefined;
+            }
         });
     }
     setEoaConnector(_a) {
@@ -166,8 +211,10 @@ class ZeroDevConnector extends WalletConnectorBase {
             }
             const signer = yield this.eoaConnector.getSigner();
             signer.account = toAccount(eoaAddress);
+            if (this.enableEIP7702Mode) {
+                this.authorization = yield this.getOrCreateAuthorization();
+            }
             yield this.generateProviderMap(signer);
-            this.evmNetworks = this.evmNetworks.filter((network) => Boolean(this.providerMap[network.chainId]));
             this.kernelClientDeferredPromise.resolve();
         });
     }
@@ -192,13 +239,15 @@ class ZeroDevConnector extends WalletConnectorBase {
             yield Promise.all(this.providersFromApi.map((provider) => __awaiter(this, void 0, void 0, function* () {
                 if (!this.providerMap[provider.chain]) {
                     const [kernelClient, kernelClientWithSponsorship] = yield Promise.all([
-                        this.getKernelClientWithoutSponsorshipValidation({
+                        this.createKernelClient({
                             chainId: provider.chain,
+                            paymaster: 'NONE',
                             projectId: provider.clientId,
                             signer,
                         }),
-                        this.getKernelClientWithSponsorshipValidation({
+                        this.createKernelClient({
                             chainId: provider.chain,
+                            paymaster: 'SPONSOR',
                             projectId: provider.clientId,
                             signer,
                         }),
@@ -212,27 +261,47 @@ class ZeroDevConnector extends WalletConnectorBase {
             })));
         });
     }
-    getKernelClientWithoutSponsorshipValidation(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ projectId, signer, chainId, }) {
+    createKernelClient(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ chainId, projectId, signer, paymaster, }) {
             if (chainId && this.providerMap[chainId]) {
                 return this.providerMap[chainId].kernelClient;
             }
             const { eoaConnector } = this;
             if (!eoaConnector)
                 throw new DynamicError('No EOA connector');
-            const kernelClient = yield createEcdsaKernelAccountClient({
-                bundlerRpc: ZeroDevConnector.bundlerRpc,
-                chain: chainsMap[chainId],
-                ecdsaValidator: getEcdsaValidator(this.ecdsaProviderType),
-                enableKernelV3Migration: this.enableKernelV3Migration,
-                entryPoint: this.entryPoint,
-                kernelVersion: this.kernelVersion,
-                paymaster: 'NONE',
-                paymasterRpc: ZeroDevConnector.paymasterRpc,
-                projectId,
-                provider: ZeroDevConnector.bundlerProvider,
-                signer,
-            });
+            const chain = chainsMap[chainId];
+            let kernelClient;
+            if (this.enableEIP7702Mode && this.authorization) {
+                kernelClient = yield createEcdsaKernelAccountClientWith7702({
+                    authorization: this.authorization,
+                    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,
+                    signer,
+                });
+            }
+            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,
+                    signer,
+                });
+            }
             wrapMethodWithCallback(kernelClient, 'sendUserOperation', (original, ...args) => {
                 this._walletUiUtils.disabledConfirmationOnce();
                 return original(...args);
@@ -240,37 +309,12 @@ class ZeroDevConnector extends WalletConnectorBase {
             return kernelClient;
         });
     }
-    getKernelClientWithSponsorshipValidation(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ projectId, signer, chainId, }) {
-            if (chainId && this.providerMap[chainId]) {
-                return this.providerMap[chainId].kernelClientWithSponsorship;
-            }
-            const { eoaConnector } = this;
-            if (!eoaConnector)
-                throw new DynamicError('No EOA connector');
-            const kernelClientWithSponsorship = yield createEcdsaKernelAccountClient({
-                bundlerRpc: ZeroDevConnector.bundlerRpc,
-                chain: chainsMap[chainId],
-                ecdsaValidator: getEcdsaValidator(this.ecdsaProviderType),
-                enableKernelV3Migration: this.enableKernelV3Migration,
-                entryPoint: this.entryPoint,
-                kernelVersion: this.kernelVersion,
-                paymaster: 'SPONSOR',
-                paymasterRpc: ZeroDevConnector.paymasterRpc,
-                projectId,
-                provider: ZeroDevConnector.bundlerProvider,
-                signer,
-            });
-            wrapMethodWithCallback(kernelClientWithSponsorship, 'sendUserOperation', (original, ...args) => {
-                this._walletUiUtils.disabledConfirmationOnce();
-                return original(...args);
-            });
-            return kernelClientWithSponsorship;
-        });
-    }
     getAddress() {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c;
+            if (this.enableEIP7702Mode) {
+                return this.eoaAddress;
+            }
             yield ((_a = this.kernelClientDeferredPromise) === null || _a === void 0 ? void 0 : _a.promise);
             return (_c = (_b = this.kernelClient) === null || _b === void 0 ? void 0 : _b.account) === null || _c === void 0 ? void 0 : _c.address;
         });
@@ -286,9 +330,7 @@ class ZeroDevConnector extends WalletConnectorBase {
     }
     getNetwork() {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
-            yield ((_a = this.kernelClientDeferredPromise) === null || _a === void 0 ? void 0 : _a.promise);
-            return (_c = (_b = this.kernelClient) === null || _b === void 0 ? void 0 : _b.chain) === null || _c === void 0 ? void 0 : _c.id;
+            return Number(this.lastUsedChainId);
         });
     }
     getTransport(provider) {
@@ -508,6 +550,14 @@ class ZeroDevConnector extends WalletConnectorBase {
     }
     validateActiveWallet(expectedAddress) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (this.enableEIP7702Mode) {
+                const currentAddress = yield this.getAddress();
+                if (currentAddress !== expectedAddress) {
+                    throw new DynamicError('Invalid active wallet');
+                }
+                return;
+            }
+            // Existing implementation for regular ZeroDev
             const eoa = this.eoaConnectorMap[expectedAddress];
             if (!eoa) {
                 throw new DynamicError('No EOA connector');

package/src/index.cjs

@@ -15,10 +15,11 @@ var ethereumAa = require('./ethereum-aa.cjs');
 var isZeroDevConnector = require('./utils/isZeroDevConnector.cjs');
 
 assertPackageVersion.assertPackageVersion('@dynamic-labs/ethereum-aa', _package.version);
-const ZeroDevSmartWalletConnectorsWithConfig = ({ bundlerProvider, bundlerRpc, paymasterRpc, } = {}) => {
+const ZeroDevSmartWalletConnectorsWithConfig = ({ bundlerProvider, bundlerRpc, paymasterRpc, kernelDelegationAddress, } = {}) => {
     ZeroDevConnector.ZeroDevConnector.bundlerProvider = bundlerProvider;
     ZeroDevConnector.ZeroDevConnector.bundlerRpc = bundlerRpc;
     ZeroDevConnector.ZeroDevConnector.paymasterRpc = paymasterRpc;
+    ZeroDevConnector.ZeroDevConnector.kernelDelegationAddress = kernelDelegationAddress;
     return ZeroDevSmartWalletConnectors;
 };
 const ZeroDevSmartWalletConnectors = (props) => {

package/src/index.d.ts

@@ -7,9 +7,10 @@ export { getEntryPoint } from './utils/getEntryPoint';
 export { getKernelVersion } from './utils/getKernelVersion';
 export * from './ethereum-aa';
 export { isZeroDevConnector } from './utils/isZeroDevConnector';
-export declare const ZeroDevSmartWalletConnectorsWithConfig: ({ bundlerProvider, bundlerRpc, paymasterRpc, }?: {
+export declare const ZeroDevSmartWalletConnectorsWithConfig: ({ bundlerProvider, bundlerRpc, paymasterRpc, kernelDelegationAddress, }?: {
     bundlerProvider?: BundlerProvider;
     bundlerRpc?: string;
     paymasterRpc?: string;
+    kernelDelegationAddress?: `0x${string}`;
 }) => (props: any) => WalletConnectorConstructor[];
 export declare const ZeroDevSmartWalletConnectors: (props: any) => WalletConnectorConstructor[];

package/src/index.js

@@ -11,10 +11,11 @@ export { EthereumAaConnector } from './ethereum-aa.js';
 export { isZeroDevConnector } from './utils/isZeroDevConnector.js';
 
 assertPackageVersion('@dynamic-labs/ethereum-aa', version);
-const ZeroDevSmartWalletConnectorsWithConfig = ({ bundlerProvider, bundlerRpc, paymasterRpc, } = {}) => {
+const ZeroDevSmartWalletConnectorsWithConfig = ({ bundlerProvider, bundlerRpc, paymasterRpc, kernelDelegationAddress, } = {}) => {
     ZeroDevConnector.bundlerProvider = bundlerProvider;
     ZeroDevConnector.bundlerRpc = bundlerRpc;
     ZeroDevConnector.paymasterRpc = paymasterRpc;
+    ZeroDevConnector.kernelDelegationAddress = kernelDelegationAddress;
     return ZeroDevSmartWalletConnectors;
 };
 const ZeroDevSmartWalletConnectors = (props) => {

package/src/utils/createEcsdaKernelAccountClient.cjs

@@ -26,13 +26,49 @@ const getZeroDevPaymasterRPC = (projectId, provider) => {
     return rpc;
 };
 const isERC20 = (value) => viem.isAddress(value);
-const createEcdsaKernelAccountClient = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ bundlerRpc, chain, paymasterRpc, projectId, signer, provider, index, paymaster = 'SPONSOR', entryPoint, kernelVersion, ecdsaValidator: ecdsaValidator$1, enableKernelV3Migration, }) {
-    const resolvedBundlerRpc = bundlerRpc !== null && bundlerRpc !== void 0 ? bundlerRpc : getZeroDevBundlerRPC(projectId, provider);
-    const resolvedPaymasterRpc = paymasterRpc !== null && paymasterRpc !== void 0 ? paymasterRpc : getZeroDevPaymasterRPC(projectId, provider);
+const createPublicAndPaymasterClients = (bundlerRpc, paymasterRpc, chain) => {
     const publicClient = viem.createPublicClient({
         chain,
-        transport: viem.http(resolvedBundlerRpc),
+        transport: viem.http(bundlerRpc),
+    });
+    const zerodevPaymaster = clients.createZeroDevPaymasterClient({
+        chain,
+        transport: viem.http(paymasterRpc),
     });
+    return { publicClient, zerodevPaymaster };
+};
+const createPaymasterHandler = (paymaster, zerodevPaymaster) => {
+    if (paymaster === 'NONE')
+        return undefined;
+    return {
+        getPaymasterData: (userOperation) => {
+            const _userOperation = userOperation;
+            if (isERC20(paymaster)) {
+                return zerodevPaymaster.sponsorUserOperation({
+                    gasToken: paymaster,
+                    userOperation: _userOperation,
+                });
+            }
+            return zerodevPaymaster.sponsorUserOperation({
+                userOperation: _userOperation,
+            });
+        },
+    };
+};
+const createKernelClientConfig = (account, bundlerRpc, chain, publicClient, paymaster) => ({
+    account,
+    bundlerTransport: viem.http(bundlerRpc),
+    chain,
+    client: publicClient,
+    paymaster,
+    userOperation: {
+        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 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 validator = yield ecdsaValidator$1(publicClient, {
         entryPoint,
         kernelVersion,
@@ -40,16 +76,11 @@ const createEcdsaKernelAccountClient = (_a) => _tslib.__awaiter(void 0, [_a], vo
     });
     const account = yield accounts.createKernelAccount(publicClient, {
         entryPoint,
-        index,
         kernelVersion,
         plugins: {
             sudo: validator,
         },
     });
-    const zerodevPaymaster = clients.createZeroDevPaymasterClient({
-        chain,
-        transport: viem.http(resolvedPaymasterRpc),
-    });
     let selectedAccount = account;
     if (enableKernelV3Migration) {
         const migrationVersion = constants.KERNEL_V3_1;
@@ -62,34 +93,34 @@ const createEcdsaKernelAccountClient = (_a) => _tslib.__awaiter(void 0, [_a], vo
             signer,
         });
     }
-    const kernelClient = clients.createKernelAccountClient({
-        account: selectedAccount,
-        bundlerTransport: viem.http(resolvedBundlerRpc),
-        chain,
-        client: publicClient,
-        paymaster: paymaster !== 'NONE'
-            ? {
-                getPaymasterData: (userOperation) => {
-                    const _userOperation = userOperation;
-                    if (isERC20(paymaster)) {
-                        return zerodevPaymaster.sponsorUserOperation({
-                            gasToken: paymaster,
-                            userOperation: _userOperation,
-                        });
-                    }
-                    return zerodevPaymaster.sponsorUserOperation({
-                        userOperation: _userOperation,
-                    });
-                },
-            }
-            : undefined,
-        userOperation: {
-            estimateFeesPerGas: (_b) => _tslib.__awaiter(void 0, [_b], void 0, function* ({ bundlerClient }) { return actions.getUserOperationGasPrice(bundlerClient); }),
+    const paymasterHandler = createPaymasterHandler(paymaster, zerodevPaymaster);
+    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 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 validator = yield ecdsaValidator(publicClient, {
+        entryPoint,
+        kernelVersion,
+        signer,
+    });
+    const account = yield accounts.createKernelAccount(publicClient, {
+        address: signer.account.address,
+        eip7702Auth: authorization,
+        entryPoint,
+        kernelVersion,
+        plugins: {
+            sudo: validator,
         },
     });
-    return kernelClient;
+    const paymasterHandler = createPaymasterHandler(paymaster, zerodevPaymaster);
+    const clientConfig = createKernelClientConfig(account, resolvedBundlerRpc, chain, publicClient, paymasterHandler);
+    return clients.createKernelAccountClient(clientConfig);
 });
 
 exports.createEcdsaKernelAccountClient = createEcdsaKernelAccountClient;
+exports.createEcdsaKernelAccountClientWith7702 = createEcdsaKernelAccountClientWith7702;
 exports.getZeroDevBundlerRPC = getZeroDevBundlerRPC;
 exports.getZeroDevPaymasterRPC = getZeroDevPaymasterRPC;

package/src/utils/createEcsdaKernelAccountClient.d.ts

@@ -1,24 +1,29 @@
 import { SmartAccount, EntryPointVersion } from 'viem/account-abstraction';
 import { KernelAccountClient } from '@zerodev/sdk/clients';
 import { type Chain as ViemChain } from 'viem/chains';
-import { Address, WalletClient, Account, type Client, type RpcSchema, type Transport } from 'viem';
+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;
 export declare const getZeroDevBundlerRPC: (projectId: string, provider?: BundlerProvider) => string;
 export declare const getZeroDevPaymasterRPC: (projectId: string, provider?: BundlerProvider) => string;
-export declare const createEcdsaKernelAccountClient: <entryPoint extends EntryPointVersion, TChain extends ViemChain | undefined = ViemChain | undefined>({ bundlerRpc, chain, paymasterRpc, projectId, signer, provider, index, paymaster, entryPoint, kernelVersion, ecdsaValidator, enableKernelV3Migration, }: {
-    bundlerRpc?: string | undefined;
+type CommonClientParams<TChain extends Chain | undefined = Chain | undefined> = {
+    bundlerRpc?: string;
     chain: TChain;
     projectId: string;
     signer: WalletClient<Transport, ViemChain, Account>;
     paymaster: PaymasterType;
-    paymasterRpc?: string | undefined;
-    entryPoint: EntryPointType<entryPoint>;
-    provider?: BundlerProvider | undefined;
-    index?: bigint | undefined;
-    kernelVersion: GetKernelVersion<entryPoint>;
+    paymasterRpc?: string;
+    entryPoint: EntryPointType<EntryPointVersion>;
+    provider?: BundlerProvider;
+    kernelVersion: GetKernelVersion<EntryPointVersion>;
     ecdsaValidator: any;
     enableKernelV3Migration: boolean;
+};
+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> & {
+    authorization: SignAuthorizationReturnType;
 }) => Promise<KernelAccountClient<Transport, ViemChain, SmartAccount, Client, RpcSchema>>;
+export {};

package/src/utils/createEcsdaKernelAccountClient.js

@@ -1,7 +1,7 @@
 'use client'
 import { __awaiter } from '../../_virtual/_tslib.js';
 import { createKernelAccount } from '@zerodev/sdk/accounts';
-import { createZeroDevPaymasterClient, createKernelAccountClient } from '@zerodev/sdk/clients';
+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';
@@ -22,13 +22,49 @@ const getZeroDevPaymasterRPC = (projectId, provider) => {
     return rpc;
 };
 const isERC20 = (value) => isAddress(value);
-const createEcdsaKernelAccountClient = (_a) => __awaiter(void 0, [_a], void 0, function* ({ bundlerRpc, chain, paymasterRpc, projectId, signer, provider, index, paymaster = 'SPONSOR', entryPoint, kernelVersion, ecdsaValidator, enableKernelV3Migration, }) {
-    const resolvedBundlerRpc = bundlerRpc !== null && bundlerRpc !== void 0 ? bundlerRpc : getZeroDevBundlerRPC(projectId, provider);
-    const resolvedPaymasterRpc = paymasterRpc !== null && paymasterRpc !== void 0 ? paymasterRpc : getZeroDevPaymasterRPC(projectId, provider);
+const createPublicAndPaymasterClients = (bundlerRpc, paymasterRpc, chain) => {
     const publicClient = createPublicClient({
         chain,
-        transport: http(resolvedBundlerRpc),
+        transport: http(bundlerRpc),
+    });
+    const zerodevPaymaster = createZeroDevPaymasterClient({
+        chain,
+        transport: http(paymasterRpc),
     });
+    return { publicClient, zerodevPaymaster };
+};
+const createPaymasterHandler = (paymaster, zerodevPaymaster) => {
+    if (paymaster === 'NONE')
+        return undefined;
+    return {
+        getPaymasterData: (userOperation) => {
+            const _userOperation = userOperation;
+            if (isERC20(paymaster)) {
+                return zerodevPaymaster.sponsorUserOperation({
+                    gasToken: paymaster,
+                    userOperation: _userOperation,
+                });
+            }
+            return zerodevPaymaster.sponsorUserOperation({
+                userOperation: _userOperation,
+            });
+        },
+    };
+};
+const createKernelClientConfig = (account, bundlerRpc, chain, publicClient, paymaster) => ({
+    account,
+    bundlerTransport: http(bundlerRpc),
+    chain,
+    client: publicClient,
+    paymaster,
+    userOperation: {
+        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 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 validator = yield ecdsaValidator(publicClient, {
         entryPoint,
         kernelVersion,
@@ -36,16 +72,11 @@ const createEcdsaKernelAccountClient = (_a) => __awaiter(void 0, [_a], void 0, f
     });
     const account = yield createKernelAccount(publicClient, {
         entryPoint,
-        index,
         kernelVersion,
         plugins: {
             sudo: validator,
         },
     });
-    const zerodevPaymaster = createZeroDevPaymasterClient({
-        chain,
-        transport: http(resolvedPaymasterRpc),
-    });
     let selectedAccount = account;
     if (enableKernelV3Migration) {
         const migrationVersion = KERNEL_V3_1;
@@ -58,32 +89,31 @@ const createEcdsaKernelAccountClient = (_a) => __awaiter(void 0, [_a], void 0, f
             signer,
         });
     }
-    const kernelClient = createKernelAccountClient({
-        account: selectedAccount,
-        bundlerTransport: http(resolvedBundlerRpc),
-        chain,
-        client: publicClient,
-        paymaster: paymaster !== 'NONE'
-            ? {
-                getPaymasterData: (userOperation) => {
-                    const _userOperation = userOperation;
-                    if (isERC20(paymaster)) {
-                        return zerodevPaymaster.sponsorUserOperation({
-                            gasToken: paymaster,
-                            userOperation: _userOperation,
-                        });
-                    }
-                    return zerodevPaymaster.sponsorUserOperation({
-                        userOperation: _userOperation,
-                    });
-                },
-            }
-            : undefined,
-        userOperation: {
-            estimateFeesPerGas: (_b) => __awaiter(void 0, [_b], void 0, function* ({ bundlerClient }) { return getUserOperationGasPrice(bundlerClient); }),
+    const paymasterHandler = createPaymasterHandler(paymaster, zerodevPaymaster);
+    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 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 validator = yield ecdsaValidator(publicClient, {
+        entryPoint,
+        kernelVersion,
+        signer,
+    });
+    const account = yield createKernelAccount(publicClient, {
+        address: signer.account.address,
+        eip7702Auth: authorization,
+        entryPoint,
+        kernelVersion,
+        plugins: {
+            sudo: validator,
         },
     });
-    return kernelClient;
+    const paymasterHandler = createPaymasterHandler(paymaster, zerodevPaymaster);
+    const clientConfig = createKernelClientConfig(account, resolvedBundlerRpc, chain, publicClient, paymasterHandler);
+    return createKernelAccountClient(clientConfig);
 });
 
-export { createEcdsaKernelAccountClient, getZeroDevBundlerRPC, getZeroDevPaymasterRPC };
+export { createEcdsaKernelAccountClient, createEcdsaKernelAccountClientWith7702, getZeroDevBundlerRPC, getZeroDevPaymasterRPC };