@dynamic-labs/ethereum-aa 3.0.0-alpha.8 → 3.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/ethereum-aa",
-  "version": "3.0.0-alpha.8",
+  "version": "3.0.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/dynamic-labs/dynamic-auth.git",
@@ -26,17 +26,17 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@dynamic-labs/sdk-api-core": "0.0.470",
-    "@zerodev/ecdsa-validator": "5.2.3",
-    "@zerodev/sdk": "5.2.8",
-    "permissionless": "0.1.20",
-    "@dynamic-labs/ethereum": "3.0.0-alpha.8",
-    "@dynamic-labs/logger": "3.0.0-alpha.8",
-    "@dynamic-labs/types": "3.0.0-alpha.8",
-    "@dynamic-labs/utils": "3.0.0-alpha.8",
-    "@dynamic-labs/viem-utils": "3.0.0-alpha.8",
-    "@dynamic-labs/wallet-book": "3.0.0-alpha.8",
-    "@dynamic-labs/wallet-connector-core": "3.0.0-alpha.8"
+    "@dynamic-labs/sdk-api-core": "0.0.529",
+    "@zerodev/ecdsa-validator": "5.3.1",
+    "@zerodev/multi-chain-validator": "5.3.3",
+    "@zerodev/sdk": "5.3.4",
+    "permissionless": "^0.1.20",
+    "@dynamic-labs/ethereum-core": "3.0.0",
+    "@dynamic-labs/logger": "3.0.0",
+    "@dynamic-labs/types": "3.0.0",
+    "@dynamic-labs/utils": "3.0.0",
+    "@dynamic-labs/wallet-book": "3.0.0",
+    "@dynamic-labs/wallet-connector-core": "3.0.0"
   },
   "peerDependencies": {
     "viem": "^2.7.6"

package/src/ZeroDevConnector.cjs

@@ -4,21 +4,24 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../_virtual/_tslib.cjs');
+var multiChainValidator = require('@zerodev/multi-chain-validator');
 var viem = require('viem');
 var utils$1 = require('permissionless/utils');
+var constants = require('@zerodev/sdk/constants');
+var ecdsaValidator = require('@zerodev/ecdsa-validator');
 var sdkApiCore = require('@dynamic-labs/sdk-api-core');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
-var viemUtils = require('@dynamic-labs/viem-utils');
+var ethereumCore = require('@dynamic-labs/ethereum-core');
 var utils = require('@dynamic-labs/utils');
-var ethereum = require('@dynamic-labs/ethereum');
 var fetchChain = require('./utils/fetchChain.cjs');
 var logger = require('./utils/logger.cjs');
 var createEcsdaKernelAccountClient = require('./utils/createEcsdaKernelAccountClient.cjs');
 
 class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
     constructor(opts) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         super(opts);
+        this.ChainWallet = ethereumCore.EthereumWallet;
         this.connectedChain = 'EVM';
         this.supportedChains = ['ETH', 'EVM'];
         this.isGasSponsorshipDisabled = false;
@@ -39,16 +42,64 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
         this.projectId = zeroDevProjectId;
         this._walletUiUtils = opts.walletUiUtils;
         this.evmNetworks = utils.parseEvmNetworks(opts.evmNetworks);
-        this.entryPoint =
-            ((_b = opts.apiProviders.zerodev) === null || _b === void 0 ? void 0 : _b.entryPointVersion) ===
-                sdkApiCore.ProviderEntryPointVersionEnum.V6
-                ? utils$1.ENTRYPOINT_ADDRESS_V06
-                : utils$1.ENTRYPOINT_ADDRESS_V07;
+        this.entryPoint = this.getEntryPoint((_b = opts.apiProviders.zerodev) === null || _b === void 0 ? void 0 : _b.entryPointVersion);
+        this.kernelVersion = this.getKernelVersion((_c = opts.apiProviders.zerodev) === null || _c === void 0 ? void 0 : _c.kernelVersion);
+        this.ecdsaProviderType = (_d = opts.apiProviders.zerodev) === null || _d === void 0 ? void 0 : _d.ecdsaProviderType;
     }
+    getEntryPoint(entryPoint) {
+        if (entryPoint === undefined ||
+            entryPoint === sdkApiCore.ProviderEntryPointVersionEnum.V7) {
+            return utils$1.ENTRYPOINT_ADDRESS_V07;
+        }
+        else if (entryPoint === sdkApiCore.ProviderEntryPointVersionEnum.V6) {
+            return utils$1.ENTRYPOINT_ADDRESS_V06;
+        }
+        else {
+            logger.logger.error('Invalid entry point version', entryPoint);
+            return utils$1.ENTRYPOINT_ADDRESS_V07;
+        }
+    }
+    getKernelVersion(kernelVersion) {
+        if (kernelVersion === sdkApiCore.ProviderKernelVersionEnum.V31 ||
+            (kernelVersion === undefined &&
+                this.entryPoint === utils$1.ENTRYPOINT_ADDRESS_V07)) {
+            return constants.KERNEL_V3_1;
+        }
+        else if (kernelVersion === sdkApiCore.ProviderKernelVersionEnum.V30) {
+            return constants.KERNEL_V3_0;
+        }
+        else if (kernelVersion === sdkApiCore.ProviderKernelVersionEnum.V24 ||
+            this.entryPoint === utils$1.ENTRYPOINT_ADDRESS_V06 // v0.6 only supports v2.4
+        ) {
+            return constants.KERNEL_V2_4;
+        }
+        else {
+            logger.logger.error('Invalid kernel version', kernelVersion);
+            return constants.KERNEL_V3_1;
+        }
+    }
+    getEcdsaValidator(ecdsaProviderType) {
+        if (ecdsaProviderType === 'zerodev_signer_to_ecdsa') {
+            return ecdsaValidator.signerToEcdsaValidator;
+        }
+        else if (ecdsaProviderType === 'zerodev_multi_chain') {
+            return multiChainValidator.toMultiChainECDSAValidator;
+        }
+        else {
+            return ecdsaValidator.signerToEcdsaValidator;
+        }
+    }
+    /**
+     * @deprecated You should get the EOA connector by passing the SCW to getEOAConnector,
+     * from the useSmartWallet hook
+     */
     getEOAConnector() {
         return this.eoaConnector;
     }
-    getAccountAbstractionProvider() {
+    getAccountAbstractionProvider({ withSponsorship, } = {}) {
+        if (withSponsorship && this.kernelClientWithSponsorship) {
+            return this.kernelClientWithSponsorship;
+        }
         return this.kernelClient;
     }
     endSession() {
@@ -64,7 +115,7 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
             }
             this.kernelClientDeferredPromise = new utils.DeferredPromise();
             this.eoaConnector = connector;
-            if (ethereum.isEthWalletConnector(this.eoaConnector) &&
+            if (ethereumCore.isEthWalletConnector(this.eoaConnector) &&
                 !this.eoaConnector.getActiveAccount()) {
                 yield this.eoaConnector.getConnectedAccounts();
             }
@@ -74,9 +125,13 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
                 return;
             }
             const kernelClient = yield createEcsdaKernelAccountClient.createEcdsaKernelAccountClient({
+                bundlerRpc: ZeroDevConnector.bundlerRpc,
                 chain: yield fetchChain.fetchChain(this.projectId),
+                ecdsaValidator: this.getEcdsaValidator(this.ecdsaProviderType),
                 entryPointAddress: this.entryPoint,
+                kernelVersion: this.kernelVersion,
                 paymaster: 'NONE',
+                paymasterRpc: ZeroDevConnector.paymasterRpc,
                 projectId: this.projectId,
                 provider: ZeroDevConnector.bundlerProvider,
                 signer: utils$1.walletClientToSmartAccountSigner(signer),
@@ -86,6 +141,8 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
                 return original(...args);
             });
             this.kernelClient = kernelClient;
+            // set the provider with sponsorship enabled
+            yield this.getKernelClientWithSponsorshipValidation();
             yield this.checkIsProjectChainEnabled();
             this.kernelClientDeferredPromise.resolve();
         });
@@ -112,9 +169,13 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
                 throw new utils.DynamicError('No EOA connector');
             const signer = yield eoaConnector.getSigner();
             this.kernelClientWithSponsorship = yield createEcsdaKernelAccountClient.createEcdsaKernelAccountClient({
+                bundlerRpc: ZeroDevConnector.bundlerRpc,
                 chain: yield fetchChain.fetchChain(this.projectId),
+                ecdsaValidator: this.getEcdsaValidator(this.ecdsaProviderType),
                 entryPointAddress: this.entryPoint,
+                kernelVersion: this.kernelVersion,
                 paymaster: 'SPONSOR',
+                paymasterRpc: ZeroDevConnector.paymasterRpc,
                 projectId: this.projectId,
                 provider: ZeroDevConnector.bundlerProvider,
                 signer: utils$1.walletClientToSmartAccountSigner(signer),
@@ -150,7 +211,7 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
         });
     }
     getTransport(provider) {
-        const transport = viemUtils.confirmationTransport({
+        const transport = ethereumCore.confirmationTransport({
             getAccounts: () => _tslib.__awaiter(this, void 0, void 0, function* () { return [provider.account.address]; }),
             onPersonalSign: (_a) => _tslib.__awaiter(this, [_a], void 0, function* ({ message }) {
                 this._walletUiUtils.disabledConfirmationOnce();
@@ -165,7 +226,7 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
                     const effectiveProvider = this.isGasSponsorshipDisabled
                         ? provider
                         : yield this.getKernelClientWithSponsorshipValidation();
-                    const response = yield effectiveProvider.sendTransaction(viemUtils.unFormatTransaction(transaction));
+                    const response = yield effectiveProvider.sendTransaction(ethereumCore.unFormatTransaction(transaction));
                     return response;
                 }
                 catch (err) {
@@ -192,6 +253,7 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
             }),
             provider: provider.extend(viem.publicActions),
             transport: viem.custom(provider),
+            // TODO: remove this. We should not be passing references to wallet connectors
             walletConnector: this,
             walletUiUtils: this._walletUiUtils,
         });
@@ -206,7 +268,7 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
         const address = (_a = provider.account) === null || _a === void 0 ? void 0 : _a.address;
         const walletClient = viem.createWalletClient({
             account: address,
-            chain: chainId ? viemUtils.chainsMap[chainId] : provider.chain,
+            chain: chainId ? ethereumCore.chainsMap[chainId] : provider.chain,
             transport,
         });
         return walletClient;
@@ -259,38 +321,53 @@ class ZeroDevConnector extends walletConnectorCore.WalletConnectorBase {
     disableGasSponsorshipOnce() {
         this.isGasSponsorshipDisabled = true;
     }
-    getBalance() {
+    getBalance(address) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             var _a;
             const rpcClient = (_a = this.kernelClient) === null || _a === void 0 ? void 0 : _a.extend(viem.publicActions);
             if (!rpcClient)
                 throw new utils.DynamicError('No RPC client');
-            const address = yield this.getAddress();
-            if (!address)
-                return;
             return viem.formatEther(yield rpcClient.getBalance({ address: address }));
         });
     }
     signMessage(messageToSign) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            const client = yield this.getSigner();
-            const account = yield this.getAddress();
-            if (!account || !client)
-                return;
-            return client.signMessage({
-                account: account,
-                message: messageToSign,
-            });
+            const client = this === null || this === void 0 ? void 0 : this.kernelClient;
+            // https://docs.zerodev.app/sdk/core-api/sign-and-verify#signing-messages
+            if (!client)
+                throw new Error('Error fetching signer');
+            return client.signMessage({ message: messageToSign });
         });
     }
     createUiTransaction(from) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
+            yield this.validateActiveWallet(from);
             const walletClient = this.getWalletClient();
             const publicClient = yield this.getPublicClient();
             if (!publicClient || !walletClient) {
                 throw new utils.DynamicError('No public client available');
             }
-            return viemUtils.createViemUiTransaction({ from, publicClient, walletClient });
+            return ethereumCore.createViemUiTransaction({ from, publicClient, walletClient });
+        });
+    }
+    validateActiveWallet(expectedAddress) {
+        const _super = Object.create(null, {
+            validateActiveWallet: { get: () => super.validateActiveWallet }
+        });
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const eoaConnector = this === null || this === void 0 ? void 0 : this.eoaConnector;
+            if (eoaConnector && walletConnectorCore.isTurnkeyWalletConnector(eoaConnector)) {
+                const verifiedCredentials = eoaConnector === null || eoaConnector === void 0 ? void 0 : eoaConnector.verifiedCredentials;
+                const expectedEoaAddress = (_a = verifiedCredentials === null || verifiedCredentials === void 0 ? void 0 : verifiedCredentials.find((vc) => vc.smartWalletRefAddress === expectedAddress)) === null || _a === void 0 ? void 0 : _a.address;
+                if (!expectedEoaAddress) {
+                    throw new utils.DynamicError('No EOA connector');
+                }
+                yield (eoaConnector === null || eoaConnector === void 0 ? void 0 : eoaConnector.validateActiveWallet(expectedEoaAddress));
+            }
+            else {
+                yield _super.validateActiveWallet.call(this, expectedAddress);
+            }
         });
     }
 }

package/src/ZeroDevConnector.d.ts

@@ -1,10 +1,14 @@
 import { KernelAccountClient } from '@zerodev/sdk/clients';
 import { KernelSmartAccount } from '@zerodev/sdk/accounts';
+import { toMultiChainECDSAValidator } from '@zerodev/multi-chain-validator';
 import { Account, PublicClient, Transport, WalletClient } from 'viem';
 import { type Chain as ViemChain } from 'viem/chains';
 import { EntryPoint } from 'permissionless/types';
+import { KERNEL_VERSION_TYPE } from '@zerodev/sdk/types';
+import { signerToEcdsaValidator } from '@zerodev/ecdsa-validator';
 import { Provider, ProviderEnum } from '@dynamic-labs/sdk-api-core';
-import { Chain, IAccountAbstractionWalletConnector, ISendBalanceWalletConnector, WalletConnector, WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
+import { Chain, IAccountAbstractionWalletConnector, ISendBalanceWalletConnector, InternalWalletConnector, WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
+import { EthereumWallet } from '@dynamic-labs/ethereum-core';
 import { WalletBookSchema } from '@dynamic-labs/wallet-book';
 import { EvmNetwork, GenericNetwork, IUITransaction, WalletUiUtils } from '@dynamic-labs/types';
 import { BundlerProvider } from './utils';
@@ -14,22 +18,27 @@ type ZeroDevConnectorProps = {
     };
     evmNetworks: GenericNetwork[];
     walletBook: WalletBookSchema;
-    walletUiUtils: WalletUiUtils<WalletConnector>;
+    walletUiUtils: WalletUiUtils<InternalWalletConnector>;
     bundlerProvider: BundlerProvider | undefined;
 };
 type IZeroDevConnector = IAccountAbstractionWalletConnector & ISendBalanceWalletConnector;
-export declare class ZeroDevConnector extends WalletConnectorBase implements IZeroDevConnector {
+export declare class ZeroDevConnector extends WalletConnectorBase<typeof EthereumWallet> implements IZeroDevConnector {
     projectId: string;
     kernelClient: KernelAccountClient<EntryPoint, Transport, ViemChain, KernelSmartAccount<EntryPoint>> | undefined;
-    eoaConnector: WalletConnector | undefined;
-    private kernelClientWithSponsorship;
+    eoaConnector: InternalWalletConnector | undefined;
+    kernelClientWithSponsorship: KernelAccountClient<EntryPoint, Transport, ViemChain, KernelSmartAccount<EntryPoint>> | undefined;
+    ChainWallet: typeof EthereumWallet;
     connectedChain: Chain;
     supportedChains: Chain[];
     evmNetworks: EvmNetwork[];
     private isGasSponsorshipDisabled;
     isEmbeddedWallet: boolean;
-    private entryPoint;
+    entryPoint: EntryPoint;
+    kernelVersion: KERNEL_VERSION_TYPE;
+    ecdsaProviderType: string | undefined;
     static bundlerProvider: BundlerProvider | undefined;
+    static bundlerRpc: string | undefined;
+    static paymasterRpc: 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.
@@ -47,10 +56,19 @@ export declare class ZeroDevConnector extends WalletConnectorBase implements IZe
     };
     private _walletUiUtils;
     constructor(opts: ZeroDevConnectorProps);
-    getEOAConnector(): WalletConnector | undefined;
-    getAccountAbstractionProvider(): KernelAccountClient<EntryPoint> | undefined;
+    getEntryPoint(entryPoint: string | undefined): "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789" | "0x0000000071727De22E5E9d8BAf0edAc6f37da032";
+    getKernelVersion(kernelVersion: string | undefined): KERNEL_VERSION_TYPE;
+    getEcdsaValidator(ecdsaProviderType: string | undefined): typeof signerToEcdsaValidator | typeof toMultiChainECDSAValidator;
+    /**
+     * @deprecated You should get the EOA connector by passing the SCW to getEOAConnector,
+     * from the useSmartWallet hook
+     */
+    getEOAConnector(): InternalWalletConnector | undefined;
+    getAccountAbstractionProvider({ withSponsorship, }?: {
+        withSponsorship?: boolean;
+    }): KernelAccountClient<EntryPoint> | undefined;
     endSession(): Promise<void>;
-    setEoaConnector(connector: WalletConnector): Promise<void>;
+    setEoaConnector(connector: InternalWalletConnector): Promise<void>;
     private checkIsProjectChainEnabled;
     private getKernelClientWithSponsorshipValidation;
     getAddress(): Promise<string | undefined>;
@@ -3099,8 +3117,9 @@ export declare class ZeroDevConnector extends WalletConnectorBase implements IZe
     } | undefined>;
     canSponsorTransactionGas(transaction: IUITransaction): Promise<boolean>;
     disableGasSponsorshipOnce(): void;
-    getBalance(): Promise<string | undefined>;
+    getBalance(address: string): Promise<string | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;
     createUiTransaction(from: string): Promise<IUITransaction>;
+    validateActiveWallet(expectedAddress: string): Promise<void>;
 }
 export {};

package/src/ZeroDevConnector.js

@@ -1,20 +1,23 @@
 'use client'
 import { __awaiter } from '../_virtual/_tslib.js';
+import { toMultiChainECDSAValidator } from '@zerodev/multi-chain-validator';
 import { publicActions, custom, createWalletClient, isHex, fromHex, formatEther } from 'viem';
-import { ENTRYPOINT_ADDRESS_V06, ENTRYPOINT_ADDRESS_V07, walletClientToSmartAccountSigner } from 'permissionless/utils';
-import { ProviderEntryPointVersionEnum } from '@dynamic-labs/sdk-api-core';
-import { WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
-import { confirmationTransport, chainsMap, unFormatTransaction, createViemUiTransaction } from '@dynamic-labs/viem-utils';
+import { ENTRYPOINT_ADDRESS_V07, ENTRYPOINT_ADDRESS_V06, walletClientToSmartAccountSigner } from 'permissionless/utils';
+import { KERNEL_V3_1, KERNEL_V3_0, KERNEL_V2_4 } from '@zerodev/sdk/constants';
+import { signerToEcdsaValidator } from '@zerodev/ecdsa-validator';
+import { ProviderEntryPointVersionEnum, ProviderKernelVersionEnum } from '@dynamic-labs/sdk-api-core';
+import { WalletConnectorBase, isTurnkeyWalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { EthereumWallet, confirmationTransport, chainsMap, isEthWalletConnector, unFormatTransaction, createViemUiTransaction } from '@dynamic-labs/ethereum-core';
 import { parseEvmNetworks, DynamicError, DeferredPromise, wrapMethodWithCallback, TransactionGasCannotBeSponsoredError, InsufficientFundsError } from '@dynamic-labs/utils';
-import { isEthWalletConnector } from '@dynamic-labs/ethereum';
 import { cachedChainIdKey, fetchChain } from './utils/fetchChain.js';
 import { logger } from './utils/logger.js';
 import { createEcdsaKernelAccountClient } from './utils/createEcsdaKernelAccountClient.js';
 
 class ZeroDevConnector extends WalletConnectorBase {
     constructor(opts) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         super(opts);
+        this.ChainWallet = EthereumWallet;
         this.connectedChain = 'EVM';
         this.supportedChains = ['ETH', 'EVM'];
         this.isGasSponsorshipDisabled = false;
@@ -35,16 +38,64 @@ class ZeroDevConnector extends WalletConnectorBase {
         this.projectId = zeroDevProjectId;
         this._walletUiUtils = opts.walletUiUtils;
         this.evmNetworks = parseEvmNetworks(opts.evmNetworks);
-        this.entryPoint =
-            ((_b = opts.apiProviders.zerodev) === null || _b === void 0 ? void 0 : _b.entryPointVersion) ===
-                ProviderEntryPointVersionEnum.V6
-                ? ENTRYPOINT_ADDRESS_V06
-                : ENTRYPOINT_ADDRESS_V07;
+        this.entryPoint = this.getEntryPoint((_b = opts.apiProviders.zerodev) === null || _b === void 0 ? void 0 : _b.entryPointVersion);
+        this.kernelVersion = this.getKernelVersion((_c = opts.apiProviders.zerodev) === null || _c === void 0 ? void 0 : _c.kernelVersion);
+        this.ecdsaProviderType = (_d = opts.apiProviders.zerodev) === null || _d === void 0 ? void 0 : _d.ecdsaProviderType;
     }
+    getEntryPoint(entryPoint) {
+        if (entryPoint === undefined ||
+            entryPoint === ProviderEntryPointVersionEnum.V7) {
+            return ENTRYPOINT_ADDRESS_V07;
+        }
+        else if (entryPoint === ProviderEntryPointVersionEnum.V6) {
+            return ENTRYPOINT_ADDRESS_V06;
+        }
+        else {
+            logger.error('Invalid entry point version', entryPoint);
+            return ENTRYPOINT_ADDRESS_V07;
+        }
+    }
+    getKernelVersion(kernelVersion) {
+        if (kernelVersion === ProviderKernelVersionEnum.V31 ||
+            (kernelVersion === undefined &&
+                this.entryPoint === ENTRYPOINT_ADDRESS_V07)) {
+            return KERNEL_V3_1;
+        }
+        else if (kernelVersion === ProviderKernelVersionEnum.V30) {
+            return KERNEL_V3_0;
+        }
+        else if (kernelVersion === ProviderKernelVersionEnum.V24 ||
+            this.entryPoint === ENTRYPOINT_ADDRESS_V06 // v0.6 only supports v2.4
+        ) {
+            return KERNEL_V2_4;
+        }
+        else {
+            logger.error('Invalid kernel version', kernelVersion);
+            return KERNEL_V3_1;
+        }
+    }
+    getEcdsaValidator(ecdsaProviderType) {
+        if (ecdsaProviderType === 'zerodev_signer_to_ecdsa') {
+            return signerToEcdsaValidator;
+        }
+        else if (ecdsaProviderType === 'zerodev_multi_chain') {
+            return toMultiChainECDSAValidator;
+        }
+        else {
+            return signerToEcdsaValidator;
+        }
+    }
+    /**
+     * @deprecated You should get the EOA connector by passing the SCW to getEOAConnector,
+     * from the useSmartWallet hook
+     */
     getEOAConnector() {
         return this.eoaConnector;
     }
-    getAccountAbstractionProvider() {
+    getAccountAbstractionProvider({ withSponsorship, } = {}) {
+        if (withSponsorship && this.kernelClientWithSponsorship) {
+            return this.kernelClientWithSponsorship;
+        }
         return this.kernelClient;
     }
     endSession() {
@@ -70,9 +121,13 @@ class ZeroDevConnector extends WalletConnectorBase {
                 return;
             }
             const kernelClient = yield createEcdsaKernelAccountClient({
+                bundlerRpc: ZeroDevConnector.bundlerRpc,
                 chain: yield fetchChain(this.projectId),
+                ecdsaValidator: this.getEcdsaValidator(this.ecdsaProviderType),
                 entryPointAddress: this.entryPoint,
+                kernelVersion: this.kernelVersion,
                 paymaster: 'NONE',
+                paymasterRpc: ZeroDevConnector.paymasterRpc,
                 projectId: this.projectId,
                 provider: ZeroDevConnector.bundlerProvider,
                 signer: walletClientToSmartAccountSigner(signer),
@@ -82,6 +137,8 @@ class ZeroDevConnector extends WalletConnectorBase {
                 return original(...args);
             });
             this.kernelClient = kernelClient;
+            // set the provider with sponsorship enabled
+            yield this.getKernelClientWithSponsorshipValidation();
             yield this.checkIsProjectChainEnabled();
             this.kernelClientDeferredPromise.resolve();
         });
@@ -108,9 +165,13 @@ class ZeroDevConnector extends WalletConnectorBase {
                 throw new DynamicError('No EOA connector');
             const signer = yield eoaConnector.getSigner();
             this.kernelClientWithSponsorship = yield createEcdsaKernelAccountClient({
+                bundlerRpc: ZeroDevConnector.bundlerRpc,
                 chain: yield fetchChain(this.projectId),
+                ecdsaValidator: this.getEcdsaValidator(this.ecdsaProviderType),
                 entryPointAddress: this.entryPoint,
+                kernelVersion: this.kernelVersion,
                 paymaster: 'SPONSOR',
+                paymasterRpc: ZeroDevConnector.paymasterRpc,
                 projectId: this.projectId,
                 provider: ZeroDevConnector.bundlerProvider,
                 signer: walletClientToSmartAccountSigner(signer),
@@ -188,6 +249,7 @@ class ZeroDevConnector extends WalletConnectorBase {
             }),
             provider: provider.extend(publicActions),
             transport: custom(provider),
+            // TODO: remove this. We should not be passing references to wallet connectors
             walletConnector: this,
             walletUiUtils: this._walletUiUtils,
         });
@@ -255,32 +317,27 @@ class ZeroDevConnector extends WalletConnectorBase {
     disableGasSponsorshipOnce() {
         this.isGasSponsorshipDisabled = true;
     }
-    getBalance() {
+    getBalance(address) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
             const rpcClient = (_a = this.kernelClient) === null || _a === void 0 ? void 0 : _a.extend(publicActions);
             if (!rpcClient)
                 throw new DynamicError('No RPC client');
-            const address = yield this.getAddress();
-            if (!address)
-                return;
             return formatEther(yield rpcClient.getBalance({ address: address }));
         });
     }
     signMessage(messageToSign) {
         return __awaiter(this, void 0, void 0, function* () {
-            const client = yield this.getSigner();
-            const account = yield this.getAddress();
-            if (!account || !client)
-                return;
-            return client.signMessage({
-                account: account,
-                message: messageToSign,
-            });
+            const client = this === null || this === void 0 ? void 0 : this.kernelClient;
+            // https://docs.zerodev.app/sdk/core-api/sign-and-verify#signing-messages
+            if (!client)
+                throw new Error('Error fetching signer');
+            return client.signMessage({ message: messageToSign });
         });
     }
     createUiTransaction(from) {
         return __awaiter(this, void 0, void 0, function* () {
+            yield this.validateActiveWallet(from);
             const walletClient = this.getWalletClient();
             const publicClient = yield this.getPublicClient();
             if (!publicClient || !walletClient) {
@@ -289,6 +346,26 @@ class ZeroDevConnector extends WalletConnectorBase {
             return createViemUiTransaction({ from, publicClient, walletClient });
         });
     }
+    validateActiveWallet(expectedAddress) {
+        const _super = Object.create(null, {
+            validateActiveWallet: { get: () => super.validateActiveWallet }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const eoaConnector = this === null || this === void 0 ? void 0 : this.eoaConnector;
+            if (eoaConnector && isTurnkeyWalletConnector(eoaConnector)) {
+                const verifiedCredentials = eoaConnector === null || eoaConnector === void 0 ? void 0 : eoaConnector.verifiedCredentials;
+                const expectedEoaAddress = (_a = verifiedCredentials === null || verifiedCredentials === void 0 ? void 0 : verifiedCredentials.find((vc) => vc.smartWalletRefAddress === expectedAddress)) === null || _a === void 0 ? void 0 : _a.address;
+                if (!expectedEoaAddress) {
+                    throw new DynamicError('No EOA connector');
+                }
+                yield (eoaConnector === null || eoaConnector === void 0 ? void 0 : eoaConnector.validateActiveWallet(expectedEoaAddress));
+            }
+            else {
+                yield _super.validateActiveWallet.call(this, expectedAddress);
+            }
+        });
+    }
 }
 
 export { ZeroDevConnector };

package/src/index.cjs

@@ -7,10 +7,10 @@ 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;
-    }
+const ZeroDevSmartWalletConnectorsWithConfig = ({ bundlerProvider, bundlerRpc, paymasterRpc, } = {}) => {
+    ZeroDevConnector.ZeroDevConnector.bundlerProvider = bundlerProvider;
+    ZeroDevConnector.ZeroDevConnector.bundlerRpc = bundlerRpc;
+    ZeroDevConnector.ZeroDevConnector.paymasterRpc = paymasterRpc;
     return ZeroDevSmartWalletConnectors;
 };
 const ZeroDevSmartWalletConnectors = (props) => {

package/src/index.d.ts

@@ -2,7 +2,9 @@ import { WalletConnectorConstructor } from '@dynamic-labs/wallet-connector-core'
 import { BundlerProvider } from './utils';
 export * from './ethereum-aa';
 export { isZeroDevConnector } from './utils/isZeroDevConnector';
-export declare const ZeroDevSmartWalletConnectorsWithConfig: ({ bundlerProvider, }?: {
+export declare const ZeroDevSmartWalletConnectorsWithConfig: ({ bundlerProvider, bundlerRpc, paymasterRpc, }?: {
     bundlerProvider?: BundlerProvider;
+    bundlerRpc?: string;
+    paymasterRpc?: string;
 }) => (props: any) => WalletConnectorConstructor[];
 export declare const ZeroDevSmartWalletConnectors: (props: any) => WalletConnectorConstructor[];

package/src/index.js

@@ -3,10 +3,10 @@ import { ZeroDevConnector } from './ZeroDevConnector.js';
 export { EthereumAaConnector } from './ethereum-aa.js';
 export { isZeroDevConnector } from './utils/isZeroDevConnector.js';
 
-const ZeroDevSmartWalletConnectorsWithConfig = ({ bundlerProvider, } = {}) => {
-    if (bundlerProvider) {
-        ZeroDevConnector.bundlerProvider = bundlerProvider;
-    }
+const ZeroDevSmartWalletConnectorsWithConfig = ({ bundlerProvider, bundlerRpc, paymasterRpc, } = {}) => {
+    ZeroDevConnector.bundlerProvider = bundlerProvider;
+    ZeroDevConnector.bundlerRpc = bundlerRpc;
+    ZeroDevConnector.paymasterRpc = paymasterRpc;
     return ZeroDevSmartWalletConnectors;
 };
 const ZeroDevSmartWalletConnectors = (props) => {