@dynamic-labs/ethereum-aa 4.4.2-preview.1 → 4.4.3

package/CHANGELOG.md

@@ -1,24 +1,26 @@
 
-### [4.4.2-preview.1](https://github.com/dynamic-labs/dynamic-auth/compare/v4.4.2...v4.4.2-preview.1) (2025-01-30)
+### [4.4.3](https://github.com/dynamic-labs/dynamic-auth/compare/v4.4.2...v4.4.3) (2025-01-30)
 
 
-### Features
+### Bug Fixes
 
-* add support for 7702 on ZeroDevConnector ([144e99a](https://github.com/dynamic-labs/dynamic-auth/commit/144e99a673abbe4c775ec2124375925e96f76071))
-* implement experimental_signAuthorization method in TurnkeyEVMWalletConnector ([#7866](https://github.com/dynamic-labs/dynamic-auth/issues/7866)) ([9622d1e](https://github.com/dynamic-labs/dynamic-auth/commit/9622d1e0e42bb3401fffbdda7b735db1736717ce))
-* implement experimental_signAuthorization method in TurnkeyEVMWalletConnector ([#7866](https://github.com/dynamic-labs/dynamic-auth/issues/7866)) ([7f367b8](https://github.com/dynamic-labs/dynamic-auth/commit/7f367b8bc9d6a0ece0268867bf9c7754d75d7949))
-* implement experimental_signAuthorization method in TurnkeyEVMWalletConnector ([#7866](https://github.com/dynamic-labs/dynamic-auth/issues/7866)) ([2019c4c](https://github.com/dynamic-labs/dynamic-auth/commit/2019c4cb89e4a042dc1c896a71b803db572e1842))
-* override kernel address and add auth to localstorage ([1074ebc](https://github.com/dynamic-labs/dynamic-auth/commit/1074ebc0f3eca26fb868fd7acc9e3ac7c1048007))
+* remove extra useOnClickOutside hook ([#7910](https://github.com/dynamic-labs/dynamic-auth/issues/7910)) ([42fce2e](https://github.com/dynamic-labs/dynamic-auth/commit/42fce2e91e814514a72c97b3ea06930db805a200))
 
-### [4.4.2-preview.0](https://github.com/dynamic-labs/dynamic-auth/compare/v4.4.1...v4.4.2-preview.0) (2025-01-28)
+### [4.4.2](https://github.com/dynamic-labs/dynamic-auth/compare/v4.4.1...v4.4.2) (2025-01-30)
 
 
 ### Features
 
-* add support for 7702 on ZeroDevConnector ([a8c850a](https://github.com/dynamic-labs/dynamic-auth/commit/a8c850ab192d6113ad55a01a594d5d90ab0fbfa6))
-* implement experimental_signAuthorization method in TurnkeyEVMWalletConnector ([#7866](https://github.com/dynamic-labs/dynamic-auth/issues/7866)) ([96853fa](https://github.com/dynamic-labs/dynamic-auth/commit/96853fae170ca2f81cc01ccd6d9886446876412b))
-* implement experimental_signAuthorization method in TurnkeyEVMWalletConnector ([#7866](https://github.com/dynamic-labs/dynamic-auth/issues/7866)) ([d988e88](https://github.com/dynamic-labs/dynamic-auth/commit/d988e88eccd0b04ba5710c8aa437f5dfffeb1d74))
-* implement experimental_signAuthorization method in TurnkeyEVMWalletConnector ([#7866](https://github.com/dynamic-labs/dynamic-auth/issues/7866)) ([597f837](https://github.com/dynamic-labs/dynamic-auth/commit/597f8375bacef1e6a9a064604074c6920955a3e2))
+* add support for Bitget BTC ([#7915](https://github.com/dynamic-labs/dynamic-auth/issues/7915)) ([3fe23f7](https://github.com/dynamic-labs/dynamic-auth/commit/3fe23f739818ef0f5d504c34f237d1d115e4f50c))
+
+
+### Bug Fixes
+
+* add backpackeclipse to walletbook fallbacks ([#7932](https://github.com/dynamic-labs/dynamic-auth/issues/7932)) ([eeaa7da](https://github.com/dynamic-labs/dynamic-auth/commit/eeaa7da629cb06ffc856f2e7f99beefcb8553bbd))
+* otp verified should always be true ([#7921](https://github.com/dynamic-labs/dynamic-auth/issues/7921)) ([ac884d6](https://github.com/dynamic-labs/dynamic-auth/commit/ac884d6475152778aabd72d2c923b3c0b7745b00))
+* **qntm-2814:** return checksum address from coinbase and metamask ([#7927](https://github.com/dynamic-labs/dynamic-auth/issues/7927)) ([3169d4d](https://github.com/dynamic-labs/dynamic-auth/commit/3169d4dd717b840c3654d15bacb20780d515269b))
+* fix: creation of embedded wallet sessions with external auth
+
 
 ### [4.4.1](https://github.com/dynamic-labs/dynamic-auth/compare/v4.4.0...v4.4.1) (2025-01-27)
 

package/_virtual/_tslib.cjs

@@ -18,18 +18,6 @@ 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) {
@@ -46,4 +34,3 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
 };
 
 exports.__awaiter = __awaiter;
-exports.__rest = __rest;

package/_virtual/_tslib.js

@@ -14,18 +14,6 @@ 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) {
@@ -41,4 +29,4 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
-export { __awaiter, __rest };
+export { __awaiter };

package/package.cjs

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

package/package.js

@@ -1,4 +1,4 @@
 'use client'
-var version = "4.4.2-preview.1";
+var version = "4.4.3";
 
 export { version };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/ethereum-aa",
-  "version": "4.4.2-preview.1",
+  "version": "4.4.3",
   "description": "A React SDK for implementing wallet web3 authentication and authorization to your website.",
   "author": "Dynamic Labs, Inc.",
   "license": "MIT",
@@ -22,13 +22,13 @@
     "@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.4.2-preview.1",
-    "@dynamic-labs/ethereum-core": "4.4.2-preview.1",
-    "@dynamic-labs/logger": "4.4.2-preview.1",
-    "@dynamic-labs/types": "4.4.2-preview.1",
-    "@dynamic-labs/utils": "4.4.2-preview.1",
-    "@dynamic-labs/wallet-book": "4.4.2-preview.1",
-    "@dynamic-labs/wallet-connector-core": "4.4.2-preview.1"
+    "@dynamic-labs/assert-package-version": "4.4.3",
+    "@dynamic-labs/ethereum-core": "4.4.3",
+    "@dynamic-labs/logger": "4.4.3",
+    "@dynamic-labs/types": "4.4.3",
+    "@dynamic-labs/utils": "4.4.3",
+    "@dynamic-labs/wallet-book": "4.4.3",
+    "@dynamic-labs/wallet-connector-core": "4.4.3"
   },
   "peerDependencies": {
     "viem": "^2.21.55"

package/src/ZeroDevConnector.cjs

@@ -40,7 +40,6 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
             },
             name: 'ZeroDev',
         };
-        this.isEip7702Mode = true; //opts.apiProviders.zerodev?.isEip7702 ?? false;
         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);
@@ -58,10 +57,6 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
         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;
     }
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    confirmTransactionStatus(txHash) {
-        throw new Error('Method not implemented.');
-    }
     get currentNetworkProvider() {
         // check if the last used chain id is in the provider map
         if (this.providerMap[this.lastUsedChainId]) {
@@ -125,67 +120,26 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
         });
     }
     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.isEip7702Mode) {
-                // 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');
-                }
+        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) {
                 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 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.KERNEL_7702_DELEGATION_ADDRESS,
-                }));
-                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) {
@@ -216,9 +170,6 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
             }
             const signer = yield this.eoaConnector.getSigner();
             signer.account = accounts.toAccount(eoaAddress);
-            if (this.isEip7702Mode) {
-                this.authorization = yield this.getOrCreateAuthorization();
-            }
             yield this.generateProviderMap(signer);
             this.evmNetworks = this.evmNetworks.filter((network) => Boolean(this.providerMap[network.chainId]));
             this.kernelClientDeferredPromise.resolve();
@@ -245,15 +196,13 @@ 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.createKernelClient({
+                        this.getKernelClientWithoutSponsorshipValidation({
                             chainId: provider.chain,
-                            paymaster: 'NONE',
                             projectId: provider.clientId,
                             signer,
                         }),
-                        this.createKernelClient({
+                        this.getKernelClientWithSponsorshipValidation({
                             chainId: provider.chain,
-                            paymaster: 'SPONSOR',
                             projectId: provider.clientId,
                             signer,
                         }),
@@ -267,47 +216,27 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
             })));
         });
     }
-    createKernelClient(_a) {
-        return _tslib.__awaiter(this, arguments, void 0, function* ({ chainId, projectId, signer, paymaster, }) {
+    getKernelClientWithoutSponsorshipValidation(_a) {
+        return _tslib.__awaiter(this, arguments, void 0, function* ({ projectId, signer, chainId, }) {
             if (chainId && this.providerMap[chainId]) {
                 return this.providerMap[chainId].kernelClient;
             }
             const { eoaConnector } = this;
             if (!eoaConnector)
                 throw new utils.DynamicError('No EOA connector');
-            const chain = ethereumCore.chainsMap[chainId];
-            let kernelClient;
-            if (this.isEip7702Mode && 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,
-                });
-            }
+            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,
+            });
             utils.wrapMethodWithCallback(kernelClient, 'sendUserOperation', (original, ...args) => {
                 this._walletUiUtils.disabledConfirmationOnce();
                 return original(...args);
@@ -315,12 +244,37 @@ 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.isEip7702Mode) {
-                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;
         });
@@ -336,7 +290,9 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
     }
     getNetwork() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            return Number(this.lastUsedChainId);
+            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;
         });
     }
     getTransport(provider) {
@@ -556,14 +512,6 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
     }
     validateActiveWallet(expectedAddress) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            if (this.isEip7702Mode) {
-                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,14 +1,13 @@
 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';
 import { EcdsaValidatorOptions, Provider, ProviderEntryPointVersionEnum, ProviderEnum, ProviderKernelVersionEnum, ProviderMultichainAccountAbstractionProviders } from '@dynamic-labs/sdk-api-core';
 import { Chain, IZeroDevConnector, InternalWalletConnector, WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
 import { WalletBookSchema } from '@dynamic-labs/wallet-book';
-import { EvmNetwork, GenericNetwork, IUITransaction, TransactionReceipt, WalletUiUtils } from '@dynamic-labs/types';
+import { EvmNetwork, GenericNetwork, IUITransaction, WalletUiUtils } from '@dynamic-labs/types';
 import { BundlerProvider } from './utils';
 type ZeroDevConnectorProps = {
     apiProviders: {
@@ -18,8 +17,6 @@ type ZeroDevConnectorProps = {
     walletBook: WalletBookSchema;
     walletUiUtils: WalletUiUtils<InternalWalletConnector>;
     bundlerProvider: BundlerProvider | undefined;
-    isEip7702?: boolean;
-    authorization?: SignAuthorizationReturnType;
 };
 type KernelClient = KernelAccountClient<Transport, ViemChain, SmartAccount, Client, RpcSchema>;
 export declare class ZeroDevConnector extends WalletConnectorBase<typeof EthereumWallet> implements IZeroDevConnector {
@@ -43,7 +40,6 @@ 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.
@@ -59,11 +55,8 @@ export declare class ZeroDevConnector extends WalletConnectorBase<typeof Ethereu
         };
         name: string;
     };
-    isEip7702Mode: boolean;
     private _walletUiUtils;
-    private authorization?;
     constructor(opts: ZeroDevConnectorProps);
-    confirmTransactionStatus?(txHash: string): Promise<TransactionReceipt>;
     get currentNetworkProvider(): {
         kernelClient: KernelClient;
         kernelClientWithSponsorship: KernelClient;
@@ -84,7 +77,7 @@ export declare class ZeroDevConnector extends WalletConnectorBase<typeof Ethereu
         withSponsorship?: boolean;
     }): KernelClient | undefined;
     endSession(): Promise<void>;
-    registerEoa({ smartWalletAddress, eoaAddress, eoaConnector, shouldSetEoaConnector, ...properties }: {
+    registerEoa({ smartWalletAddress, eoaAddress, eoaConnector, shouldSetEoaConnector, ecdsaProviderType, kernelVersion, entryPointVersion, enableKernelV3Migration, }: {
         smartWalletAddress: string;
         eoaAddress: string;
         eoaConnector: InternalWalletConnector;
@@ -92,12 +85,13 @@ 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 createKernelClient;
+    private getKernelClientWithoutSponsorshipValidation;
+    private getKernelClientWithSponsorshipValidation;
     getAddress(): Promise<string | undefined>;
     getConnectedAccounts(): Promise<string[]>;
     getNetwork(): Promise<number | undefined>;

package/src/ZeroDevConnector.js

@@ -1,14 +1,14 @@
 'use client'
-import { __awaiter, __rest } from '../_virtual/_tslib.js';
+import { __awaiter } from '../_virtual/_tslib.js';
 import { publicActions, custom, createWalletClient, toHex, formatEther } from 'viem';
 import { toAccount } from 'viem/accounts';
-import { KERNEL_7702_DELEGATION_ADDRESS, getEntryPoint as getEntryPoint$1 } from '@zerodev/sdk/constants';
+import { getEntryPoint as getEntryPoint$1 } from '@zerodev/sdk/constants';
 import { EthereumWallet, isEthWalletConnector, chainsMap, confirmationTransport, unFormatTransaction, createViemUiTransaction } from '@dynamic-labs/ethereum-core';
-import { WalletConnectorBase, eventListenerHandlers, isTurnkeyWalletConnector } from '@dynamic-labs/wallet-connector-core';
-import { parseEvmNetworks, StorageService, DynamicError, DeferredPromise, parseChainId, wrapMethodWithCallback, TransactionGasCannotBeSponsoredError, InsufficientFundsError } from '@dynamic-labs/utils';
+import { WalletConnectorBase, eventListenerHandlers } from '@dynamic-labs/wallet-connector-core';
+import { parseEvmNetworks, StorageService, DeferredPromise, parseChainId, DynamicError, 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 { createEcdsaKernelAccountClientWith7702, createEcdsaKernelAccountClient } from './utils/createEcsdaKernelAccountClient.js';
+import { createEcdsaKernelAccountClient } from './utils/createEcsdaKernelAccountClient.js';
 import { getEcdsaValidator } from './utils/getEcdsaValidator.js';
 import { getEntryPoint } from './utils/getEntryPoint.js';
 import { getKernelVersion } from './utils/getKernelVersion.js';
@@ -36,7 +36,6 @@ class ZeroDevConnector extends WalletConnectorBase {
             },
             name: 'ZeroDev',
         };
-        this.isEip7702Mode = true; //opts.apiProviders.zerodev?.isEip7702 ?? false;
         this._walletUiUtils = opts.walletUiUtils;
         this.evmNetworks = parseEvmNetworks(opts.evmNetworks);
         this.entryPoint = getEntryPoint((_a = opts.apiProviders.zerodev) === null || _a === void 0 ? void 0 : _a.entryPointVersion);
@@ -54,10 +53,6 @@ class ZeroDevConnector extends WalletConnectorBase {
         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;
     }
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    confirmTransactionStatus(txHash) {
-        throw new Error('Method not implemented.');
-    }
     get currentNetworkProvider() {
         // check if the last used chain id is in the provider map
         if (this.providerMap[this.lastUsedChainId]) {
@@ -121,67 +116,26 @@ class ZeroDevConnector extends WalletConnectorBase {
         });
     }
     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.isEip7702Mode) {
-                // 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');
-                }
+        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) {
                 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 authorization = yield ((_a = this.eoaConnector) === null || _a === void 0 ? void 0 : _a.experimental_signAuthorization({
-                    contractAddress: (_b = ZeroDevConnector.kernelDelegationAddress) !== null && _b !== void 0 ? _b : KERNEL_7702_DELEGATION_ADDRESS,
-                }));
-                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) {
@@ -212,9 +166,6 @@ class ZeroDevConnector extends WalletConnectorBase {
             }
             const signer = yield this.eoaConnector.getSigner();
             signer.account = toAccount(eoaAddress);
-            if (this.isEip7702Mode) {
-                this.authorization = yield this.getOrCreateAuthorization();
-            }
             yield this.generateProviderMap(signer);
             this.evmNetworks = this.evmNetworks.filter((network) => Boolean(this.providerMap[network.chainId]));
             this.kernelClientDeferredPromise.resolve();
@@ -241,15 +192,13 @@ 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.createKernelClient({
+                        this.getKernelClientWithoutSponsorshipValidation({
                             chainId: provider.chain,
-                            paymaster: 'NONE',
                             projectId: provider.clientId,
                             signer,
                         }),
-                        this.createKernelClient({
+                        this.getKernelClientWithSponsorshipValidation({
                             chainId: provider.chain,
-                            paymaster: 'SPONSOR',
                             projectId: provider.clientId,
                             signer,
                         }),
@@ -263,47 +212,27 @@ class ZeroDevConnector extends WalletConnectorBase {
             })));
         });
     }
-    createKernelClient(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ chainId, projectId, signer, paymaster, }) {
+    getKernelClientWithoutSponsorshipValidation(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ projectId, signer, chainId, }) {
             if (chainId && this.providerMap[chainId]) {
                 return this.providerMap[chainId].kernelClient;
             }
             const { eoaConnector } = this;
             if (!eoaConnector)
                 throw new DynamicError('No EOA connector');
-            const chain = chainsMap[chainId];
-            let kernelClient;
-            if (this.isEip7702Mode && 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,
-                });
-            }
+            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,
+            });
             wrapMethodWithCallback(kernelClient, 'sendUserOperation', (original, ...args) => {
                 this._walletUiUtils.disabledConfirmationOnce();
                 return original(...args);
@@ -311,12 +240,37 @@ 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.isEip7702Mode) {
-                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;
         });
@@ -332,7 +286,9 @@ class ZeroDevConnector extends WalletConnectorBase {
     }
     getNetwork() {
         return __awaiter(this, void 0, void 0, function* () {
-            return Number(this.lastUsedChainId);
+            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;
         });
     }
     getTransport(provider) {
@@ -552,14 +508,6 @@ class ZeroDevConnector extends WalletConnectorBase {
     }
     validateActiveWallet(expectedAddress) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.isEip7702Mode) {
-                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,11 +15,10 @@ 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, kernelDelegationAddress, } = {}) => {
+const ZeroDevSmartWalletConnectorsWithConfig = ({ bundlerProvider, bundlerRpc, paymasterRpc, } = {}) => {
     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,10 +7,9 @@ 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, kernelDelegationAddress, }?: {
+export declare const ZeroDevSmartWalletConnectorsWithConfig: ({ bundlerProvider, bundlerRpc, paymasterRpc, }?: {
     bundlerProvider?: BundlerProvider;
     bundlerRpc?: string;
     paymasterRpc?: string;
-    kernelDelegationAddress?: `0x${string}`;
 }) => (props: any) => WalletConnectorConstructor[];
 export declare const ZeroDevSmartWalletConnectors: (props: any) => WalletConnectorConstructor[];

package/src/index.js

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

package/src/utils/createEcsdaKernelAccountClient.cjs

@@ -26,49 +26,13 @@ const getZeroDevPaymasterRPC = (projectId, provider) => {
     return rpc;
 };
 const isERC20 = (value) => viem.isAddress(value);
-const createPublicAndPaymasterClients = (bundlerRpc, paymasterRpc, chain) => {
+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 publicClient = viem.createPublicClient({
         chain,
-        transport: viem.http(bundlerRpc),
-    });
-    const zerodevPaymaster = clients.createZeroDevPaymasterClient({
-        chain,
-        transport: viem.http(paymasterRpc),
+        transport: viem.http(resolvedBundlerRpc),
     });
-    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,
@@ -76,11 +40,16 @@ const createEcdsaKernelAccountClient = (_b) => _tslib.__awaiter(void 0, [_b], 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;
@@ -93,34 +62,34 @@ const createEcdsaKernelAccountClient = (_b) => _tslib.__awaiter(void 0, [_b], vo
             signer,
         });
     }
-    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,
+    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(account, resolvedBundlerRpc, chain, publicClient, paymasterHandler);
-    return clients.createKernelAccountClient(clientConfig);
+    return kernelClient;
 });
 
 exports.createEcdsaKernelAccountClient = createEcdsaKernelAccountClient;
-exports.createEcdsaKernelAccountClientWith7702 = createEcdsaKernelAccountClientWith7702;
 exports.getZeroDevBundlerRPC = getZeroDevBundlerRPC;
 exports.getZeroDevPaymasterRPC = getZeroDevPaymasterRPC;

package/src/utils/createEcsdaKernelAccountClient.d.ts

@@ -1,29 +1,24 @@
 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 Chain, type Client, type RpcSchema, type Transport } from 'viem';
+import { Address, WalletClient, Account, 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;
-type CommonClientParams<TChain extends Chain | undefined = Chain | undefined> = {
-    bundlerRpc?: 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;
     chain: TChain;
     projectId: string;
     signer: WalletClient<Transport, ViemChain, Account>;
     paymaster: PaymasterType;
-    paymasterRpc?: string;
-    entryPoint: EntryPointType<EntryPointVersion>;
-    provider?: BundlerProvider;
-    kernelVersion: GetKernelVersion<EntryPointVersion>;
+    paymasterRpc?: string | undefined;
+    entryPoint: EntryPointType<entryPoint>;
+    provider?: BundlerProvider | undefined;
+    index?: bigint | undefined;
+    kernelVersion: GetKernelVersion<entryPoint>;
     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 { createKernelAccountClient, createZeroDevPaymasterClient } from '@zerodev/sdk/clients';
+import { createZeroDevPaymasterClient, createKernelAccountClient } from '@zerodev/sdk/clients';
 import { getUserOperationGasPrice } from '@zerodev/sdk/actions';
 import { createPublicClient, http, isAddress } from 'viem';
 import { createEcdsaKernelMigrationAccount } from '@zerodev/ecdsa-validator';
@@ -22,49 +22,13 @@ const getZeroDevPaymasterRPC = (projectId, provider) => {
     return rpc;
 };
 const isERC20 = (value) => isAddress(value);
-const createPublicAndPaymasterClients = (bundlerRpc, paymasterRpc, chain) => {
+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 publicClient = createPublicClient({
         chain,
-        transport: http(bundlerRpc),
-    });
-    const zerodevPaymaster = createZeroDevPaymasterClient({
-        chain,
-        transport: http(paymasterRpc),
+        transport: http(resolvedBundlerRpc),
     });
-    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,
@@ -72,11 +36,16 @@ const createEcdsaKernelAccountClient = (_b) => __awaiter(void 0, [_b], 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;
@@ -89,31 +58,32 @@ const createEcdsaKernelAccountClient = (_b) => __awaiter(void 0, [_b], void 0, f
             signer,
         });
     }
-    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,
+    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(account, resolvedBundlerRpc, chain, publicClient, paymasterHandler);
-    return createKernelAccountClient(clientConfig);
+    return kernelClient;
 });
 
-export { createEcdsaKernelAccountClient, createEcdsaKernelAccountClientWith7702, getZeroDevBundlerRPC, getZeroDevPaymasterRPC };
+export { createEcdsaKernelAccountClient, getZeroDevBundlerRPC, getZeroDevPaymasterRPC };