@dynamic-labs/ethereum-aa 4.10.4-preview.1 → 4.10.4-preview.2

package/CHANGELOG.md

@@ -1,4 +1,18 @@
 
+### [4.10.4-preview.2](https://github.com/dynamic-labs/dynamic-auth/compare/v4.10.4...v4.10.4-preview.2) (2025-04-09)
+
+
+### Features
+
+* add session key client ([#8463](https://github.com/dynamic-labs/dynamic-auth/issues/8463)) ([d08019c](https://github.com/dynamic-labs/dynamic-auth/commit/d08019ccf82bfc75b26a24170bfa6086d80df69a))
+* add zk sync aa connector ([baf6241](https://github.com/dynamic-labs/dynamic-auth/commit/baf6241119dde2c3ce6c4ae3ac5467d50e1b3953))
+
+
+### Bug Fixes
+
+* **QNTM-3113:** fix network switcher fallback logic ([#8478](https://github.com/dynamic-labs/dynamic-auth/issues/8478)) ([173c4f7](https://github.com/dynamic-labs/dynamic-auth/commit/173c4f7a66e130dd8d5f9726596807489609bf14))
+* retrieval of walletclient for zksync connector ([0707bc3](https://github.com/dynamic-labs/dynamic-auth/commit/0707bc39049c54bf5fe10953faf5486bcf317f20))
+
 ### [4.10.4-preview.1](https://github.com/dynamic-labs/dynamic-auth/compare/v4.10.4...v4.10.4-preview.1) (2025-04-08)
 
 

package/package.cjs

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

package/package.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/ethereum-aa",
-  "version": "4.10.4-preview.1",
+  "version": "4.10.4-preview.2",
   "description": "A React SDK for implementing wallet web3 authentication and authorization to your website.",
   "author": "Dynamic Labs, Inc.",
   "license": "MIT",
@@ -22,15 +22,14 @@
     "@zerodev/ecdsa-validator": "5.4.4",
     "@zerodev/multi-chain-ecdsa-validator": "5.4.3",
     "@zerodev/sdk": "5.4.26",
-    "abitype": "1.0.2",
-    "zksync-sso": "0.0.0-beta.12",
-    "@dynamic-labs/assert-package-version": "4.10.4-preview.1",
-    "@dynamic-labs/ethereum-core": "4.10.4-preview.1",
-    "@dynamic-labs/logger": "4.10.4-preview.1",
-    "@dynamic-labs/types": "4.10.4-preview.1",
-    "@dynamic-labs/utils": "4.10.4-preview.1",
-    "@dynamic-labs/wallet-book": "4.10.4-preview.1",
-    "@dynamic-labs/wallet-connector-core": "4.10.4-preview.1"
+    "zksync-sso": "0.0.0-beta.14",
+    "@dynamic-labs/assert-package-version": "4.10.4-preview.2",
+    "@dynamic-labs/ethereum-core": "4.10.4-preview.2",
+    "@dynamic-labs/logger": "4.10.4-preview.2",
+    "@dynamic-labs/types": "4.10.4-preview.2",
+    "@dynamic-labs/utils": "4.10.4-preview.2",
+    "@dynamic-labs/wallet-book": "4.10.4-preview.2",
+    "@dynamic-labs/wallet-connector-core": "4.10.4-preview.2"
   },
   "peerDependencies": {
     "viem": "^2.21.55"

package/src/ZKsyncConnector.cjs

@@ -8,13 +8,12 @@ var viem = require('viem');
 var zksync = require('viem/zksync');
 var passkey = require('zksync-sso/client/passkey');
 var utils$1 = require('zksync-sso/utils');
-var client$1 = require('zksync-sso/client');
+var client = require('zksync-sso/client');
+var ecdsa = require('zksync-sso/client/ecdsa');
 var ethereumCore = require('@dynamic-labs/ethereum-core');
 var utils = require('@dynamic-labs/utils');
 var AccountAbstractionConnector = require('./AccountAbstractionConnector.cjs');
 var abi = require('./utils/abi.cjs');
-var client = require('./ZKsync/client.cjs');
-var walletActions = require('./ZKsync/walletActions.cjs');
 
 class ZKsyncConnector extends AccountAbstractionConnector.AccountAbstractionConnector {
     constructor(props) {
@@ -88,12 +87,67 @@ class ZKsyncConnector extends AccountAbstractionConnector.AccountAbstractionConn
     getAccountAbstractionProvider() {
         return this.smartAccount;
     }
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     getWalletClient() {
-        if (!this.smartAccount) {
+        const smartAccountClient = this.smartAccount;
+        if (!smartAccountClient) {
             return undefined;
         }
-        return this.smartAccount;
+        const transport = this.getWalletClientTransport(smartAccountClient);
+        return viem.createWalletClient({
+            account: smartAccountClient.account,
+            chain: smartAccountClient.chain,
+            transport,
+        });
+    }
+    getWalletClientTransport(smartAccountClient) {
+        return viem.custom({
+            request: (_a) => _tslib.__awaiter(this, [_a], void 0, function* ({ method, params, }) {
+                const handleRequest = () => _tslib.__awaiter(this, void 0, void 0, function* () {
+                    var _b;
+                    switch (method) {
+                        case 'personal_sign':
+                            // Delegate signing to the smart account client instance
+                            return smartAccountClient.signMessage({ message: params[0] });
+                        case 'eth_signTypedData_v4': {
+                            // Delegate typed data signing to the smart account client instance
+                            // Note: ZKsync usually expects JSON string for EIP712, but viem standard passes object.
+                            // The smartAccountClient's signTypedData should handle the expected format internally.
+                            const signTypedDataParams = params[1]; // Assuming standard viem format
+                            return smartAccountClient.signTypedData(signTypedDataParams);
+                        }
+                        case 'eth_sendTransaction':
+                            // Delegate transaction sending to the smart account client instance.
+                            // This ensures deployment checks, paymaster logic, etc., are handled.
+                            return smartAccountClient.sendTransaction(params[0]);
+                        case 'eth_accounts':
+                        case 'eth_requestAccounts':
+                            // Return the smart account address
+                            return ((_b = smartAccountClient.account) === null || _b === void 0 ? void 0 : _b.address)
+                                ? [smartAccountClient.account.address]
+                                : [];
+                        case 'eth_chainId': {
+                            // Return chainId from the smart account client
+                            const chainId = yield smartAccountClient.getChainId();
+                            return viem.toHex(chainId);
+                        }
+                        default: {
+                            // For other read-only methods, delegate to a basic public client transport.
+                            // Avoid creating a new client/transport on every call if possible,
+                            // but for simplicity here, we create it transiently.
+                            // Consider caching this public client if performance becomes an issue.
+                            const publicClient = viem.createPublicClient({
+                                chain: smartAccountClient.chain,
+                                transport: viem.http(undefined, this.providersConfig.httpTransportConfig), // Use configured transport if available
+                            });
+                            return publicClient.request({ method, params });
+                        }
+                    }
+                });
+                // The internal confirmationTransport used by smartAccountClient via its 'owner'
+                // should handle the UI prompts. We don't need to add extra prompts here.
+                return handleRequest();
+            }),
+        });
     }
     getTransport(provider) {
         const transport = ethereumCore.confirmationTransport({
@@ -147,7 +201,7 @@ class ZKsyncConnector extends AccountAbstractionConnector.AccountAbstractionConn
             }
             const transport = this.getTransport(eoaSigner);
             const ownerWithTransport = viem.createWalletClient(Object.assign(Object.assign({}, eoaSigner), { transport }));
-            const walletClient = yield client.createZksyncEcdsaClient({
+            const walletClient = yield ecdsa.createZksyncEcdsaClient({
                 address: this.smartAccountAddress,
                 chain: ethereumCore.getOrMapViemChain(this.evmNetworks[0]),
                 contracts: {
@@ -155,7 +209,7 @@ class ZKsyncConnector extends AccountAbstractionConnector.AccountAbstractionConn
                     session: this.sessionKeyAddress,
                 },
                 owner: ownerWithTransport,
-                transport: viem.http(),
+                transport: viem.custom(ownerWithTransport),
             });
             return walletClient;
         });
@@ -183,7 +237,7 @@ class ZKsyncConnector extends AccountAbstractionConnector.AccountAbstractionConn
             if (!this.smartAccountAddress) {
                 throw new Error('Smart account address is not initialized');
             }
-            return client$1.createZksyncSessionClient({
+            return client.createZksyncSessionClient({
                 address: this.smartAccountAddress,
                 chain: ethereumCore.getOrMapViemChain(this.evmNetworks[0]),
                 contracts: {
@@ -334,7 +388,7 @@ class ZKsyncConnector extends AccountAbstractionConnector.AccountAbstractionConn
                 .extend(viem.publicActions)
                 .extend(viem.walletActions)
                 .extend(zksync.eip712WalletActions())
-                .extend(walletActions.zksyncSsoEcdsaWalletActions);
+                .extend(ecdsa.zksyncSsoEcdsaWalletActions);
         });
     }
     /**

package/src/ZKsyncConnector.d.ts

@@ -1,14 +1,14 @@
-import { Account, RpcSchema, SignTypedDataParameters, Transport, type PublicClient, type Chain as ViemChain, type WalletClient } from 'viem';
+import { Account, CustomTransport, RpcSchema, SignTypedDataParameters, Transport, type PublicClient, type Chain as ViemChain, type WalletClient } from 'viem';
 import { ZksyncSsoPasskeyClient } from 'zksync-sso/client/passkey';
 import { SessionConfig } from 'zksync-sso/utils';
 import { ZksyncSsoSessionClient } from 'zksync-sso/client';
+import { ZksyncSsoEcdsaClient } from 'zksync-sso/client/ecdsa';
 import { EthereumWallet, RegisterEvmProvidersConfig } from '@dynamic-labs/ethereum-core';
 import { ProjectSettings, Provider, ProviderEnum } from '@dynamic-labs/sdk-api-core';
 import { EvmNetwork, GenericNetwork, IUITransaction, WalletUiUtils } from '@dynamic-labs/types';
 import { WalletBookSchema } from '@dynamic-labs/wallet-book';
 import { Chain, InternalWalletConnector, IZKsyncConnector, WalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { AccountAbstractionConnector, AccountAbstractionConnectorProps } from './AccountAbstractionConnector';
-import { ZksyncSsoEcdsaClient } from './ZKsync/client';
 type ZKsyncConnectorProps = AccountAbstractionConnectorProps & {
     apiProviders: {
         [key in ProviderEnum]?: Provider;
@@ -67,6 +67,7 @@ export declare class ZKsyncConnector extends AccountAbstractionConnector impleme
     canSponsorTransactionGas(): Promise<boolean>;
     getAccountAbstractionProvider<T = ZksyncSsoEcdsaClient<Transport, ViemChain, RpcSchema>>(): T;
     getWalletClient(): WalletClient | undefined;
+    private getWalletClientTransport;
     private getTransport;
     getSigner(): Promise<{
         account: Account | undefined;
@@ -8077,10 +8078,7 @@ export declare class ZKsyncConnector extends AccountAbstractionConnector impleme
             Parameters: import("viem").WatchAssetParams;
             ReturnType: boolean;
         }]>;
-        transport: import("viem").TransportConfig<"http", import("viem").EIP1193RequestFn> & {
-            fetchOptions?: Omit<RequestInit, "body"> | undefined;
-            url?: string | undefined;
-        };
+        transport: import("viem").TransportConfig<"custom", import("viem").EIP1193RequestFn>;
         type: string;
         uid: string;
         call: (parameters: import("viem").CallParameters<{
@@ -22447,7 +22445,7 @@ export declare class ZKsyncConnector extends AccountAbstractionConnector impleme
             testnet?: boolean | undefined;
         } & import("viem").ChainConfig<import("viem").ChainFormatters | undefined, Record<string, unknown> | undefined>>) => Promise<import("viem").TransactionReceipt>;
         watchBlockNumber: (args: import("viem").WatchBlockNumberParameters) => import("viem").WatchBlockNumberReturnType;
-        watchBlocks: <includeTransactions_1 extends boolean = false, blockTag_2 extends import("viem").BlockTag = "latest">(args: import("viem").WatchBlocksParameters<import("viem").HttpTransport, {
+        watchBlocks: <includeTransactions_1 extends boolean = false, blockTag_2 extends import("viem").BlockTag = "latest">(args: import("viem").WatchBlocksParameters<CustomTransport, {
             blockExplorers?: {
                 [key: string]: {
                     name: string;
@@ -22489,9 +22487,9 @@ export declare class ZKsyncConnector extends AccountAbstractionConnector impleme
             sourceId?: number | undefined;
             testnet?: boolean | undefined;
         } & import("viem").ChainConfig<import("viem").ChainFormatters | undefined, Record<string, unknown> | undefined>, includeTransactions_1, blockTag_2>) => import("viem").WatchBlocksReturnType;
-        watchContractEvent: <const abi_7 extends import("viem").Abi | readonly unknown[], eventName_4 extends import("viem").ContractEventName<abi_7>, strict_6 extends boolean | undefined = undefined>(args: import("viem").WatchContractEventParameters<abi_7, eventName_4, strict_6, import("viem").HttpTransport>) => import("viem").WatchContractEventReturnType;
-        watchEvent: <const abiEvent_2 extends import("viem").AbiEvent | undefined = undefined, const abiEvents_2 extends readonly unknown[] | readonly import("viem").AbiEvent[] | undefined = abiEvent_2 extends import("viem").AbiEvent ? [abiEvent_2] : undefined, strict_7 extends boolean | undefined = undefined>(args: import("viem").WatchEventParameters<abiEvent_2, abiEvents_2, strict_7, import("viem").HttpTransport>) => import("viem").WatchEventReturnType;
-        watchPendingTransactions: (args: import("viem").WatchPendingTransactionsParameters<import("viem").HttpTransport>) => import("viem").WatchPendingTransactionsReturnType;
+        watchContractEvent: <const abi_7 extends import("viem").Abi | readonly unknown[], eventName_4 extends import("viem").ContractEventName<abi_7>, strict_6 extends boolean | undefined = undefined>(args: import("viem").WatchContractEventParameters<abi_7, eventName_4, strict_6, CustomTransport>) => import("viem").WatchContractEventReturnType;
+        watchEvent: <const abiEvent_2 extends import("viem").AbiEvent | undefined = undefined, const abiEvents_2 extends readonly unknown[] | readonly import("viem").AbiEvent[] | undefined = abiEvent_2 extends import("viem").AbiEvent ? [abiEvent_2] : undefined, strict_7 extends boolean | undefined = undefined>(args: import("viem").WatchEventParameters<abiEvent_2, abiEvents_2, strict_7, CustomTransport>) => import("viem").WatchEventReturnType;
+        watchPendingTransactions: (args: import("viem").WatchPendingTransactionsParameters<CustomTransport>) => import("viem").WatchPendingTransactionsReturnType;
         addChain: (args: import("viem").AddChainParameters) => Promise<void>;
         deployContract: <const abi_8 extends import("viem").Abi | readonly unknown[], chainOverride_5 extends ViemChain | undefined>(args: import("viem").DeployContractParameters<abi_8, {
             blockExplorers?: {
@@ -23893,8 +23891,8 @@ export declare class ZKsyncConnector extends AccountAbstractionConnector impleme
             sourceId?: number | undefined;
             testnet?: boolean | undefined;
         } & import("viem").ChainConfig<import("viem").ChainFormatters | undefined, Record<string, unknown> | undefined>, Account, chainOverride_8>) => Promise<`0x${string}`>;
-        createSession: (args: Omit<import("./ZKsync/session").CreateSessionArgs, "contracts">) => Promise<import("./ZKsync/session").CreateSessionReturnType>;
-        revokeSession: (args: Omit<import("./ZKsync/session").RevokeSessionArgs, "contracts">) => Promise<import("./ZKsync/session").RevokeSessionReturnType>;
+        createSession: (args: Omit<import("node_modules/zksync-sso/dist/_types/client/session/actions/session").CreateSessionArgs, "contracts">) => Promise<import("node_modules/zksync-sso/dist/_types/client/session/actions/session").CreateSessionReturnType>;
+        revokeSession: (args: Omit<import("node_modules/zksync-sso/dist/_types/client/session/actions/session").RevokeSessionArgs, "contracts">) => Promise<import("node_modules/zksync-sso/dist/_types/client/session/actions/session").RevokeSessionReturnType>;
         extend: <const client extends {
             [x: string]: unknown;
             account?: undefined;
@@ -23909,7 +23907,7 @@ export declare class ZKsyncConnector extends AccountAbstractionConnector impleme
             transport?: undefined;
             type?: undefined;
             uid?: undefined;
-        } & import("viem").ExactPartial<Pick<import("viem").PublicActions<import("viem").HttpTransport, {
+        } & import("viem").ExactPartial<Pick<import("viem").PublicActions<CustomTransport, {
             blockExplorers?: {
                 [key: string]: {
                     name: string;
@@ -23991,7 +23989,7 @@ export declare class ZKsyncConnector extends AccountAbstractionConnector impleme
             };
             sourceId?: number | undefined;
             testnet?: boolean | undefined;
-        } & import("viem").ChainConfig<import("viem").ChainFormatters | undefined, Record<string, unknown> | undefined>, Account>, "sendTransaction" | "writeContract">>>(fn: (client: import("viem").Client<import("viem").HttpTransport, {
+        } & import("viem").ChainConfig<import("viem").ChainFormatters | undefined, Record<string, unknown> | undefined>, Account>, "sendTransaction" | "writeContract">>>(fn: (client: import("viem").Client<CustomTransport, {
             blockExplorers?: {
                 [key: string]: {
                     name: string;
@@ -24326,7 +24324,7 @@ export declare class ZKsyncConnector extends AccountAbstractionConnector impleme
             Method: "wallet_watchAsset";
             Parameters: import("viem").WatchAssetParams;
             ReturnType: boolean;
-        }], import("viem").PublicActions<import("viem").HttpTransport, {
+        }], import("viem").PublicActions<CustomTransport, {
             blockExplorers?: {
                 [key: string]: {
                     name: string;
@@ -24408,7 +24406,7 @@ export declare class ZKsyncConnector extends AccountAbstractionConnector impleme
             };
             sourceId?: number | undefined;
             testnet?: boolean | undefined;
-        } & import("viem").ChainConfig<import("viem").ChainFormatters | undefined, Record<string, unknown> | undefined>, Account> & import("./ZKsync/session").ZksyncSsoEcdsaActions>) => client) => import("viem").Client<import("viem").HttpTransport, {
+        } & import("viem").ChainConfig<import("viem").ChainFormatters | undefined, Record<string, unknown> | undefined>, Account> & import("zksync-sso/client/ecdsa").ZksyncSsoEcdsaActions>) => client) => import("viem").Client<CustomTransport, {
             blockExplorers?: {
                 [key: string]: {
                     name: string;
@@ -24743,7 +24741,7 @@ export declare class ZKsyncConnector extends AccountAbstractionConnector impleme
             Method: "wallet_watchAsset";
             Parameters: import("viem").WatchAssetParams;
             ReturnType: boolean;
-        }], { [K_3 in keyof client]: client[K_3]; } & import("viem").PublicActions<import("viem").HttpTransport, {
+        }], { [K_3 in keyof client]: client[K_3]; } & import("viem").PublicActions<CustomTransport, {
             blockExplorers?: {
                 [key: string]: {
                     name: string;
@@ -24825,8 +24823,8 @@ export declare class ZKsyncConnector extends AccountAbstractionConnector impleme
             };
             sourceId?: number | undefined;
             testnet?: boolean | undefined;
-        } & import("viem").ChainConfig<import("viem").ChainFormatters | undefined, Record<string, unknown> | undefined>, Account> & import("./ZKsync/session").ZksyncSsoEcdsaActions>;
-        contracts: import("./ZKsync/client").EcdsaRequiredContracts;
+        } & import("viem").ChainConfig<import("viem").ChainFormatters | undefined, Record<string, unknown> | undefined>, Account> & import("zksync-sso/client/ecdsa").ZksyncSsoEcdsaActions>;
+        contracts: import("zksync-sso/client/ecdsa").EcdsaRequiredContracts;
         paymasterHandler?: import("zksync-sso/paymaster").CustomPaymasterHandler | undefined;
     }>;
     /**

package/src/ZKsyncConnector.js

@@ -1,16 +1,15 @@
 'use client'
 import { __awaiter } from '../_virtual/_tslib.js';
-import { createPublicClient, http, publicActions, custom, createWalletClient, walletActions, toBytes, keccak256, toHex } from 'viem';
+import { createPublicClient, http, createWalletClient, custom, publicActions, walletActions, toBytes, keccak256, toHex } from 'viem';
 import { getGeneralPaymasterInput, eip712WalletActions } from 'viem/zksync';
 import { createZksyncPasskeyClient, registerNewPasskey } from 'zksync-sso/client/passkey';
 import { encodeModuleData, getPublicKeyBytesFromPasskeySignature, encodePasskeyModuleParameters } from 'zksync-sso/utils';
 import { createZksyncSessionClient } from 'zksync-sso/client';
+import { createZksyncEcdsaClient, zksyncSsoEcdsaWalletActions } from 'zksync-sso/client/ecdsa';
 import { EthereumWallet, getOrMapViemChain, confirmationTransport, createViemUiTransaction } from '@dynamic-labs/ethereum-core';
 import { parseEvmNetworks, DeferredPromise, StorageService, DynamicError } from '@dynamic-labs/utils';
 import { AccountAbstractionConnector } from './AccountAbstractionConnector.js';
 import { AAFactoryABI } from './utils/abi.js';
-import { createZksyncEcdsaClient } from './ZKsync/client.js';
-import { zksyncSsoEcdsaWalletActions } from './ZKsync/walletActions.js';
 
 class ZKsyncConnector extends AccountAbstractionConnector {
     constructor(props) {
@@ -84,12 +83,67 @@ class ZKsyncConnector extends AccountAbstractionConnector {
     getAccountAbstractionProvider() {
         return this.smartAccount;
     }
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     getWalletClient() {
-        if (!this.smartAccount) {
+        const smartAccountClient = this.smartAccount;
+        if (!smartAccountClient) {
             return undefined;
         }
-        return this.smartAccount;
+        const transport = this.getWalletClientTransport(smartAccountClient);
+        return createWalletClient({
+            account: smartAccountClient.account,
+            chain: smartAccountClient.chain,
+            transport,
+        });
+    }
+    getWalletClientTransport(smartAccountClient) {
+        return custom({
+            request: (_a) => __awaiter(this, [_a], void 0, function* ({ method, params, }) {
+                const handleRequest = () => __awaiter(this, void 0, void 0, function* () {
+                    var _b;
+                    switch (method) {
+                        case 'personal_sign':
+                            // Delegate signing to the smart account client instance
+                            return smartAccountClient.signMessage({ message: params[0] });
+                        case 'eth_signTypedData_v4': {
+                            // Delegate typed data signing to the smart account client instance
+                            // Note: ZKsync usually expects JSON string for EIP712, but viem standard passes object.
+                            // The smartAccountClient's signTypedData should handle the expected format internally.
+                            const signTypedDataParams = params[1]; // Assuming standard viem format
+                            return smartAccountClient.signTypedData(signTypedDataParams);
+                        }
+                        case 'eth_sendTransaction':
+                            // Delegate transaction sending to the smart account client instance.
+                            // This ensures deployment checks, paymaster logic, etc., are handled.
+                            return smartAccountClient.sendTransaction(params[0]);
+                        case 'eth_accounts':
+                        case 'eth_requestAccounts':
+                            // Return the smart account address
+                            return ((_b = smartAccountClient.account) === null || _b === void 0 ? void 0 : _b.address)
+                                ? [smartAccountClient.account.address]
+                                : [];
+                        case 'eth_chainId': {
+                            // Return chainId from the smart account client
+                            const chainId = yield smartAccountClient.getChainId();
+                            return toHex(chainId);
+                        }
+                        default: {
+                            // For other read-only methods, delegate to a basic public client transport.
+                            // Avoid creating a new client/transport on every call if possible,
+                            // but for simplicity here, we create it transiently.
+                            // Consider caching this public client if performance becomes an issue.
+                            const publicClient = createPublicClient({
+                                chain: smartAccountClient.chain,
+                                transport: http(undefined, this.providersConfig.httpTransportConfig), // Use configured transport if available
+                            });
+                            return publicClient.request({ method, params });
+                        }
+                    }
+                });
+                // The internal confirmationTransport used by smartAccountClient via its 'owner'
+                // should handle the UI prompts. We don't need to add extra prompts here.
+                return handleRequest();
+            }),
+        });
     }
     getTransport(provider) {
         const transport = confirmationTransport({
@@ -151,7 +205,7 @@ class ZKsyncConnector extends AccountAbstractionConnector {
                     session: this.sessionKeyAddress,
                 },
                 owner: ownerWithTransport,
-                transport: http(),
+                transport: custom(ownerWithTransport),
             });
             return walletClient;
         });

package/src/ZKsync/client.cjs

@@ -1,31 +0,0 @@
-'use client'
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var _tslib = require('../../_virtual/_tslib.cjs');
-var viem = require('viem');
-var zksync = require('viem/zksync');
-var ecdsaAccount = require('./ecdsaAccount.cjs');
-var walletActions = require('./walletActions.cjs');
-var session = require('./session.cjs');
-
-const createZksyncEcdsaClient = (_parameters) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-    const parameters = Object.assign(Object.assign({}, _parameters), { address: viem.getAddress(_parameters.address), key: _parameters.key || 'zksync-sso-ecdsa-wallet', name: _parameters.name || 'ZKsync SSO ECDSA Client' });
-    const account = yield ecdsaAccount.toEcdsaAccount({
-        address: parameters.address,
-        owner: parameters.owner,
-    });
-    const client = viem.createClient(Object.assign(Object.assign({}, parameters), { account, type: 'walletClient' }))
-        .extend(() => ({
-        contracts: parameters.contracts,
-    }))
-        .extend(viem.publicActions)
-        .extend(viem.walletActions)
-        .extend(zksync.eip712WalletActions())
-        .extend(walletActions.zksyncSsoEcdsaWalletActions)
-        .extend(session.zksyncSsoEcdsaActions);
-    return client;
-});
-
-exports.createZksyncEcdsaClient = createZksyncEcdsaClient;

package/src/ZKsync/client.d.ts

@@ -1,25 +0,0 @@
-import { type Account, type Address, type Chain, type Client, type Prettify, type PublicActions, type PublicRpcSchema, type RpcSchema, type Transport, type WalletActions, type WalletClientConfig, type WalletRpcSchema } from 'viem';
-import { CustomPaymasterHandler } from 'zksync-sso/paymaster';
-import { Signer } from './types';
-import { ZksyncSsoEcdsaActions } from './session';
-export declare const createZksyncEcdsaClient: <transport extends Transport, chain extends Chain, rpcSchema extends RpcSchema | undefined = undefined>(_parameters: ZksyncSsoEcdsaClientConfig<transport, chain, rpcSchema>) => Promise<ZksyncSsoEcdsaClient<transport, chain, rpcSchema>>;
-export type EcdsaRequiredContracts = {
-    session: Address;
-    accountFactory?: Address;
-};
-type ZksyncSsoEcdsaData = {
-    contracts: EcdsaRequiredContracts;
-    paymasterHandler?: CustomPaymasterHandler;
-};
-export type ClientWithZksyncSsoEcdsaData<transport extends Transport = Transport, chain extends Chain = Chain> = Client<transport, chain, Account> & ZksyncSsoEcdsaData;
-export type ZksyncSsoEcdsaClient<transport extends Transport = Transport, chain extends Chain = Chain, rpcSchema extends RpcSchema | undefined = undefined, account extends Account = Account> = Prettify<Client<transport, chain, account, rpcSchema extends RpcSchema ? [...PublicRpcSchema, ...WalletRpcSchema, ...rpcSchema] : [...PublicRpcSchema, ...WalletRpcSchema], PublicActions<transport, chain, account> & WalletActions<chain, account> & ZksyncSsoEcdsaActions> & ZksyncSsoEcdsaData>;
-export interface ZksyncSsoEcdsaClientConfig<transport extends Transport = Transport, chain extends Chain = Chain, rpcSchema extends RpcSchema | undefined = undefined> extends Omit<WalletClientConfig<transport, chain, Account, rpcSchema>, 'account'> {
-    chain: NonNullable<chain>;
-    address: Address;
-    owner: Signer;
-    contracts: EcdsaRequiredContracts;
-    key?: string;
-    name?: string;
-    paymasterHandler?: CustomPaymasterHandler;
-}
-export {};

package/src/ZKsync/client.js

@@ -1,27 +0,0 @@
-'use client'
-import { __awaiter } from '../../_virtual/_tslib.js';
-import { getAddress, createClient, publicActions, walletActions } from 'viem';
-import { eip712WalletActions } from 'viem/zksync';
-import { toEcdsaAccount } from './ecdsaAccount.js';
-import { zksyncSsoEcdsaWalletActions } from './walletActions.js';
-import { zksyncSsoEcdsaActions } from './session.js';
-
-const createZksyncEcdsaClient = (_parameters) => __awaiter(void 0, void 0, void 0, function* () {
-    const parameters = Object.assign(Object.assign({}, _parameters), { address: getAddress(_parameters.address), key: _parameters.key || 'zksync-sso-ecdsa-wallet', name: _parameters.name || 'ZKsync SSO ECDSA Client' });
-    const account = yield toEcdsaAccount({
-        address: parameters.address,
-        owner: parameters.owner,
-    });
-    const client = createClient(Object.assign(Object.assign({}, parameters), { account, type: 'walletClient' }))
-        .extend(() => ({
-        contracts: parameters.contracts,
-    }))
-        .extend(publicActions)
-        .extend(walletActions)
-        .extend(eip712WalletActions())
-        .extend(zksyncSsoEcdsaWalletActions)
-        .extend(zksyncSsoEcdsaActions);
-    return client;
-});
-
-export { createZksyncEcdsaClient };

package/src/ZKsync/ecdsaAccount.cjs

@@ -1,32 +0,0 @@
-'use client'
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var _tslib = require('../../_virtual/_tslib.cjs');
-var accounts = require('viem/accounts');
-var zksync = require('viem/zksync');
-var types = require('./types.cjs');
-var getEip712Domain = require('./getEip712Domain.cjs');
-
-const toEcdsaAccount = (parameters) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-    const { address, owner } = parameters;
-    const localOwner = yield types.toOwner({ address, owner });
-    if (!address) {
-        throw new Error('Address is required');
-    }
-    const account = accounts.toAccount({
-        address,
-        signMessage: (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ message }) { return localOwner.signMessage({ message }); }),
-        signTransaction: (transaction) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-            const signableTransaction = Object.assign(Object.assign({}, transaction), { from: address, type: 'eip712' });
-            const eip712DomainAndMessage = getEip712Domain.getEip712Domain(signableTransaction);
-            const signature = yield localOwner.signTypedData(eip712DomainAndMessage);
-            return zksync.serializeTransaction(Object.assign(Object.assign({}, signableTransaction), { customSignature: signature }));
-        }),
-        signTypedData: (typedData) => localOwner.signTypedData(typedData),
-    });
-    return Object.assign(Object.assign({}, account), { source: 'ssoEcdsaAccount' });
-});
-
-exports.toEcdsaAccount = toEcdsaAccount;

package/src/ZKsync/ecdsaAccount.d.ts

@@ -1,13 +0,0 @@
-import type { Address } from 'abitype';
-import { type CustomSource, type LocalAccount } from 'viem';
-import { type Signer } from './types';
-export type ToEcdsaAccountParameters = {
-    /** Address of the deployed SSO Wallet */
-    address: Address;
-    /** Owner of the EOA */
-    owner: Signer;
-};
-export type EcdsaAccount = LocalAccount<'ssoEcdsaAccount'> & {
-    sign: NonNullable<CustomSource['sign']>;
-};
-export declare const toEcdsaAccount: (parameters: ToEcdsaAccountParameters) => Promise<EcdsaAccount>;

package/src/ZKsync/ecdsaAccount.js

@@ -1,28 +0,0 @@
-'use client'
-import { __awaiter } from '../../_virtual/_tslib.js';
-import { toAccount } from 'viem/accounts';
-import { serializeTransaction } from 'viem/zksync';
-import { toOwner } from './types.js';
-import { getEip712Domain } from './getEip712Domain.js';
-
-const toEcdsaAccount = (parameters) => __awaiter(void 0, void 0, void 0, function* () {
-    const { address, owner } = parameters;
-    const localOwner = yield toOwner({ address, owner });
-    if (!address) {
-        throw new Error('Address is required');
-    }
-    const account = toAccount({
-        address,
-        signMessage: (_a) => __awaiter(void 0, [_a], void 0, function* ({ message }) { return localOwner.signMessage({ message }); }),
-        signTransaction: (transaction) => __awaiter(void 0, void 0, void 0, function* () {
-            const signableTransaction = Object.assign(Object.assign({}, transaction), { from: address, type: 'eip712' });
-            const eip712DomainAndMessage = getEip712Domain(signableTransaction);
-            const signature = yield localOwner.signTypedData(eip712DomainAndMessage);
-            return serializeTransaction(Object.assign(Object.assign({}, signableTransaction), { customSignature: signature }));
-        }),
-        signTypedData: (typedData) => localOwner.signTypedData(typedData),
-    });
-    return Object.assign(Object.assign({}, account), { source: 'ssoEcdsaAccount' });
-});
-
-export { toEcdsaAccount };