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

package/CHANGELOG.md

@@ -1,4 +1,26 @@
 
+### [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)
+
+
+### Features
+
+* add session key client ([#8463](https://github.com/dynamic-labs/dynamic-auth/issues/8463)) ([6ed4ebd](https://github.com/dynamic-labs/dynamic-auth/commit/6ed4ebde3f7a8c48fc3461760690e9915e14e5b0))
+* add zk sync aa connector ([c280038](https://github.com/dynamic-labs/dynamic-auth/commit/c280038a9d5e26c1dd1d2a5b71c6a7762a43d042))
+
 ### [4.10.4-preview.0](https://github.com/dynamic-labs/dynamic-auth/compare/v4.10.3...v4.10.4-preview.0) (2025-04-04)
 
 

package/package.cjs

@@ -3,6 +3,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "4.10.4-preview.0";
+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.0";
+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.0",
+  "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.0",
-    "@dynamic-labs/ethereum-core": "4.10.4-preview.0",
-    "@dynamic-labs/logger": "4.10.4-preview.0",
-    "@dynamic-labs/types": "4.10.4-preview.0",
-    "@dynamic-labs/utils": "4.10.4-preview.0",
-    "@dynamic-labs/wallet-book": "4.10.4-preview.0",
-    "@dynamic-labs/wallet-connector-core": "4.10.4-preview.0"
+    "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,16 +8,16 @@ 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 = 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) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         super(props);
         // Core wallet properties
         this.ChainWallet = ethereumCore.EthereumWallet;
@@ -41,12 +41,12 @@ class ZKsyncConnector extends AccountAbstractionConnector.AccountAbstractionConn
         this.providersConfig = (_a = props.providersConfig) !== null && _a !== void 0 ? _a : {};
         this.chainId = (_b = props.apiProviders.zksync) === null || _b === void 0 ? void 0 : _b.defaultChainId;
         this.evmNetworks = utils.parseEvmNetworks(props.evmNetworks).filter((network) => network.chainId === this.chainId);
-        this.factoryAddress = ((_d = (_c = props.apiProviders.zksync) === null || _c === void 0 ? void 0 : _c.factoryAddress) !== null && _d !== void 0 ? _d : '0xa980E4B20354d4944de93F2a51f0a14c6E8e481d'); // Fallback if not provided
-        this.paymasterAddress = ((_f = (_e = props.apiProviders.zksync) === null || _e === void 0 ? void 0 : _e.paymasterAddress) !== null && _f !== void 0 ? _f : '0xD681ef8eD603F8F3b1CF9c1ef93548e698F60F0a'); // Fallback if not provided
-        this.passkeyAddress = ((_h = (_g = props.apiProviders.zksync) === null || _g === void 0 ? void 0 : _g.passkeyAddress) !== null && _h !== void 0 ? _h : '0x271546A4a3d8050610367e68040d41ee56E4BB31'); // Fallback if not provided
-        this.sessionKeyAddress = ((_k = (_j = props.apiProviders.zksync) === null || _j === void 0 ? void 0 : _j.sessionAddress) !== null && _k !== void 0 ? _k : '0xA8CC0A6bD462B44A8830bBbfB54Ce19F32815Fb7'); // Fallback if not provided
+        this.factoryAddress = (_c = props.apiProviders.zksync) === null || _c === void 0 ? void 0 : _c.factoryAddress; // Fallback if not provided
+        this.paymasterAddress = (_d = props.apiProviders.zksync) === null || _d === void 0 ? void 0 : _d.paymasterAddress; // Fallback if not provided
+        this.passkeyAddress = (_e = props.apiProviders.zksync) === null || _e === void 0 ? void 0 : _e.passkeyAddress; // Fallback if not provided
+        this.sessionKeyAddress = (_f = props.apiProviders.zksync) === null || _f === void 0 ? void 0 : _f.sessionAddress; // Fallback if not provided
         this.enablePasskeys =
-            (_m = (_l = props.settings.sdk.accountAbstraction) === null || _l === void 0 ? void 0 : _l.enablePasskeys) !== null && _m !== void 0 ? _m : false;
+            (_h = (_g = props.settings.sdk.accountAbstraction) === null || _g === void 0 ? void 0 : _g.enablePasskeys) !== null && _h !== void 0 ? _h : false;
     }
     getEnabledNetworks() {
         return this.evmNetworks;
@@ -87,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({
@@ -100,7 +155,9 @@ class ZKsyncConnector extends AccountAbstractionConnector.AccountAbstractionConn
             onPersonalSign: (_a) => _tslib.__awaiter(this, [_a], void 0, function* ({ message }) {
                 this._walletUiUtils.disabledConfirmationOnce();
                 if (!this._isSmartAccountDeployed) {
-                    yield this.deploySmartAccountWithPaymaster();
+                    yield this.deploySmartAccount({
+                        withPaymaster: true,
+                    });
                 }
                 this._walletUiUtils.disabledConfirmationOnce();
                 return provider.signMessage({
@@ -111,7 +168,9 @@ class ZKsyncConnector extends AccountAbstractionConnector.AccountAbstractionConn
                 this._walletUiUtils.disabledConfirmationOnce();
                 const signTypedData = JSON.parse(message);
                 if (!this._isSmartAccountDeployed) {
-                    yield this.deploySmartAccountWithPaymaster();
+                    yield this.deploySmartAccount({
+                        withPaymaster: true,
+                    });
                 }
                 this._walletUiUtils.disabledConfirmationOnce();
                 return provider.signTypedData({
@@ -142,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: {
@@ -150,7 +209,7 @@ class ZKsyncConnector extends AccountAbstractionConnector.AccountAbstractionConn
                     session: this.sessionKeyAddress,
                 },
                 owner: ownerWithTransport,
-                transport: viem.http(),
+                transport: viem.custom(ownerWithTransport),
             });
             return walletClient;
         });
@@ -173,6 +232,23 @@ class ZKsyncConnector extends AccountAbstractionConnector.AccountAbstractionConn
             this.initializedDeferredPromise.resolve();
         });
     }
+    createSessionClient(sessionKey, sessionConfig) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            if (!this.smartAccountAddress) {
+                throw new Error('Smart account address is not initialized');
+            }
+            return client.createZksyncSessionClient({
+                address: this.smartAccountAddress,
+                chain: ethereumCore.getOrMapViemChain(this.evmNetworks[0]),
+                contracts: {
+                    session: this.sessionKeyAddress,
+                },
+                sessionConfig,
+                sessionKey,
+                transport: viem.http(),
+            });
+        });
+    }
     /**
      * Creates a passkey client for ZKsync authentication
      *
@@ -232,7 +308,7 @@ class ZKsyncConnector extends AccountAbstractionConnector.AccountAbstractionConn
     }
     deploySmartAccount(_a) {
         return _tslib.__awaiter(this, arguments, void 0, function* ({ withPaymaster, }) {
-            if (withPaymaster) {
+            if (withPaymaster && this.paymasterAddress) {
                 yield this.deploySmartAccountWithPaymaster();
             }
             else {
@@ -242,6 +318,9 @@ class ZKsyncConnector extends AccountAbstractionConnector.AccountAbstractionConn
     }
     deploySmartAccountWithPaymaster() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
+            if (!this.paymasterAddress) {
+                throw new Error('Paymaster address is not initialized');
+            }
             const paymaster = this.paymasterAddress;
             const publicClient = yield this.getTypedPublicClient();
             const walletClient = yield this.getTypedWalletClient();
@@ -309,7 +388,7 @@ class ZKsyncConnector extends AccountAbstractionConnector.AccountAbstractionConn
                 .extend(viem.publicActions)
                 .extend(viem.walletActions)
                 .extend(zksync.eip712WalletActions())
-                .extend(walletActions.zksyncSsoEcdsaWalletActions);
+                .extend(ecdsa.zksyncSsoEcdsaWalletActions);
         });
     }
     /**
@@ -322,10 +401,19 @@ class ZKsyncConnector extends AccountAbstractionConnector.AccountAbstractionConn
             const salt = `0x${Buffer.from(viem.toBytes('DynamicLabs', { size: 32 })).toString('hex')}`;
             const initialValidators = [];
             const initialK1Owners = [this.eoaAddress];
-            if (this.enablePasskeys) {
+            // TODO: revisit this logic, maybe we should always add the passkey module data,
+            //  otherwise if people active passkeys later, old accounts will not be able to use passkey module
+            if (this.enablePasskeys && this.passkeyAddress) {
                 const encodedPasskeyModuleData = yield this.getEncodedPasskeyModuleData();
                 initialValidators.push(encodedPasskeyModuleData);
             }
+            if (this.sessionKeyAddress) {
+                const encodedSessionKeyModuleData = utils$1.encodeModuleData({
+                    address: this.sessionKeyAddress,
+                    parameters: '0x',
+                });
+                initialValidators.push(encodedSessionKeyModuleData);
+            }
             return {
                 initialK1Owners,
                 initialValidators,

package/src/ZKsyncConnector.d.ts

@@ -1,12 +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;
@@ -65,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;
@@ -8075,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<{
@@ -22445,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;
@@ -22487,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?: {
@@ -23891,6 +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("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;
@@ -23905,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;
@@ -23987,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;
@@ -24322,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;
@@ -24404,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>>) => 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;
@@ -24739,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;
@@ -24821,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>>;
-        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;
     }>;
     /**
@@ -24834,6 +24836,7 @@ export declare class ZKsyncConnector extends AccountAbstractionConnector impleme
         eoaConnector: WalletConnector;
         smartAccountAddress: string;
     }): Promise<void>;
+    createSessionClient(sessionKey: `0x${string}`, sessionConfig: SessionConfig): Promise<ZksyncSsoSessionClient<Transport, ViemChain, RpcSchema>>;
     /**
      * Creates a passkey client for ZKsync authentication
      *

package/src/ZKsyncConnector.js

@@ -1,19 +1,19 @@
 '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 { getPublicKeyBytesFromPasskeySignature, encodePasskeyModuleParameters, encodeModuleData } from 'zksync-sso/utils';
+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) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         super(props);
         // Core wallet properties
         this.ChainWallet = EthereumWallet;
@@ -37,12 +37,12 @@ class ZKsyncConnector extends AccountAbstractionConnector {
         this.providersConfig = (_a = props.providersConfig) !== null && _a !== void 0 ? _a : {};
         this.chainId = (_b = props.apiProviders.zksync) === null || _b === void 0 ? void 0 : _b.defaultChainId;
         this.evmNetworks = parseEvmNetworks(props.evmNetworks).filter((network) => network.chainId === this.chainId);
-        this.factoryAddress = ((_d = (_c = props.apiProviders.zksync) === null || _c === void 0 ? void 0 : _c.factoryAddress) !== null && _d !== void 0 ? _d : '0xa980E4B20354d4944de93F2a51f0a14c6E8e481d'); // Fallback if not provided
-        this.paymasterAddress = ((_f = (_e = props.apiProviders.zksync) === null || _e === void 0 ? void 0 : _e.paymasterAddress) !== null && _f !== void 0 ? _f : '0xD681ef8eD603F8F3b1CF9c1ef93548e698F60F0a'); // Fallback if not provided
-        this.passkeyAddress = ((_h = (_g = props.apiProviders.zksync) === null || _g === void 0 ? void 0 : _g.passkeyAddress) !== null && _h !== void 0 ? _h : '0x271546A4a3d8050610367e68040d41ee56E4BB31'); // Fallback if not provided
-        this.sessionKeyAddress = ((_k = (_j = props.apiProviders.zksync) === null || _j === void 0 ? void 0 : _j.sessionAddress) !== null && _k !== void 0 ? _k : '0xA8CC0A6bD462B44A8830bBbfB54Ce19F32815Fb7'); // Fallback if not provided
+        this.factoryAddress = (_c = props.apiProviders.zksync) === null || _c === void 0 ? void 0 : _c.factoryAddress; // Fallback if not provided
+        this.paymasterAddress = (_d = props.apiProviders.zksync) === null || _d === void 0 ? void 0 : _d.paymasterAddress; // Fallback if not provided
+        this.passkeyAddress = (_e = props.apiProviders.zksync) === null || _e === void 0 ? void 0 : _e.passkeyAddress; // Fallback if not provided
+        this.sessionKeyAddress = (_f = props.apiProviders.zksync) === null || _f === void 0 ? void 0 : _f.sessionAddress; // Fallback if not provided
         this.enablePasskeys =
-            (_m = (_l = props.settings.sdk.accountAbstraction) === null || _l === void 0 ? void 0 : _l.enablePasskeys) !== null && _m !== void 0 ? _m : false;
+            (_h = (_g = props.settings.sdk.accountAbstraction) === null || _g === void 0 ? void 0 : _g.enablePasskeys) !== null && _h !== void 0 ? _h : false;
     }
     getEnabledNetworks() {
         return this.evmNetworks;
@@ -83,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({
@@ -96,7 +151,9 @@ class ZKsyncConnector extends AccountAbstractionConnector {
             onPersonalSign: (_a) => __awaiter(this, [_a], void 0, function* ({ message }) {
                 this._walletUiUtils.disabledConfirmationOnce();
                 if (!this._isSmartAccountDeployed) {
-                    yield this.deploySmartAccountWithPaymaster();
+                    yield this.deploySmartAccount({
+                        withPaymaster: true,
+                    });
                 }
                 this._walletUiUtils.disabledConfirmationOnce();
                 return provider.signMessage({
@@ -107,7 +164,9 @@ class ZKsyncConnector extends AccountAbstractionConnector {
                 this._walletUiUtils.disabledConfirmationOnce();
                 const signTypedData = JSON.parse(message);
                 if (!this._isSmartAccountDeployed) {
-                    yield this.deploySmartAccountWithPaymaster();
+                    yield this.deploySmartAccount({
+                        withPaymaster: true,
+                    });
                 }
                 this._walletUiUtils.disabledConfirmationOnce();
                 return provider.signTypedData({
@@ -146,7 +205,7 @@ class ZKsyncConnector extends AccountAbstractionConnector {
                     session: this.sessionKeyAddress,
                 },
                 owner: ownerWithTransport,
-                transport: http(),
+                transport: custom(ownerWithTransport),
             });
             return walletClient;
         });
@@ -169,6 +228,23 @@ class ZKsyncConnector extends AccountAbstractionConnector {
             this.initializedDeferredPromise.resolve();
         });
     }
+    createSessionClient(sessionKey, sessionConfig) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.smartAccountAddress) {
+                throw new Error('Smart account address is not initialized');
+            }
+            return createZksyncSessionClient({
+                address: this.smartAccountAddress,
+                chain: getOrMapViemChain(this.evmNetworks[0]),
+                contracts: {
+                    session: this.sessionKeyAddress,
+                },
+                sessionConfig,
+                sessionKey,
+                transport: http(),
+            });
+        });
+    }
     /**
      * Creates a passkey client for ZKsync authentication
      *
@@ -228,7 +304,7 @@ class ZKsyncConnector extends AccountAbstractionConnector {
     }
     deploySmartAccount(_a) {
         return __awaiter(this, arguments, void 0, function* ({ withPaymaster, }) {
-            if (withPaymaster) {
+            if (withPaymaster && this.paymasterAddress) {
                 yield this.deploySmartAccountWithPaymaster();
             }
             else {
@@ -238,6 +314,9 @@ class ZKsyncConnector extends AccountAbstractionConnector {
     }
     deploySmartAccountWithPaymaster() {
         return __awaiter(this, void 0, void 0, function* () {
+            if (!this.paymasterAddress) {
+                throw new Error('Paymaster address is not initialized');
+            }
             const paymaster = this.paymasterAddress;
             const publicClient = yield this.getTypedPublicClient();
             const walletClient = yield this.getTypedWalletClient();
@@ -318,10 +397,19 @@ class ZKsyncConnector extends AccountAbstractionConnector {
             const salt = `0x${Buffer.from(toBytes('DynamicLabs', { size: 32 })).toString('hex')}`;
             const initialValidators = [];
             const initialK1Owners = [this.eoaAddress];
-            if (this.enablePasskeys) {
+            // TODO: revisit this logic, maybe we should always add the passkey module data,
+            //  otherwise if people active passkeys later, old accounts will not be able to use passkey module
+            if (this.enablePasskeys && this.passkeyAddress) {
                 const encodedPasskeyModuleData = yield this.getEncodedPasskeyModuleData();
                 initialValidators.push(encodedPasskeyModuleData);
             }
+            if (this.sessionKeyAddress) {
+                const encodedSessionKeyModuleData = encodeModuleData({
+                    address: this.sessionKeyAddress,
+                    parameters: '0x',
+                });
+                initialValidators.push(encodedSessionKeyModuleData);
+            }
             return {
                 initialK1Owners,
                 initialValidators,

package/src/ZeroDevConnector.d.ts

@@ -5,7 +5,7 @@ import { SignAuthorizationReturnType } from 'viem/accounts';
 import { type Chain as ViemChain } from 'viem/chains';
 import { EntryPointType, KERNEL_VERSION_TYPE } from '@zerodev/sdk/types';
 import { EthereumWallet, RegisterEvmProvidersConfig } from '@dynamic-labs/ethereum-core';
-import { EcdsaValidatorOptions, Provider, ProviderEntryPointVersionEnum, ProviderEnum, ProviderKernelVersionEnum, ProviderMultichainAccountAbstractionProviders } from '@dynamic-labs/sdk-api-core';
+import { EcdsaValidatorOptions, Provider, ProviderEntryPointVersionEnum, ProviderEnum, ProviderKernelVersionEnum, ProviderMultichainAccountAbstractionProviders, SmartWalletProperties } from '@dynamic-labs/sdk-api-core';
 import { Chain, InternalWalletConnector, IZeroDevConnector } from '@dynamic-labs/wallet-connector-core';
 import { WalletBookSchema } from '@dynamic-labs/wallet-book';
 import { GenericNetwork, IUITransaction, TransactionReceipt, WalletUiUtils } from '@dynamic-labs/types';
@@ -84,12 +84,7 @@ export declare class ZeroDevConnector extends AccountAbstractionConnector implem
         eoaAddress: string;
         eoaConnector: InternalWalletConnector;
         shouldSetEoaConnector: boolean;
-        properties?: {
-            ecdsaProviderType?: EcdsaValidatorOptions;
-            kernelVersion?: ProviderKernelVersionEnum;
-            entryPointVersion?: ProviderEntryPointVersionEnum;
-            enableKernelV3Migration?: boolean;
-        };
+        properties?: SmartWalletProperties;
     }): Promise<void>;
     registerEoa({ smartWalletAddress, eoaAddress, eoaConnector, shouldSetEoaConnector, ...properties }: {
         smartWalletAddress: string;

package/src/ZKsync/client.cjs

@@ -1,29 +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');
-
-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);
-    return client;
-});
-
-exports.createZksyncEcdsaClient = createZksyncEcdsaClient;

package/src/ZKsync/client.d.ts

@@ -1,24 +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';
-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>> & 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,25 +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';
-
-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);
-    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 };

package/src/ZKsync/getEip712Domain.cjs

@@ -1,62 +0,0 @@
-'use client'
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var viem = require('viem');
-var zksync = require('viem/zksync');
-
-const gasPerPubdataDefault = BigInt(50000);
-const getEip712Domain = (transaction) => {
-    const message = transactionToMessage(transaction);
-    return {
-        domain: {
-            chainId: transaction.chainId,
-            // cspell:ignore zkSync
-            name: 'zkSync',
-            version: '2',
-        },
-        message: message,
-        primaryType: 'Transaction',
-        types: {
-            Transaction: [
-                { name: 'txType', type: 'uint256' },
-                { name: 'from', type: 'uint256' },
-                { name: 'to', type: 'uint256' },
-                { name: 'gasLimit', type: 'uint256' },
-                { name: 'gasPerPubdataByteLimit', type: 'uint256' },
-                { name: 'maxFeePerGas', type: 'uint256' },
-                { name: 'maxPriorityFeePerGas', type: 'uint256' },
-                { name: 'paymaster', type: 'uint256' },
-                { name: 'nonce', type: 'uint256' },
-                { name: 'value', type: 'uint256' },
-                { name: 'data', type: 'bytes' },
-                { name: 'factoryDeps', type: 'bytes32[]' },
-                { name: 'paymasterInput', type: 'bytes' },
-            ],
-        },
-    };
-};
-//////////////////////////////////////////////////////////////////////////////
-// Utilities
-const transactionToMessage = (transaction) => {
-    var _a;
-    const { gas, nonce, to, from, value, maxFeePerGas, maxPriorityFeePerGas, factoryDeps, paymaster, paymasterInput, gasPerPubdata, data, } = transaction;
-    return {
-        data: data ? data : '0x0',
-        factoryDeps: (_a = factoryDeps === null || factoryDeps === void 0 ? void 0 : factoryDeps.map((dep) => viem.toHex(zksync.hashBytecode(dep)))) !== null && _a !== void 0 ? _a : [],
-        from: BigInt(from),
-        gasLimit: gas !== null && gas !== void 0 ? gas : BigInt(0),
-        gasPerPubdataByteLimit: gasPerPubdata !== null && gasPerPubdata !== void 0 ? gasPerPubdata : gasPerPubdataDefault,
-        maxFeePerGas: maxFeePerGas !== null && maxFeePerGas !== void 0 ? maxFeePerGas : BigInt(0),
-        maxPriorityFeePerGas: maxPriorityFeePerGas !== null && maxPriorityFeePerGas !== void 0 ? maxPriorityFeePerGas : BigInt(0),
-        nonce: nonce ? BigInt(nonce) : BigInt(0),
-        paymaster: paymaster ? BigInt(paymaster) : BigInt(0),
-        paymasterInput: paymasterInput ? paymasterInput : '0x',
-        to: to ? BigInt(to) : BigInt(0),
-        txType: BigInt(113),
-        value: value !== null && value !== void 0 ? value : BigInt(0),
-    };
-};
-
-exports.getEip712Domain = getEip712Domain;

package/src/ZKsync/getEip712Domain.d.ts

@@ -1,2 +0,0 @@
-import { type EIP712DomainFn, type ZksyncEIP712TransactionSignable, type ZksyncTransactionSerializable } from 'viem/zksync';
-export declare const getEip712Domain: EIP712DomainFn<ZksyncTransactionSerializable, ZksyncEIP712TransactionSignable>;

package/src/ZKsync/getEip712Domain.js

@@ -1,58 +0,0 @@
-'use client'
-import { toHex } from 'viem';
-import { hashBytecode } from 'viem/zksync';
-
-const gasPerPubdataDefault = BigInt(50000);
-const getEip712Domain = (transaction) => {
-    const message = transactionToMessage(transaction);
-    return {
-        domain: {
-            chainId: transaction.chainId,
-            // cspell:ignore zkSync
-            name: 'zkSync',
-            version: '2',
-        },
-        message: message,
-        primaryType: 'Transaction',
-        types: {
-            Transaction: [
-                { name: 'txType', type: 'uint256' },
-                { name: 'from', type: 'uint256' },
-                { name: 'to', type: 'uint256' },
-                { name: 'gasLimit', type: 'uint256' },
-                { name: 'gasPerPubdataByteLimit', type: 'uint256' },
-                { name: 'maxFeePerGas', type: 'uint256' },
-                { name: 'maxPriorityFeePerGas', type: 'uint256' },
-                { name: 'paymaster', type: 'uint256' },
-                { name: 'nonce', type: 'uint256' },
-                { name: 'value', type: 'uint256' },
-                { name: 'data', type: 'bytes' },
-                { name: 'factoryDeps', type: 'bytes32[]' },
-                { name: 'paymasterInput', type: 'bytes' },
-            ],
-        },
-    };
-};
-//////////////////////////////////////////////////////////////////////////////
-// Utilities
-const transactionToMessage = (transaction) => {
-    var _a;
-    const { gas, nonce, to, from, value, maxFeePerGas, maxPriorityFeePerGas, factoryDeps, paymaster, paymasterInput, gasPerPubdata, data, } = transaction;
-    return {
-        data: data ? data : '0x0',
-        factoryDeps: (_a = factoryDeps === null || factoryDeps === void 0 ? void 0 : factoryDeps.map((dep) => toHex(hashBytecode(dep)))) !== null && _a !== void 0 ? _a : [],
-        from: BigInt(from),
-        gasLimit: gas !== null && gas !== void 0 ? gas : BigInt(0),
-        gasPerPubdataByteLimit: gasPerPubdata !== null && gasPerPubdata !== void 0 ? gasPerPubdata : gasPerPubdataDefault,
-        maxFeePerGas: maxFeePerGas !== null && maxFeePerGas !== void 0 ? maxFeePerGas : BigInt(0),
-        maxPriorityFeePerGas: maxPriorityFeePerGas !== null && maxPriorityFeePerGas !== void 0 ? maxPriorityFeePerGas : BigInt(0),
-        nonce: nonce ? BigInt(nonce) : BigInt(0),
-        paymaster: paymaster ? BigInt(paymaster) : BigInt(0),
-        paymasterInput: paymasterInput ? paymasterInput : '0x',
-        to: to ? BigInt(to) : BigInt(0),
-        txType: BigInt(113),
-        value: value !== null && value !== void 0 ? value : BigInt(0),
-    };
-};
-
-export { getEip712Domain };

package/src/ZKsync/types.cjs

@@ -1,52 +0,0 @@
-'use client'
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var _tslib = require('../../_virtual/_tslib.cjs');
-var viem = require('viem');
-var accounts = require('viem/accounts');
-var actions = require('viem/actions');
-var utils = require('viem/utils');
-
-const toOwner = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ owner, address, }) {
-    if ('type' in owner && owner.type === 'local') {
-        return owner;
-    }
-    let walletClient = undefined;
-    if ('request' in owner) {
-        if (!address) {
-            try {
-                [address] = yield owner.request({
-                    method: 'eth_requestAccounts',
-                });
-            }
-            catch (_b) {
-                [address] = yield owner.request({
-                    method: 'eth_accounts',
-                });
-            }
-        }
-        if (!address) {
-            // For TS to be happy
-            throw new Error('address is required');
-        }
-        walletClient = viem.createWalletClient({
-            account: address,
-            transport: viem.custom(owner),
-        });
-    }
-    if (!walletClient) {
-        walletClient = owner;
-    }
-    return accounts.toAccount({
-        address: walletClient.account.address,
-        signMessage: (_c) => _tslib.__awaiter(void 0, [_c], void 0, function* ({ message }) { return walletClient.signMessage({ message }); }),
-        signTransaction: () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-            throw new Error("Smart account signer doesn't need to sign transactions");
-        }),
-        signTypedData: (typedData) => _tslib.__awaiter(void 0, void 0, void 0, function* () { return utils.getAction(walletClient, actions.signTypedData, 'signTypedData')(typedData); }),
-    });
-});
-
-exports.toOwner = toOwner;

package/src/ZKsync/types.d.ts

@@ -1,9 +0,0 @@
-import { type Account, type Address, type Chain, type EIP1193Provider, type LocalAccount, type OneOf, type Transport, type WalletClient } from 'viem';
-export type Signer = OneOf<EIP1193Provider | WalletClient<Transport, Chain | undefined, Account> | LocalAccount>;
-export type EthereumProvider = OneOf<{
-    request(...args: any): Promise<any>;
-} | EIP1193Provider>;
-export declare const toOwner: <provider extends EthereumProvider>({ owner, address, }: {
-    owner: OneOf<provider | WalletClient<Transport, Chain | undefined, Account> | LocalAccount>;
-    address: Address;
-}) => Promise<LocalAccount>;

package/src/ZKsync/types.js

@@ -1,48 +0,0 @@
-'use client'
-import { __awaiter } from '../../_virtual/_tslib.js';
-import { createWalletClient, custom } from 'viem';
-import { toAccount } from 'viem/accounts';
-import { signTypedData } from 'viem/actions';
-import { getAction } from 'viem/utils';
-
-const toOwner = (_a) => __awaiter(void 0, [_a], void 0, function* ({ owner, address, }) {
-    if ('type' in owner && owner.type === 'local') {
-        return owner;
-    }
-    let walletClient = undefined;
-    if ('request' in owner) {
-        if (!address) {
-            try {
-                [address] = yield owner.request({
-                    method: 'eth_requestAccounts',
-                });
-            }
-            catch (_b) {
-                [address] = yield owner.request({
-                    method: 'eth_accounts',
-                });
-            }
-        }
-        if (!address) {
-            // For TS to be happy
-            throw new Error('address is required');
-        }
-        walletClient = createWalletClient({
-            account: address,
-            transport: custom(owner),
-        });
-    }
-    if (!walletClient) {
-        walletClient = owner;
-    }
-    return toAccount({
-        address: walletClient.account.address,
-        signMessage: (_c) => __awaiter(void 0, [_c], void 0, function* ({ message }) { return walletClient.signMessage({ message }); }),
-        signTransaction: () => __awaiter(void 0, void 0, void 0, function* () {
-            throw new Error("Smart account signer doesn't need to sign transactions");
-        }),
-        signTypedData: (typedData) => __awaiter(void 0, void 0, void 0, function* () { return getAction(walletClient, signTypedData, 'signTypedData')(typedData); }),
-    });
-});
-
-export { toOwner };

package/src/ZKsync/walletActions.cjs

@@ -1,93 +0,0 @@
-'use client'
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var _tslib = require('../../_virtual/_tslib.cjs');
-var viem = require('viem');
-var actions = require('viem/actions');
-var zksync = require('viem/zksync');
-var paymaster = require('zksync-sso/paymaster');
-
-const zksyncSsoEcdsaWalletActions = (client) => ({
-    deployContract: (args) => actions.deployContract(client, args),
-    getAddresses: () => actions.getAddresses(client),
-    getChainId: () => actions.getChainId(client),
-    sendRawTransaction: (args) => actions.sendRawTransaction(client, args),
-    sendTransaction: (args) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const unformattedTx = Object.assign({}, args);
-        if ('eip712Meta' in unformattedTx) {
-            const eip712Meta = unformattedTx.eip712Meta;
-            unformattedTx.gasPerPubdata = eip712Meta.gasPerPubdata
-                ? BigInt(eip712Meta.gasPerPubdata)
-                : undefined;
-            unformattedTx.factoryDeps = eip712Meta.factoryDeps;
-            unformattedTx.customSignature = eip712Meta.customSignature;
-            unformattedTx.paymaster = (_a = eip712Meta.paymasterParams) === null || _a === void 0 ? void 0 : _a.paymaster;
-            unformattedTx.paymasterInput = ((_b = eip712Meta.paymasterParams) === null || _b === void 0 ? void 0 : _b.paymasterInput)
-                ? viem.bytesToHex(new Uint8Array((_c = eip712Meta.paymasterParams) === null || _c === void 0 ? void 0 : _c.paymasterInput))
-                : undefined;
-            delete unformattedTx.eip712Meta;
-        }
-        /* eslint-disable @typescript-eslint/no-unused-vars */
-        const _f = yield paymaster.getTransactionWithPaymasterData(client.chain.id, client.account.address, unformattedTx, client.paymasterHandler), unformattedTxWithPaymaster = _tslib.__rest(_f, ["chainId"]);
-        const formatters = (_d = client.chain) === null || _d === void 0 ? void 0 : _d.formatters;
-        const format = ((_e = formatters === null || formatters === void 0 ? void 0 : formatters.transaction) === null || _e === void 0 ? void 0 : _e.format) || viem.formatTransaction;
-        const tx = Object.assign(Object.assign({}, format(unformattedTxWithPaymaster)), { type: 'eip712' });
-        return yield sendEip712Transaction(client, tx);
-    }),
-    signMessage: (args) => actions.signMessage(client, args),
-    signTransaction: (args) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        /* eslint-disable @typescript-eslint/no-unused-vars */
-        const _g = yield paymaster.getTransactionWithPaymasterData(client.chain.id, client.account.address, args, client.paymasterHandler), unformattedTxWithPaymaster = _tslib.__rest(_g, ["chainId"]);
-        return zksync.signTransaction(client, Object.assign(Object.assign({}, args), { type: 'eip712', unformattedTxWithPaymaster }));
-    }),
-    signTypedData: (args) => actions.signTypedData(client, args),
-    writeContract: (args) => actions.writeContract(client, args),
-});
-const sendEip712Transaction = (client, parameters) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-    var _h;
-    const { account: account_ = client.account, chain = client.chain } = parameters, rest = _tslib.__rest(parameters, ["account", "chain"]);
-    if (!account_)
-        throw new Error('Account not found.');
-    const { account } = client;
-    if (!account)
-        throw new Error('Account not found.');
-    const request = yield getAction(client, actions.prepareTransactionRequest, 'prepareTransactionRequest')(Object.assign({ account,
-        chain, nonceManager: account.nonceManager }, rest));
-    const serializer = (_h = chain === null || chain === void 0 ? void 0 : chain.serializers) === null || _h === void 0 ? void 0 : _h.transaction;
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    const serializedTransaction = (yield account.signTransaction(request, {
-        serializer,
-    }));
-    return yield getAction(client, actions.sendRawTransaction, 'sendRawTransaction')({
-        serializedTransaction,
-    });
-});
-/**
- * Retrieves and returns an action from the client (if exists), and falls
- * back to the tree-shakable action.
- *
- * Useful for extracting overridden actions from a client (ie. if a consumer
- * wants to override the `sendTransaction` implementation).
- */
-const getAction = (client, actionFn, 
-// cspell:ignore minifiers
-// Some minifiers drop `Function.prototype.name`, or replace it with short letters,
-// meaning that `actionFn.name` will not always work. For that case, the consumer
-// needs to pass the name explicitly.
-name) => {
-    const action_implicit = client[actionFn.name];
-    if (typeof action_implicit === 'function')
-        return action_implicit;
-    const action_explicit = client[name];
-    if (typeof action_explicit === 'function')
-        return action_explicit;
-    return (params) => actionFn(client, params);
-};
-
-exports.getAction = getAction;
-exports.sendEip712Transaction = sendEip712Transaction;
-exports.zksyncSsoEcdsaWalletActions = zksyncSsoEcdsaWalletActions;

package/src/ZKsync/walletActions.d.ts

@@ -1,15 +0,0 @@
-import { type Account, type Chain, type Client, type PublicActions, type RpcSchema, type SendTransactionRequest, type Transport, type WalletActions } from 'viem';
-import { type ChainEIP712, type SendEip712TransactionParameters, type SendEip712TransactionReturnType } from 'viem/zksync';
-export type ZksyncSsoEcdsaWalletActions<chain extends Chain, account extends Account> = Omit<WalletActions<chain, account>, 'addChain' | 'getPermissions' | 'requestAddresses' | 'requestPermissions' | 'switchChain' | 'watchAsset' | 'prepareTransactionRequest'>;
-export declare const zksyncSsoEcdsaWalletActions: <transport extends Transport, chain extends Chain, account extends Account>(client: Client<transport, chain, account>) => any;
-export declare const sendEip712Transaction: <chain extends ChainEIP712 | undefined, account extends Account | undefined, request extends SendTransactionRequest<chain, chainOverride>, chainOverride extends ChainEIP712 | undefined = undefined>(client: Client<Transport, chain, account>, parameters: SendEip712TransactionParameters<chain, account, chainOverride, request>) => Promise<SendEip712TransactionReturnType>;
-/**
- * Retrieves and returns an action from the client (if exists), and falls
- * back to the tree-shakable action.
- *
- * Useful for extracting overridden actions from a client (ie. if a consumer
- * wants to override the `sendTransaction` implementation).
- */
-export declare const getAction: <transport extends Transport, chain extends Chain | undefined, account extends Account | undefined, rpcSchema extends RpcSchema | undefined, extended extends {
-    [key: string]: unknown;
-}, client extends Client<transport, chain, account, rpcSchema, extended>, parameters, returnType>(client: client, actionFn: (_: any, parameters: parameters) => returnType, name: keyof PublicActions | keyof WalletActions | string) => ((parameters: parameters) => returnType);

package/src/ZKsync/walletActions.js

@@ -1,87 +0,0 @@
-'use client'
-import { __awaiter, __rest } from '../../_virtual/_tslib.js';
-import { bytesToHex, formatTransaction } from 'viem';
-import { deployContract, getAddresses, getChainId, sendRawTransaction, signMessage, signTypedData, writeContract, prepareTransactionRequest } from 'viem/actions';
-import { signTransaction } from 'viem/zksync';
-import { getTransactionWithPaymasterData } from 'zksync-sso/paymaster';
-
-const zksyncSsoEcdsaWalletActions = (client) => ({
-    deployContract: (args) => deployContract(client, args),
-    getAddresses: () => getAddresses(client),
-    getChainId: () => getChainId(client),
-    sendRawTransaction: (args) => sendRawTransaction(client, args),
-    sendTransaction: (args) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const unformattedTx = Object.assign({}, args);
-        if ('eip712Meta' in unformattedTx) {
-            const eip712Meta = unformattedTx.eip712Meta;
-            unformattedTx.gasPerPubdata = eip712Meta.gasPerPubdata
-                ? BigInt(eip712Meta.gasPerPubdata)
-                : undefined;
-            unformattedTx.factoryDeps = eip712Meta.factoryDeps;
-            unformattedTx.customSignature = eip712Meta.customSignature;
-            unformattedTx.paymaster = (_a = eip712Meta.paymasterParams) === null || _a === void 0 ? void 0 : _a.paymaster;
-            unformattedTx.paymasterInput = ((_b = eip712Meta.paymasterParams) === null || _b === void 0 ? void 0 : _b.paymasterInput)
-                ? bytesToHex(new Uint8Array((_c = eip712Meta.paymasterParams) === null || _c === void 0 ? void 0 : _c.paymasterInput))
-                : undefined;
-            delete unformattedTx.eip712Meta;
-        }
-        /* eslint-disable @typescript-eslint/no-unused-vars */
-        const _f = yield getTransactionWithPaymasterData(client.chain.id, client.account.address, unformattedTx, client.paymasterHandler), unformattedTxWithPaymaster = __rest(_f, ["chainId"]);
-        const formatters = (_d = client.chain) === null || _d === void 0 ? void 0 : _d.formatters;
-        const format = ((_e = formatters === null || formatters === void 0 ? void 0 : formatters.transaction) === null || _e === void 0 ? void 0 : _e.format) || formatTransaction;
-        const tx = Object.assign(Object.assign({}, format(unformattedTxWithPaymaster)), { type: 'eip712' });
-        return yield sendEip712Transaction(client, tx);
-    }),
-    signMessage: (args) => signMessage(client, args),
-    signTransaction: (args) => __awaiter(void 0, void 0, void 0, function* () {
-        /* eslint-disable @typescript-eslint/no-unused-vars */
-        const _g = yield getTransactionWithPaymasterData(client.chain.id, client.account.address, args, client.paymasterHandler), unformattedTxWithPaymaster = __rest(_g, ["chainId"]);
-        return signTransaction(client, Object.assign(Object.assign({}, args), { type: 'eip712', unformattedTxWithPaymaster }));
-    }),
-    signTypedData: (args) => signTypedData(client, args),
-    writeContract: (args) => writeContract(client, args),
-});
-const sendEip712Transaction = (client, parameters) => __awaiter(void 0, void 0, void 0, function* () {
-    var _h;
-    const { account: account_ = client.account, chain = client.chain } = parameters, rest = __rest(parameters, ["account", "chain"]);
-    if (!account_)
-        throw new Error('Account not found.');
-    const { account } = client;
-    if (!account)
-        throw new Error('Account not found.');
-    const request = yield getAction(client, prepareTransactionRequest, 'prepareTransactionRequest')(Object.assign({ account,
-        chain, nonceManager: account.nonceManager }, rest));
-    const serializer = (_h = chain === null || chain === void 0 ? void 0 : chain.serializers) === null || _h === void 0 ? void 0 : _h.transaction;
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    const serializedTransaction = (yield account.signTransaction(request, {
-        serializer,
-    }));
-    return yield getAction(client, sendRawTransaction, 'sendRawTransaction')({
-        serializedTransaction,
-    });
-});
-/**
- * Retrieves and returns an action from the client (if exists), and falls
- * back to the tree-shakable action.
- *
- * Useful for extracting overridden actions from a client (ie. if a consumer
- * wants to override the `sendTransaction` implementation).
- */
-const getAction = (client, actionFn, 
-// cspell:ignore minifiers
-// Some minifiers drop `Function.prototype.name`, or replace it with short letters,
-// meaning that `actionFn.name` will not always work. For that case, the consumer
-// needs to pass the name explicitly.
-name) => {
-    const action_implicit = client[actionFn.name];
-    if (typeof action_implicit === 'function')
-        return action_implicit;
-    const action_explicit = client[name];
-    if (typeof action_explicit === 'function')
-        return action_explicit;
-    return (params) => actionFn(client, params);
-};
-
-export { getAction, sendEip712Transaction, zksyncSsoEcdsaWalletActions };