@dynamic-labs/ethereum-aa 2.0.0-alpha.2 → 2.0.0-alpha.21

package/src/ZeroDevConnector.d.ts

@@ -1,9 +1,11 @@
-import { ECDSAProvider } from '@zerodev/sdk';
-import { PublicClient, RpcTransactionRequest, WalletClient } from 'viem';
+import { KernelAccountClient } from '@zerodev/sdk';
+import { type Provider as BundlerProvider } from '@zerodev/presets';
+import { Account, PublicClient, Transport, WalletClient } from 'viem';
+import { type Chain as ViemChain } from 'viem/chains';
 import { Provider, ProviderEnum } from '@dynamic-labs/sdk-api';
-import { Chain, IAccountAbstractionWalletConnector, WalletConnector, WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
+import { Chain, IAccountAbstractionWalletConnector, ISendBalanceWalletConnector, WalletConnector, WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
 import { WalletBookSchema } from '@dynamic-labs/wallet-book';
-import { EvmNetwork, GenericNetwork, WalletUiUtils } from '@dynamic-labs/types';
+import { EvmNetwork, GenericNetwork, IUITransaction, WalletUiUtils } from '@dynamic-labs/types';
 type ZeroDevConnectorProps = {
     apiProviders: {
         [key in ProviderEnum]?: Provider;
@@ -11,42 +13,304 @@ type ZeroDevConnectorProps = {
     evmNetworks: GenericNetwork[];
     walletBook: WalletBookSchema;
     walletUiUtils: WalletUiUtils<WalletConnector>;
+    bundlerProvider: BundlerProvider | undefined;
 };
-export declare class ZeroDevConnector extends WalletConnectorBase implements IAccountAbstractionWalletConnector {
+type IZeroDevConnector = IAccountAbstractionWalletConnector & ISendBalanceWalletConnector;
+export declare class ZeroDevConnector extends WalletConnectorBase implements IZeroDevConnector {
     projectId: string;
-    zeroDevProvider: ECDSAProvider | undefined;
+    kernelClient: KernelAccountClient | undefined;
     eoaConnector: WalletConnector | undefined;
-    private providerWithSponsorship;
+    private kernelClientWithSponsorship;
     connectedChain: Chain;
     supportedChains: Chain[];
     evmNetworks: EvmNetwork[];
     private isGasSponsorshipDisabled;
     isEmbeddedWallet: boolean;
+    static bundlerProvider: BundlerProvider | 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.
      * This is needed because the provider is set asynchronously.
      */
-    private zeroDevProviderDeferredPromise;
+    private kernelClientDeferredPromise;
     name: string;
-    get key(): string;
+    overrideKey: string;
     private _walletUiUtils;
     constructor(opts: ZeroDevConnectorProps);
     getEOAConnector(): WalletConnector | undefined;
-    getAccountAbstractionProvider(): ECDSAProvider | undefined;
+    getAccountAbstractionProvider(): KernelAccountClient | undefined;
+    endSession(): Promise<void>;
     setEoaConnector(connector: WalletConnector): Promise<void>;
     private checkIsProjectChainEnabled;
-    private getProviderWithSponsorshipValidation;
-    fetchPublicAddress(): Promise<string | undefined>;
+    private getKernelClientWithSponsorshipValidation;
+    getAddress(): Promise<string | undefined>;
     getConnectedAccounts(): Promise<string[]>;
     getNetwork(): Promise<number | undefined>;
     private getTransport;
-    getWalletClient(): WalletClient | undefined;
+    getWalletClient(chainId?: string): WalletClient<Transport, ViemChain> | undefined;
     getPublicClient(): Promise<void | PublicClient | undefined>;
-    getSigner(): Promise<WalletClient | undefined>;
-    canSponsorTransactionGas(transaction: RpcTransactionRequest): Promise<boolean>;
+    getSigner(): Promise<{
+        account: Account | undefined;
+        batch?: {
+            multicall?: boolean | {
+                batchSize?: number | undefined;
+                wait?: number | undefined;
+            } | undefined;
+        } | undefined;
+        cacheTime: number;
+        chain: ViemChain;
+        key: string;
+        name: string;
+        pollingInterval: number;
+        request: import("viem").EIP1193RequestFn<import("viem").WalletRpcSchema>;
+        transport: import("viem").TransportConfig<string, import("viem").EIP1193RequestFn> & Record<string, any>;
+        type: string;
+        uid: string;
+        addChain: (args: import("viem").AddChainParameters) => Promise<void>;
+        deployContract: <const abi extends import("viem").Abi | readonly unknown[], chainOverride extends ViemChain | undefined>(args: import("viem").DeployContractParameters<abi, ViemChain, Account | undefined, chainOverride>) => Promise<`0x${string}`>;
+        getAddresses: () => Promise<import("viem").GetAddressesReturnType>;
+        getChainId: () => Promise<number>;
+        getPermissions: () => Promise<import("viem").GetPermissionsReturnType>;
+        prepareTransactionRequest: <TParameterType extends import("viem").PrepareTransactionRequestParameterType, TChainOverride extends ViemChain | undefined = undefined, TAccountOverride extends `0x${string}` | Account | undefined = undefined>(args: import("viem").PrepareTransactionRequestParameters<ViemChain, Account | undefined, TChainOverride, TAccountOverride, TParameterType>) => Promise<import("viem").PrepareTransactionRequestReturnType<ViemChain, Account | undefined, TChainOverride, TAccountOverride, TParameterType>>;
+        requestAddresses: () => Promise<import("viem").RequestAddressesReturnType>;
+        requestPermissions: (args: {
+            [x: string]: Record<string, any>;
+            eth_accounts: Record<string, any>;
+        }) => Promise<import("viem").RequestPermissionsReturnType>;
+        sendRawTransaction: (args: import("viem").SendRawTransactionParameters) => Promise<`0x${string}`>;
+        sendTransaction: <TChainOverride_1 extends ViemChain | undefined = undefined>(args: import("viem").SendTransactionParameters<ViemChain, Account | undefined, TChainOverride_1>) => Promise<`0x${string}`>;
+        signMessage: (args: import("viem").SignMessageParameters<Account | undefined>) => Promise<`0x${string}`>;
+        signTransaction: <TChainOverride_2 extends ViemChain | undefined>(args: import("viem").SignTransactionParameters<ViemChain, Account | undefined, TChainOverride_2>) => Promise<`0x${string}`>;
+        signTypedData: <const TTypedData extends {
+            [x: string]: readonly import("viem").TypedDataParameter[];
+            [x: `string[${string}]`]: undefined;
+            [x: `function[${string}]`]: undefined;
+            [x: `address[${string}]`]: undefined;
+            [x: `bool[${string}]`]: undefined;
+            [x: `bytes[${string}]`]: undefined;
+            [x: `bytes9[${string}]`]: undefined;
+            [x: `bytes1[${string}]`]: undefined;
+            [x: `bytes32[${string}]`]: undefined;
+            [x: `bytes31[${string}]`]: undefined;
+            [x: `bytes30[${string}]`]: undefined;
+            [x: `bytes29[${string}]`]: undefined;
+            [x: `bytes28[${string}]`]: undefined;
+            [x: `bytes27[${string}]`]: undefined;
+            [x: `bytes26[${string}]`]: undefined;
+            [x: `bytes25[${string}]`]: undefined;
+            [x: `bytes24[${string}]`]: undefined;
+            [x: `bytes23[${string}]`]: undefined;
+            [x: `bytes22[${string}]`]: undefined;
+            [x: `bytes21[${string}]`]: undefined;
+            [x: `bytes20[${string}]`]: undefined;
+            [x: `bytes19[${string}]`]: undefined;
+            [x: `bytes2[${string}]`]: undefined;
+            [x: `bytes18[${string}]`]: undefined;
+            [x: `bytes17[${string}]`]: undefined;
+            [x: `bytes16[${string}]`]: undefined;
+            [x: `bytes15[${string}]`]: undefined;
+            [x: `bytes14[${string}]`]: undefined;
+            [x: `bytes13[${string}]`]: undefined;
+            [x: `bytes12[${string}]`]: undefined;
+            [x: `bytes11[${string}]`]: undefined;
+            [x: `bytes10[${string}]`]: undefined;
+            [x: `bytes8[${string}]`]: undefined;
+            [x: `bytes7[${string}]`]: undefined;
+            [x: `bytes6[${string}]`]: undefined;
+            [x: `bytes5[${string}]`]: undefined;
+            [x: `bytes4[${string}]`]: undefined;
+            [x: `bytes3[${string}]`]: undefined;
+            [x: `int[${string}]`]: undefined;
+            [x: `int40[${string}]`]: undefined;
+            [x: `int32[${string}]`]: undefined;
+            [x: `int24[${string}]`]: undefined;
+            [x: `int16[${string}]`]: undefined;
+            [x: `int8[${string}]`]: undefined;
+            [x: `int48[${string}]`]: undefined;
+            [x: `int56[${string}]`]: undefined;
+            [x: `int64[${string}]`]: undefined;
+            [x: `int72[${string}]`]: undefined;
+            [x: `int80[${string}]`]: undefined;
+            [x: `int88[${string}]`]: undefined;
+            [x: `int96[${string}]`]: undefined;
+            [x: `int104[${string}]`]: undefined;
+            [x: `int112[${string}]`]: undefined;
+            [x: `int120[${string}]`]: undefined;
+            [x: `int128[${string}]`]: undefined;
+            [x: `int136[${string}]`]: undefined;
+            [x: `int144[${string}]`]: undefined;
+            [x: `int152[${string}]`]: undefined;
+            [x: `int160[${string}]`]: undefined;
+            [x: `int168[${string}]`]: undefined;
+            [x: `int176[${string}]`]: undefined;
+            [x: `int184[${string}]`]: undefined;
+            [x: `int192[${string}]`]: undefined;
+            [x: `int200[${string}]`]: undefined;
+            [x: `int208[${string}]`]: undefined;
+            [x: `int216[${string}]`]: undefined;
+            [x: `int224[${string}]`]: undefined;
+            [x: `int232[${string}]`]: undefined;
+            [x: `int240[${string}]`]: undefined;
+            [x: `int248[${string}]`]: undefined;
+            [x: `int256[${string}]`]: undefined;
+            [x: `uint[${string}]`]: undefined;
+            [x: `uint40[${string}]`]: undefined;
+            [x: `uint32[${string}]`]: undefined;
+            [x: `uint24[${string}]`]: undefined;
+            [x: `uint16[${string}]`]: undefined;
+            [x: `uint8[${string}]`]: undefined;
+            [x: `uint48[${string}]`]: undefined;
+            [x: `uint56[${string}]`]: undefined;
+            [x: `uint64[${string}]`]: undefined;
+            [x: `uint72[${string}]`]: undefined;
+            [x: `uint80[${string}]`]: undefined;
+            [x: `uint88[${string}]`]: undefined;
+            [x: `uint96[${string}]`]: undefined;
+            [x: `uint104[${string}]`]: undefined;
+            [x: `uint112[${string}]`]: undefined;
+            [x: `uint120[${string}]`]: undefined;
+            [x: `uint128[${string}]`]: undefined;
+            [x: `uint136[${string}]`]: undefined;
+            [x: `uint144[${string}]`]: undefined;
+            [x: `uint152[${string}]`]: undefined;
+            [x: `uint160[${string}]`]: undefined;
+            [x: `uint168[${string}]`]: undefined;
+            [x: `uint176[${string}]`]: undefined;
+            [x: `uint184[${string}]`]: undefined;
+            [x: `uint192[${string}]`]: undefined;
+            [x: `uint200[${string}]`]: undefined;
+            [x: `uint208[${string}]`]: undefined;
+            [x: `uint216[${string}]`]: undefined;
+            [x: `uint224[${string}]`]: undefined;
+            [x: `uint232[${string}]`]: undefined;
+            [x: `uint240[${string}]`]: undefined;
+            [x: `uint248[${string}]`]: undefined;
+            [x: `uint256[${string}]`]: undefined;
+            string?: undefined;
+            address?: undefined;
+            bool?: undefined;
+            bytes?: undefined;
+            bytes9?: undefined;
+            bytes1?: undefined;
+            bytes32?: undefined;
+            bytes31?: undefined;
+            bytes30?: undefined;
+            bytes29?: undefined;
+            bytes28?: undefined;
+            bytes27?: undefined;
+            bytes26?: undefined;
+            bytes25?: undefined;
+            bytes24?: undefined;
+            bytes23?: undefined;
+            bytes22?: undefined;
+            bytes21?: undefined;
+            bytes20?: undefined;
+            bytes19?: undefined;
+            bytes2?: undefined;
+            bytes18?: undefined;
+            bytes17?: undefined;
+            bytes16?: undefined;
+            bytes15?: undefined;
+            bytes14?: undefined;
+            bytes13?: undefined;
+            bytes12?: undefined;
+            bytes11?: undefined;
+            bytes10?: undefined;
+            bytes8?: undefined;
+            bytes7?: undefined;
+            bytes6?: undefined;
+            bytes5?: undefined;
+            bytes4?: undefined;
+            bytes3?: undefined;
+            int40?: undefined;
+            int32?: undefined;
+            int24?: undefined;
+            int16?: undefined;
+            int8?: undefined;
+            int48?: undefined;
+            int56?: undefined;
+            int64?: undefined;
+            int72?: undefined;
+            int80?: undefined;
+            int88?: undefined;
+            int96?: undefined;
+            int104?: undefined;
+            int112?: undefined;
+            int120?: undefined;
+            int128?: undefined;
+            int136?: undefined;
+            int144?: undefined;
+            int152?: undefined;
+            int160?: undefined;
+            int168?: undefined;
+            int176?: undefined;
+            int184?: undefined;
+            int192?: undefined;
+            int200?: undefined;
+            int208?: undefined;
+            int216?: undefined;
+            int224?: undefined;
+            int232?: undefined;
+            int240?: undefined;
+            int248?: undefined;
+            int256?: undefined;
+            uint40?: undefined;
+            uint32?: undefined;
+            uint24?: undefined;
+            uint16?: undefined;
+            uint8?: undefined;
+            uint48?: undefined;
+            uint56?: undefined;
+            uint64?: undefined;
+            uint72?: undefined;
+            uint80?: undefined;
+            uint88?: undefined;
+            uint96?: undefined;
+            uint104?: undefined;
+            uint112?: undefined;
+            uint120?: undefined;
+            uint128?: undefined;
+            uint136?: undefined;
+            uint144?: undefined;
+            uint152?: undefined;
+            uint160?: undefined;
+            uint168?: undefined;
+            uint176?: undefined;
+            uint184?: undefined;
+            uint192?: undefined;
+            uint200?: undefined;
+            uint208?: undefined;
+            uint216?: undefined;
+            uint224?: undefined;
+            uint232?: undefined;
+            uint240?: undefined;
+            uint248?: undefined;
+            uint256?: undefined;
+        } | {
+            [key: string]: unknown;
+        }, TPrimaryType extends string>(args: import("viem").SignTypedDataParameters<TTypedData, TPrimaryType, Account | undefined>) => Promise<`0x${string}`>;
+        switchChain: (args: import("viem").SwitchChainParameters) => Promise<void>;
+        watchAsset: (args: import("viem").WatchAssetParams) => Promise<boolean>;
+        writeContract: <const abi_1 extends import("viem").Abi | readonly unknown[], functionName extends import("viem").ContractFunctionName<abi_1, "nonpayable" | "payable">, args extends import("viem").ContractFunctionArgs<abi_1, "pure" | "view", functionName>, TChainOverride_3 extends ViemChain | undefined = undefined>(args: import("viem").WriteContractParameters<abi_1, functionName, args, ViemChain, Account | undefined, TChainOverride_3>) => Promise<`0x${string}`>;
+        extend: <const client extends {
+            [x: string]: unknown;
+            account?: undefined;
+            batch?: undefined;
+            cacheTime?: undefined;
+            chain?: undefined;
+            key?: undefined;
+            name?: undefined;
+            pollingInterval?: undefined;
+            request?: undefined;
+            transport?: undefined;
+            type?: undefined;
+            uid?: undefined;
+        } & Partial<Pick<import("viem").PublicActions<Transport, ViemChain, Account | undefined>, "call" | "createContractEventFilter" | "createEventFilter" | "estimateContractGas" | "estimateGas" | "getBlock" | "getBlockNumber" | "getChainId" | "getContractEvents" | "getEnsText" | "getFilterChanges" | "getGasPrice" | "getLogs" | "getTransaction" | "getTransactionCount" | "getTransactionReceipt" | "prepareTransactionRequest" | "readContract" | "sendRawTransaction" | "simulateContract" | "uninstallFilter" | "watchBlockNumber" | "watchContractEvent"> & Pick<import("viem").WalletActions<ViemChain, Account | undefined>, "sendTransaction" | "writeContract">>>(fn: (client: import("viem").Client<Transport, ViemChain, Account | undefined, import("viem").WalletRpcSchema, import("viem").WalletActions<ViemChain, Account | undefined>>) => client) => import("viem").Client<Transport, ViemChain, Account | undefined, import("viem").WalletRpcSchema, { [K in keyof client]: client[K]; } & import("viem").WalletActions<ViemChain, Account | undefined>>;
+    } | undefined>;
+    canSponsorTransactionGas(transaction: IUITransaction): Promise<boolean>;
     disableGasSponsorshipOnce(): void;
     getBalance(): Promise<string | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;
+    createUiTransaction(from: string): Promise<IUITransaction>;
 }
 export {};

package/src/ZeroDevConnector.js

@@ -1,15 +1,14 @@
 import { __awaiter } from '../_virtual/_tslib.js';
-import { ECDSAProvider, convertWalletClientToAccountSigner } from '@zerodev/sdk';
-import { custom, createWalletClient, isHex, fromHex, formatEther } from 'viem';
+import { createEcdsaKernelAccountClient } from '@zerodev/presets';
+import { publicActions, custom, createWalletClient, isHex, fromHex, formatEther } from 'viem';
+import { walletClientToSmartAccountSigner } from 'permissionless';
 import { WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
-import { confirmationTransport, unFormatTransaction } from '@dynamic-labs/viem-utils';
+import { confirmationTransport, chainsMap, unFormatTransaction, createViemUiTransaction } from '@dynamic-labs/viem-utils';
 import { parseEvmNetworks, DynamicError, DeferredPromise, wrapMethodWithCallback, TransactionGasCannotBeSponsoredError, InsufficientFundsError } from '@dynamic-labs/utils';
+import { cachedChainIdKey, fetchChain } from './utils/fetchChain.js';
 import { logger } from './utils/logger.js';
 
 class ZeroDevConnector extends WalletConnectorBase {
-    get key() {
-        return 'zerodev';
-    }
     constructor(opts) {
         var _a;
         super(opts);
@@ -18,6 +17,7 @@ class ZeroDevConnector extends WalletConnectorBase {
         this.isGasSponsorshipDisabled = false;
         this.isEmbeddedWallet = true;
         this.name = 'ZeroDev';
+        this.overrideKey = 'zerodev';
         const zeroDevProjectId = (_a = opts.apiProviders.zerodev) === null || _a === void 0 ? void 0 : _a.clientId;
         if (!zeroDevProjectId) {
             throw new Error('Missing ZeroDev project ID provided. Add your ZeroDev project id to your project configuration via the Dynamic Labs dashboard.');
@@ -30,28 +30,35 @@ class ZeroDevConnector extends WalletConnectorBase {
         return this.eoaConnector;
     }
     getAccountAbstractionProvider() {
-        return this.zeroDevProvider;
+        return this.kernelClient;
+    }
+    endSession() {
+        return __awaiter(this, void 0, void 0, function* () {
+            localStorage.removeItem(cachedChainIdKey);
+        });
     }
     setEoaConnector(connector) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.zeroDevProviderDeferredPromise = new DeferredPromise();
+            this.kernelClientDeferredPromise = new DeferredPromise();
             this.eoaConnector = connector;
             const signer = yield this.eoaConnector.getSigner();
-            if (!signer) {
+            if (!(signer === null || signer === void 0 ? void 0 : signer.account)) {
                 return;
             }
-            const zeroDevProvider = yield ECDSAProvider.init({
-                bundlerProvider: 'STACKUP',
-                owner: convertWalletClientToAccountSigner(signer),
+            const kernelClient = yield createEcdsaKernelAccountClient({
+                chain: yield fetchChain(this.projectId),
+                paymaster: 'NONE',
                 projectId: this.projectId,
+                provider: ZeroDevConnector.bundlerProvider,
+                signer: walletClientToSmartAccountSigner(signer),
             });
-            wrapMethodWithCallback(zeroDevProvider, 'sendUserOperation', (original, ...args) => {
+            wrapMethodWithCallback(kernelClient, 'sendUserOperation', (original, ...args) => {
                 this._walletUiUtils.disabledConfirmationOnce();
                 return original(...args);
             });
-            this.zeroDevProvider = zeroDevProvider;
+            this.kernelClient = kernelClient;
             yield this.checkIsProjectChainEnabled();
-            this.zeroDevProviderDeferredPromise.resolve();
+            this.kernelClientDeferredPromise.resolve();
         });
     }
     checkIsProjectChainEnabled() {
@@ -66,69 +73,67 @@ class ZeroDevConnector extends WalletConnectorBase {
             }
         });
     }
-    getProviderWithSponsorshipValidation() {
+    getKernelClientWithSponsorshipValidation() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.providerWithSponsorship) {
-                return this.providerWithSponsorship;
+            if (this.kernelClientWithSponsorship) {
+                return this.kernelClientWithSponsorship;
             }
             const { eoaConnector } = this;
             if (!eoaConnector)
                 throw new DynamicError('No EOA connector');
             const signer = yield eoaConnector.getSigner();
-            this.providerWithSponsorship = yield ECDSAProvider.init({
-                bundlerProvider: 'STACKUP',
-                opts: {
-                    paymasterConfig: {
-                        onlySendSponsoredTransaction: true,
-                        policy: 'VERIFYING_PAYMASTER',
-                    },
-                },
-                owner: convertWalletClientToAccountSigner(signer),
+            this.kernelClientWithSponsorship = yield createEcdsaKernelAccountClient({
+                chain: yield fetchChain(this.projectId),
+                paymaster: 'SPONSOR',
                 projectId: this.projectId,
+                provider: ZeroDevConnector.bundlerProvider,
+                signer: walletClientToSmartAccountSigner(signer),
             });
-            wrapMethodWithCallback(this.providerWithSponsorship, 'sendUserOperation', (original, ...args) => {
+            wrapMethodWithCallback(this.kernelClientWithSponsorship, 'sendUserOperation', (original, ...args) => {
                 this._walletUiUtils.disabledConfirmationOnce();
                 return original(...args);
             });
-            return this.providerWithSponsorship;
+            return this.kernelClientWithSponsorship;
         });
     }
-    fetchPublicAddress() {
-        var _a, _b;
+    getAddress() {
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
-            yield ((_a = this.zeroDevProviderDeferredPromise) === null || _a === void 0 ? void 0 : _a.promise);
-            return (_b = this.zeroDevProvider) === null || _b === void 0 ? void 0 : _b.getAddress();
+            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;
         });
     }
     getConnectedAccounts() {
-        var _a;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
-            yield ((_a = this.zeroDevProviderDeferredPromise) === null || _a === void 0 ? void 0 : _a.promise);
-            return this.zeroDevProvider
-                ? [yield this.zeroDevProvider.getAddress()]
+            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)
+                ? [yield this.kernelClient.account.address]
                 : [];
         });
     }
     getNetwork() {
-        var _a, _b;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
-            yield ((_a = this.zeroDevProviderDeferredPromise) === null || _a === void 0 ? void 0 : _a.promise);
-            return (_b = this.zeroDevProvider) === null || _b === void 0 ? void 0 : _b.rpcClient.chain.id;
+            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) {
         const transport = confirmationTransport({
-            connector: this,
             onPersonalSign: ({ message }) => __awaiter(this, void 0, void 0, function* () {
                 this._walletUiUtils.disabledConfirmationOnce();
-                return provider.signMessage(message);
+                return provider.signMessage({
+                    account: provider.account,
+                    message,
+                });
             }),
             onSendTransaction: ({ transaction }) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     this._walletUiUtils.disabledConfirmationOnce();
                     const effectiveProvider = this.isGasSponsorshipDisabled
                         ? provider
-                        : yield this.getProviderWithSponsorshipValidation();
+                        : yield this.getKernelClientWithSponsorshipValidation();
                     const response = yield effectiveProvider.sendTransaction(unFormatTransaction(transaction));
                     return response;
                 }
@@ -146,58 +151,69 @@ class ZeroDevConnector extends WalletConnectorBase {
             onSignTypedData: ({ message }) => __awaiter(this, void 0, void 0, function* () {
                 this._walletUiUtils.disabledConfirmationOnce();
                 const signTypedData = JSON.parse(message);
-                return provider.signTypedData(signTypedData);
+                return provider.signTypedData({
+                    account: provider.account,
+                    domain: signTypedData.domain,
+                    message: signTypedData.message,
+                    primaryType: signTypedData.primaryType,
+                    types: signTypedData.types,
+                });
             }),
-            provider: provider.rpcClient,
+            provider: provider.extend(publicActions),
             transport: custom(provider),
+            walletConnector: this,
             walletUiUtils: this._walletUiUtils,
         });
         return transport;
     }
-    getWalletClient() {
-        const provider = this.zeroDevProvider;
+    getWalletClient(chainId) {
+        var _a;
+        const provider = this.kernelClient;
         if (!provider)
             throw new DynamicError('No provider');
         const transport = this.getTransport(provider);
+        const address = (_a = provider.account) === null || _a === void 0 ? void 0 : _a.address;
         const walletClient = createWalletClient({
+            account: address,
+            chain: chainId ? chainsMap[chainId] : provider.chain,
             transport,
         });
         return walletClient;
     }
     getPublicClient() {
         return __awaiter(this, void 0, void 0, function* () {
-            const provider = this.zeroDevProvider;
+            const provider = this.kernelClient.extend(publicActions);
             if (!provider)
                 throw new DynamicError('No provider');
-            return provider.rpcClient;
+            return provider;
         });
     }
     getSigner() {
         return __awaiter(this, void 0, void 0, function* () {
-            const provider = this.zeroDevProvider;
-            if (!provider)
-                throw new DynamicError('No provider');
-            const transport = this.getTransport(provider);
-            const address = yield provider.getAddress();
-            const walletClient = createWalletClient({
-                account: address,
-                transport,
-            });
-            return walletClient;
+            return this.getWalletClient();
         });
     }
     canSponsorTransactionGas(transaction) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             try {
+                yield this.getKernelClientWithSponsorshipValidation();
                 const userOperation = {
-                    data: transaction.data ? transaction.data : '0x',
-                    target: transaction.to,
-                    value: isHex(transaction.value)
-                        ? fromHex(transaction.value, 'bigint')
-                        : transaction.value,
+                    callData: yield this.kernelClientWithSponsorship.account.encodeCallData({
+                        data: transaction.data ? transaction.data : '0x',
+                        to: transaction.to,
+                        /**
+                         * if value is undefined, it will be set to 0x0 so the sponsorship
+                         * check does not fail
+                         */
+                        value: transaction.value && isHex(transaction.value)
+                            ? fromHex(transaction.value, 'bigint')
+                            : '0x0',
+                    }),
                 };
-                const result = yield ((_a = this.zeroDevProvider) === null || _a === void 0 ? void 0 : _a.buildUserOperation(userOperation));
+                const result = yield this.kernelClientWithSponsorship.prepareUserOperationRequest({
+                    account: this.kernelClientWithSponsorship.account,
+                    userOperation,
+                });
                 if (!result)
                     return false;
                 return result.paymasterAndData !== '0x';
@@ -212,12 +228,11 @@ class ZeroDevConnector extends WalletConnectorBase {
         this.isGasSponsorshipDisabled = true;
     }
     getBalance() {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const rpcClient = yield ((_a = this.zeroDevProvider) === null || _a === void 0 ? void 0 : _a.rpcClient);
+            const rpcClient = this.kernelClient.extend(publicActions);
             if (!rpcClient)
                 throw new DynamicError('No RPC client');
-            const address = yield this.fetchPublicAddress();
+            const address = yield this.getAddress();
             if (!address)
                 return;
             return formatEther(yield rpcClient.getBalance({ address: address }));
@@ -226,7 +241,7 @@ class ZeroDevConnector extends WalletConnectorBase {
     signMessage(messageToSign) {
         return __awaiter(this, void 0, void 0, function* () {
             const client = yield this.getSigner();
-            const account = yield this.fetchPublicAddress();
+            const account = yield this.getAddress();
             if (!account || !client)
                 return;
             return client.signMessage({
@@ -235,6 +250,16 @@ class ZeroDevConnector extends WalletConnectorBase {
             });
         });
     }
+    createUiTransaction(from) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const walletClient = this.getWalletClient();
+            const publicClient = yield this.getPublicClient();
+            if (!publicClient || !walletClient) {
+                throw new DynamicError('No public client available');
+            }
+            return createViemUiTransaction({ from, publicClient, walletClient });
+        });
+    }
 }
 
 export { ZeroDevConnector };

package/src/index.cjs

@@ -6,6 +6,12 @@ var ZeroDevConnector = require('./ZeroDevConnector.cjs');
 var ethereumAa = require('./ethereum-aa.cjs');
 var isZeroDevConnector = require('./utils/isZeroDevConnector.cjs');
 
+const ZeroDevSmartWalletConnectorsWithConfig = ({ bundlerProvider, } = {}) => {
+    if (bundlerProvider) {
+        ZeroDevConnector.ZeroDevConnector.bundlerProvider = bundlerProvider;
+    }
+    return ZeroDevSmartWalletConnectors;
+};
 const ZeroDevSmartWalletConnectors = (props) => {
     var _a;
     if ((_a = props.apiProviders) === null || _a === void 0 ? void 0 : _a.zerodev) {
@@ -17,3 +23,4 @@ const ZeroDevSmartWalletConnectors = (props) => {
 exports.EthereumAaConnector = ethereumAa.EthereumAaConnector;
 exports.isZeroDevConnector = isZeroDevConnector.isZeroDevConnector;
 exports.ZeroDevSmartWalletConnectors = ZeroDevSmartWalletConnectors;
+exports.ZeroDevSmartWalletConnectorsWithConfig = ZeroDevSmartWalletConnectorsWithConfig;

package/src/index.d.ts

@@ -1,4 +1,8 @@
+import { Provider as BundlerProvider } from '@zerodev/presets';
 import { WalletConnectorConstructor } from '@dynamic-labs/wallet-connector-core';
 export * from './ethereum-aa';
 export { isZeroDevConnector } from './utils/isZeroDevConnector';
+export declare const ZeroDevSmartWalletConnectorsWithConfig: ({ bundlerProvider, }?: {
+    bundlerProvider?: BundlerProvider | undefined;
+}) => (props: any) => WalletConnectorConstructor[];
 export declare const ZeroDevSmartWalletConnectors: (props: any) => WalletConnectorConstructor[];