@dynamic-labs/ethereum-aa-zksync 4.19.2 → 4.19.4

package/CHANGELOG.md

@@ -1,4 +1,13 @@
 
+### [4.19.4](https://github.com/dynamic-labs/dynamic-auth/compare/v4.19.3...v4.19.4) (2025-05-31)
+
+### [4.19.3](https://github.com/dynamic-labs/dynamic-auth/compare/v4.19.2...v4.19.3) (2025-05-28)
+
+
+### Bug Fixes
+
+* rerender issue with Slush wallet pop up appearing multiple times ([#8817](https://github.com/dynamic-labs/dynamic-auth/issues/8817)) ([bea0da6](https://github.com/dynamic-labs/dynamic-auth/commit/bea0da647bab983610ebbf18a6ca66ba0ac569bf))
+
 ### [4.19.2](https://github.com/dynamic-labs/dynamic-auth/compare/v4.19.1...v4.19.2) (2025-05-27)
 
 

package/package.cjs

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

package/package.js

@@ -1,4 +1,4 @@
 'use client'
-var version = "4.19.2";
+var version = "4.19.4";
 
 export { version };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/ethereum-aa-zksync",
-  "version": "4.19.2",
+  "version": "4.19.4",
   "description": "Core package for Ethereum Account Abstraction utilities and types",
   "author": "Dynamic Labs, Inc.",
   "license": "MIT",
@@ -20,13 +20,13 @@
   "dependencies": {
     "@dynamic-labs/sdk-api-core": "0.0.672",
     "zksync-sso": "0.2.0",
-    "@dynamic-labs/assert-package-version": "4.19.2",
-    "@dynamic-labs/ethereum-aa-core": "4.19.2",
-    "@dynamic-labs/ethereum-core": "4.19.2",
-    "@dynamic-labs/types": "4.19.2",
-    "@dynamic-labs/utils": "4.19.2",
-    "@dynamic-labs/wallet-book": "4.19.2",
-    "@dynamic-labs/wallet-connector-core": "4.19.2"
+    "@dynamic-labs/assert-package-version": "4.19.4",
+    "@dynamic-labs/ethereum-aa-core": "4.19.4",
+    "@dynamic-labs/ethereum-core": "4.19.4",
+    "@dynamic-labs/types": "4.19.4",
+    "@dynamic-labs/utils": "4.19.4",
+    "@dynamic-labs/wallet-book": "4.19.4",
+    "@dynamic-labs/wallet-connector-core": "4.19.4"
   },
   "peerDependencies": {
     "viem": "^2.21.60"

package/src/connector/ZKsyncConnector.cjs

@@ -22,6 +22,7 @@ var deployment = require('../utils/deployment.cjs');
 var network = require('../utils/network.cjs');
 var session = require('../utils/session.cjs');
 var storage = require('../utils/storage.cjs');
+var module$1 = require('../utils/module.cjs');
 
 class ZKsyncConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
     constructor(props) {
@@ -527,7 +528,7 @@ class ZKsyncConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
         });
     }
     listSessions() {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
+        return _tslib.__awaiter(this, arguments, void 0, function* ({ asJson = false, } = {}) {
             if (!this.smartAccount) {
                 throw new Error('Smart account is not initialized');
             }
@@ -566,8 +567,10 @@ class ZKsyncConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
                     // filter out the sessions that have been revoked
                     !revokedSessionHashes.includes(log.args.sessionHash))
                     .map((log) => ({
-                    blockNumber: log.blockNumber,
-                    session: log.args.sessionSpec,
+                    blockNumber: asJson ? log.blockNumber.toString() : log.blockNumber,
+                    session: asJson
+                        ? session.stringifySessionConfig(log.args.sessionSpec)
+                        : log.args.sessionSpec,
                     sessionId: log.args.sessionHash,
                     timestamp: new Date(
                     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -623,7 +626,7 @@ class ZKsyncConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
         });
     }
     createSession(_a) {
-        return _tslib.__awaiter(this, arguments, void 0, function* ({ sessionConfig, origin, }) {
+        return _tslib.__awaiter(this, arguments, void 0, function* ({ sessionConfig, origin, addModuleWithPaymaster = false, }) {
             if (!this.smartAccount) {
                 throw new Error('Smart account is not initialized');
             }
@@ -641,6 +644,25 @@ class ZKsyncConnector extends ethereumAaCore.AccountAbstractionBaseConnector {
                     }),
                 };
             }
+            const publicClient = yield this.getPublicClient();
+            if (!(yield module$1.isModuleInstalled({
+                moduleAddress: this.sessionKeyAddress,
+                publicClient,
+                smartAddress: this.smartAccountAddress,
+            }))) {
+                yield module$1.installModule({
+                    ecdsaClient: this.getAccountAbstractionProvider(),
+                    module: {
+                        address: this.sessionKeyAddress,
+                        initData: '0x',
+                    },
+                    paymaster: addModuleWithPaymaster && this.paymasterAddress
+                        ? this.paymasterAddress
+                        : undefined,
+                    publicClient,
+                    smartAddress: this.smartAccountAddress,
+                });
+            }
             yield this.smartAccount.createSession(params);
             const sessionHash = session.getSessionHash(params.sessionConfig);
             const serializedSessionConfig = session.stringifySessionConfig(params.sessionConfig);

package/src/connector/ZKsyncConnector.d.ts

@@ -17702,12 +17702,15 @@ export declare class ZKsyncConnector extends AccountAbstractionBaseConnector imp
      */
     protected checkIsDeployed(): Promise<boolean>;
     private getSmartAccountCreationBlock;
-    listSessions(): Promise<SessionInformation[]>;
+    listSessions({ asJson, }?: {
+        asJson?: boolean;
+    }): Promise<SessionInformation[]>;
     getAddress(): Promise<string | undefined>;
     revokeSession(sessionId: `0x${string}`): Promise<void>;
-    createSession({ sessionConfig, origin, }: {
+    createSession({ sessionConfig, origin, addModuleWithPaymaster, }: {
         sessionConfig: SessionConfigWithoutSigner;
         origin?: string;
+        addModuleWithPaymaster?: boolean;
     }): Promise<{
         expiresAt: bigint;
         sessionId: `0x${string}`;

package/src/connector/ZKsyncConnector.js

@@ -16,8 +16,9 @@ import { getSalt } from '../utils/getSalt.js';
 import { getEncodedPasskeyModuleData } from '../utils/passkeys.js';
 import { getDeploymentParameters, simulateAccountDeployment, executeAccountDeployment } from '../utils/deployment.js';
 import { ensureEoaConnectorNetwork } from '../utils/network.js';
-import { enforceSessionConfigRestrictions, getSessionHash, stringifySessionConfig } from '../utils/session.js';
+import { stringifySessionConfig, enforceSessionConfigRestrictions, getSessionHash } from '../utils/session.js';
 import { retrieveSessionFromStorage, saveSessionToStorage, deleteSessionFromStorage } from '../utils/storage.js';
+import { isModuleInstalled, installModule } from '../utils/module.js';
 
 class ZKsyncConnector extends AccountAbstractionBaseConnector {
     constructor(props) {
@@ -523,7 +524,7 @@ class ZKsyncConnector extends AccountAbstractionBaseConnector {
         });
     }
     listSessions() {
-        return __awaiter(this, void 0, void 0, function* () {
+        return __awaiter(this, arguments, void 0, function* ({ asJson = false, } = {}) {
             if (!this.smartAccount) {
                 throw new Error('Smart account is not initialized');
             }
@@ -562,8 +563,10 @@ class ZKsyncConnector extends AccountAbstractionBaseConnector {
                     // filter out the sessions that have been revoked
                     !revokedSessionHashes.includes(log.args.sessionHash))
                     .map((log) => ({
-                    blockNumber: log.blockNumber,
-                    session: log.args.sessionSpec,
+                    blockNumber: asJson ? log.blockNumber.toString() : log.blockNumber,
+                    session: asJson
+                        ? stringifySessionConfig(log.args.sessionSpec)
+                        : log.args.sessionSpec,
                     sessionId: log.args.sessionHash,
                     timestamp: new Date(
                     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -619,7 +622,7 @@ class ZKsyncConnector extends AccountAbstractionBaseConnector {
         });
     }
     createSession(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ sessionConfig, origin, }) {
+        return __awaiter(this, arguments, void 0, function* ({ sessionConfig, origin, addModuleWithPaymaster = false, }) {
             if (!this.smartAccount) {
                 throw new Error('Smart account is not initialized');
             }
@@ -637,6 +640,25 @@ class ZKsyncConnector extends AccountAbstractionBaseConnector {
                     }),
                 };
             }
+            const publicClient = yield this.getPublicClient();
+            if (!(yield isModuleInstalled({
+                moduleAddress: this.sessionKeyAddress,
+                publicClient,
+                smartAddress: this.smartAccountAddress,
+            }))) {
+                yield installModule({
+                    ecdsaClient: this.getAccountAbstractionProvider(),
+                    module: {
+                        address: this.sessionKeyAddress,
+                        initData: '0x',
+                    },
+                    paymaster: addModuleWithPaymaster && this.paymasterAddress
+                        ? this.paymasterAddress
+                        : undefined,
+                    publicClient,
+                    smartAddress: this.smartAccountAddress,
+                });
+            }
             yield this.smartAccount.createSession(params);
             const sessionHash = getSessionHash(params.sessionConfig);
             const serializedSessionConfig = stringifySessionConfig(params.sessionConfig);

package/src/index.cjs

@@ -11,6 +11,8 @@ require('../_virtual/_tslib.cjs');
 require('zksync-sso/utils');
 require('@dynamic-labs/utils');
 var isZKsyncConnector = require('./utils/isZKsyncConnector.cjs');
+require('viem/zksync');
+require('zksync-sso/abi');
 
 assertPackageVersion.assertPackageVersion('@dynamic-labs/ethereum-aa-zksync', _package.version);
 const ZKsyncSmartWalletConnectors = (props) => {

package/src/index.js

@@ -7,6 +7,8 @@ import '../_virtual/_tslib.js';
 import 'zksync-sso/utils';
 import '@dynamic-labs/utils';
 export { isZKsyncConnector } from './utils/isZKsyncConnector.js';
+import 'viem/zksync';
+import 'zksync-sso/abi';
 
 assertPackageVersion('@dynamic-labs/ethereum-aa-zksync', version);
 const ZKsyncSmartWalletConnectors = (props) => {

package/src/types/index.d.ts

@@ -1,11 +1,8 @@
 import { SessionConfig } from 'zksync-sso/utils';
-import { GenericNetwork, WalletUiUtils } from '@dynamic-labs/types';
+import { ConvertBigIntToString, GenericNetwork, WalletUiUtils } from '@dynamic-labs/types';
 import { WalletBookSchema } from '@dynamic-labs/wallet-book';
 import { InternalWalletConnector } from '@dynamic-labs/wallet-connector-core';
 export type SessionConfigWithoutSigner = Omit<SessionConfig, 'signer'>;
-export type ConvertBigIntToString<T> = T extends bigint ? string : T extends Array<infer U> ? Array<ConvertBigIntToString<U>> : T extends object ? {
-    [K in keyof T]: ConvertBigIntToString<T[K]>;
-} : T;
 export type SessionConfigJSON = ConvertBigIntToString<SessionConfig>;
 export type AccountAbstractionConnectorProps = {
     walletUiUtils: WalletUiUtils<InternalWalletConnector>;
@@ -13,8 +10,8 @@ export type AccountAbstractionConnectorProps = {
     evmNetworks: GenericNetwork[];
 };
 export type SessionInformation = {
-    blockNumber: bigint;
-    session: SessionConfig;
+    blockNumber: bigint | string;
+    session: SessionConfig | SessionConfigJSON;
     sessionId: string;
     timestamp: number;
     transactionHash: string;

package/src/utils/index.d.ts

@@ -5,3 +5,4 @@ export * from './network';
 export * from './isZKsyncConnector';
 export * from './session';
 export * from './storage';
+export * from './module';

package/src/utils/module.cjs

@@ -0,0 +1,43 @@
+'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 abi = require('zksync-sso/abi');
+
+const isModuleInstalled = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ moduleAddress, smartAddress, publicClient, }) {
+    const ssoAccountContract = viem.getContract({
+        abi: abi.SsoAccountAbi,
+        address: smartAddress,
+        client: publicClient,
+    });
+    if (!ssoAccountContract) {
+        return false;
+    }
+    const sessionValidatorInstalled = yield ssoAccountContract.read.isModuleValidator([moduleAddress]);
+    return sessionValidatorInstalled;
+});
+const installModule = (_b) => _tslib.__awaiter(void 0, [_b], void 0, function* ({ module, smartAddress, publicClient, ecdsaClient, paymaster, }) {
+    const { address: moduleAddress, initData } = module;
+    const simulatedSessionModuleAddition = yield publicClient.simulateContract({
+        abi: abi.SsoAccountAbi,
+        account: ecdsaClient.account,
+        address: smartAddress,
+        args: [moduleAddress, initData],
+        functionName: 'addModuleValidator',
+    });
+    let request = Object.assign({}, simulatedSessionModuleAddition.request);
+    if (paymaster) {
+        request = Object.assign(Object.assign({}, request), { paymaster, paymasterInput: zksync.getGeneralPaymasterInput({
+                innerInput: new Uint8Array(),
+            }) });
+    }
+    const tx = yield ecdsaClient.writeContract(request);
+    yield publicClient.waitForTransactionReceipt({ hash: tx });
+});
+
+exports.installModule = installModule;
+exports.isModuleInstalled = isModuleInstalled;

package/src/utils/module.d.ts

@@ -0,0 +1,17 @@
+import { Address, PublicClient, RpcSchema, Transport, type Chain as ViemChain } from 'viem';
+import { ZksyncSsoEcdsaClient } from 'zksync-sso/client/ecdsa';
+export declare const isModuleInstalled: ({ moduleAddress, smartAddress, publicClient, }: {
+    moduleAddress: Address;
+    smartAddress: Address;
+    publicClient: PublicClient;
+}) => Promise<boolean>;
+export declare const installModule: ({ module, smartAddress, publicClient, ecdsaClient, paymaster, }: {
+    module: {
+        address: Address;
+        initData: `0x${string}`;
+    };
+    smartAddress: Address;
+    paymaster?: Address;
+    publicClient: PublicClient;
+    ecdsaClient: ZksyncSsoEcdsaClient<Transport, ViemChain, RpcSchema>;
+}) => Promise<void>;

package/src/utils/module.js

@@ -0,0 +1,38 @@
+'use client'
+import { __awaiter } from '../../_virtual/_tslib.js';
+import { getContract } from 'viem';
+import { getGeneralPaymasterInput } from 'viem/zksync';
+import { SsoAccountAbi } from 'zksync-sso/abi';
+
+const isModuleInstalled = (_a) => __awaiter(void 0, [_a], void 0, function* ({ moduleAddress, smartAddress, publicClient, }) {
+    const ssoAccountContract = getContract({
+        abi: SsoAccountAbi,
+        address: smartAddress,
+        client: publicClient,
+    });
+    if (!ssoAccountContract) {
+        return false;
+    }
+    const sessionValidatorInstalled = yield ssoAccountContract.read.isModuleValidator([moduleAddress]);
+    return sessionValidatorInstalled;
+});
+const installModule = (_b) => __awaiter(void 0, [_b], void 0, function* ({ module, smartAddress, publicClient, ecdsaClient, paymaster, }) {
+    const { address: moduleAddress, initData } = module;
+    const simulatedSessionModuleAddition = yield publicClient.simulateContract({
+        abi: SsoAccountAbi,
+        account: ecdsaClient.account,
+        address: smartAddress,
+        args: [moduleAddress, initData],
+        functionName: 'addModuleValidator',
+    });
+    let request = Object.assign({}, simulatedSessionModuleAddition.request);
+    if (paymaster) {
+        request = Object.assign(Object.assign({}, request), { paymaster, paymasterInput: getGeneralPaymasterInput({
+                innerInput: new Uint8Array(),
+            }) });
+    }
+    const tx = yield ecdsaClient.writeContract(request);
+    yield publicClient.waitForTransactionReceipt({ hash: tx });
+});
+
+export { installModule, isModuleInstalled };