From 17daeb5e561a61cd1b48fecca2f0802e31d856b8 Mon Sep 17 00:00:00 2001
From: Lyova Potyomkin <lyova.potyomkin@gmail.com>
Date: Fri, 1 Nov 2024 12:05:46 +0200
Subject: [PATCH 01/42] feat: store sessions offchain to reduce gas

---
 .../src/validators/SessionKeyValidator.sol    | 285 ++++++------------
 packages/contracts/test/SessionKeyTest.ts     |  47 ++-
 2 files changed, 112 insertions(+), 220 deletions(-)

diff --git a/packages/contracts/src/validators/SessionKeyValidator.sol b/packages/contracts/src/validators/SessionKeyValidator.sol
index 05f1f52b..8926d5de 100644
--- a/packages/contracts/src/validators/SessionKeyValidator.sol
+++ b/packages/contracts/src/validators/SessionKeyValidator.sol
@@ -20,6 +20,7 @@ library SessionLib {
   using SessionLib for SessionLib.Constraint;
   using SessionLib for SessionLib.UsageLimit;
 
+  // TODO: we don't need to store constraints, so we can remove this restriction
   uint256 constant MAX_CONSTRAINTS = 16;
 
   // We do not permit session keys to be reused to open multiple sessions
@@ -34,8 +35,11 @@ library SessionLib {
 
   // This struct is used to track usage information for each session.
   // Along with `status`, this is considered the session state.
-  // While everything else is considered the session spec.
-  struct UsageTrackers {
+  // While everything else is considered the session spec, and is stored offchain.
+  // Storage layout of this struct is weird to conform to ERC-7562 storage access restrictions during validation.
+  // Each innermost mapping is always mapping(address account => ...).
+  struct SessionStorage {
+    mapping(address => Status) status;
     UsageTracker fee;
     // (target) => transfer value tracker
     mapping(address => UsageTracker) transferValue;
@@ -46,44 +50,6 @@ library SessionLib {
     mapping(address => mapping(bytes4 => mapping(uint256 => UsageTracker))) params;
   }
 
-  // This is the main struct that holds information about all sessions and their state.
-  // This struct has weird layout because of the AA storage access restrictions for validation.
-  // Innermost mappings are all mapping(address account => ...) because of this.
-  struct SessionStorage {
-    // (target, selector) => call policy
-    mapping(address => mapping(bytes4 => mapping(address => CallPolicy))) callPolicy;
-    // (target) => transfer policy. Used for calls with calldata.length < 4.
-    mapping(address => mapping(address => TransferPolicy)) transferPolicy;
-    mapping(address => Status) status;
-    // Timestamp after which session is considered expired
-    mapping(address => uint256) expiry;
-    // Tracks gasLimit * maxFeePerGas of each transaction
-    mapping(address => UsageLimit) feeLimit;
-    UsageTrackers trackers;
-    // These 2 mappings are only used in getters / view functions, not used during validation.
-    mapping(address => CallTarget[]) callTargets;
-    mapping(address => address[]) transferTargets;
-  }
-
-  struct CallPolicy {
-    // this flag is needed, as otherwise, an empty CallPolicy (default mapping entry)
-    // would mean no constraints
-    bool isAllowed;
-    uint256 maxValuePerUse;
-    UsageLimit valueLimit;
-    // We restrain from using a dynamic array here, as it would mean further
-    // complications for the storage layout due to the AA storage access restrictions.
-    uint256 totalConstraints;
-    Constraint[MAX_CONSTRAINTS] constraints;
-  }
-
-  // For transfers, i.e. calls without a selector
-  struct TransferPolicy {
-    bool isAllowed;
-    uint256 maxValuePerUse;
-    UsageLimit valueLimit;
-  }
-
   struct Constraint {
     Condition condition;
     uint64 index;
@@ -121,11 +87,6 @@ library SessionLib {
     NotEqual
   }
 
-  struct CallTarget {
-    address target;
-    bytes4 selector;
-  }
-
   struct SessionSpec {
     address signer;
     uint256 expiry;
@@ -170,7 +131,7 @@ library SessionLib {
     LimitState[] callParams;
   }
 
-  function checkAndUpdate(UsageLimit storage limit, UsageTracker storage tracker, uint256 value) internal {
+  function checkAndUpdate(UsageLimit memory limit, UsageTracker storage tracker, uint256 value) internal {
     if (limit.limitType == LimitType.Lifetime) {
       require(tracker.lifetimeUsage[msg.sender] + value <= limit.limit, "Lifetime limit exceeded");
       tracker.lifetimeUsage[msg.sender] += value;
@@ -183,7 +144,7 @@ library SessionLib {
     // }
   }
 
-  function checkAndUpdate(Constraint storage constraint, UsageTracker storage tracker, bytes calldata data) internal {
+  function checkAndUpdate(Constraint memory constraint, UsageTracker storage tracker, bytes calldata data) internal {
     uint256 index = 4 + constraint.index * 32;
     bytes32 param = bytes32(data[index:index + 32]);
     Condition condition = constraint.condition;
@@ -206,101 +167,54 @@ library SessionLib {
     constraint.limit.checkAndUpdate(tracker, uint256(param));
   }
 
-  function validate(SessionStorage storage session, Transaction calldata transaction) internal {
-    require(session.status[msg.sender] == Status.Active, "Session is not active");
+  function validate(SessionStorage storage state, Transaction calldata transaction, SessionSpec memory spec) internal {
+    require(state.status[msg.sender] == Status.Active, "Session is not active");
 
     // TODO uncomment when it's possible to check timestamps during validation
-    // require(block.timestamp <= session.expiry);
+    // require(block.timestamp <= state.expiry);
 
     // TODO: update fee allowance with the gasleft/refund at the end of execution
     uint256 fee = transaction.maxFeePerGas * transaction.gasLimit;
-    session.feeLimit[msg.sender].checkAndUpdate(session.trackers.fee, fee);
+    spec.feeLimit.checkAndUpdate(state.fee, fee);
 
     address target = address(uint160(transaction.to));
 
     if (transaction.data.length >= 4) {
       bytes4 selector = bytes4(transaction.data[:4]);
-      CallPolicy storage callPolicy = session.callPolicy[target][selector][msg.sender];
+      CallSpec memory callPolicy;
+      bool found = false;
+
+      for (uint256 i = 0; i < spec.callPolicies.length; i++) {
+        if (spec.callPolicies[i].target == target && spec.callPolicies[i].selector == selector) {
+          callPolicy = spec.callPolicies[i];
+          found = true;
+          break;
+        }
+      }
 
-      require(callPolicy.isAllowed, "Call not allowed");
+      require(found, "Call not allowed");
       require(transaction.value <= callPolicy.maxValuePerUse, "Value exceeds limit");
-      callPolicy.valueLimit.checkAndUpdate(session.trackers.callValue[target][selector], transaction.value);
+      callPolicy.valueLimit.checkAndUpdate(state.callValue[target][selector], transaction.value);
 
-      for (uint256 i = 0; i < callPolicy.totalConstraints; i++) {
-        callPolicy.constraints[i].checkAndUpdate(session.trackers.params[target][selector][i], transaction.data);
+      for (uint256 i = 0; i < callPolicy.constraints.length; i++) {
+        callPolicy.constraints[i].checkAndUpdate(state.params[target][selector][i], transaction.data);
       }
     } else {
-      TransferPolicy storage transferPolicy = session.transferPolicy[target][msg.sender];
-      require(transferPolicy.isAllowed, "Transfer not allowed");
-      require(transaction.value <= transferPolicy.maxValuePerUse, "Value exceeds limit");
-      transferPolicy.valueLimit.checkAndUpdate(session.trackers.transferValue[target], transaction.value);
-    }
-  }
-
-  function fill(SessionStorage storage session, SessionSpec memory newSession, address account) internal {
-    session.status[account] = Status.Active;
-    session.expiry[account] = newSession.expiry;
-    session.feeLimit[account] = newSession.feeLimit;
-    for (uint256 i = 0; i < newSession.callPolicies.length; i++) {
-      CallSpec memory newPolicy = newSession.callPolicies[i];
-      session.callTargets[account].push(CallTarget({ target: newPolicy.target, selector: newPolicy.selector }));
-      CallPolicy storage callPolicy = session.callPolicy[newPolicy.target][newPolicy.selector][account];
-      callPolicy.isAllowed = true;
-      callPolicy.maxValuePerUse = newPolicy.maxValuePerUse;
-      callPolicy.valueLimit = newPolicy.valueLimit;
-      require(newPolicy.constraints.length <= MAX_CONSTRAINTS, "Too many constraints");
-      callPolicy.totalConstraints = newPolicy.constraints.length;
-      for (uint256 j = 0; j < newPolicy.constraints.length; j++) {
-        callPolicy.constraints[j] = newPolicy.constraints[j];
+      TransferSpec memory transferPolicy;
+      bool found = false;
+
+      for (uint256 i = 0; i < spec.transferPolicies.length; i++) {
+        if (spec.transferPolicies[i].target == target) {
+          transferPolicy = spec.transferPolicies[i];
+          found = true;
+          break;
+        }
       }
-    }
-    for (uint256 i = 0; i < newSession.transferPolicies.length; i++) {
-      TransferSpec memory newPolicy = newSession.transferPolicies[i];
-      session.transferTargets[account].push(newPolicy.target);
-      TransferPolicy storage transferPolicy = session.transferPolicy[newPolicy.target][account];
-      transferPolicy.isAllowed = true;
-      transferPolicy.maxValuePerUse = newPolicy.maxValuePerUse;
-      transferPolicy.valueLimit = newPolicy.valueLimit;
-    }
-  }
 
-  function getSpec(SessionStorage storage session, address account) internal view returns (SessionSpec memory) {
-    CallSpec[] memory callPolicies = new CallSpec[](session.callTargets[account].length);
-    TransferSpec[] memory transferPolicies = new TransferSpec[](session.transferTargets[account].length);
-    for (uint256 i = 0; i < session.callTargets[account].length; i++) {
-      CallTarget memory target = session.callTargets[account][i];
-      CallPolicy storage callPolicy = session.callPolicy[target.target][target.selector][account];
-      Constraint[] memory constraints = new Constraint[](callPolicy.totalConstraints);
-      for (uint256 j = 0; j < callPolicy.totalConstraints; j++) {
-        constraints[j] = callPolicy.constraints[j];
-      }
-      callPolicies[i] = CallSpec({
-        target: target.target,
-        selector: target.selector,
-        maxValuePerUse: callPolicy.maxValuePerUse,
-        valueLimit: callPolicy.valueLimit,
-        constraints: constraints
-      });
-    }
-    for (uint256 i = 0; i < session.transferTargets[account].length; i++) {
-      address target = session.transferTargets[account][i];
-      TransferPolicy storage transferPolicy = session.transferPolicy[target][account];
-      transferPolicies[i] = TransferSpec({
-        target: target,
-        maxValuePerUse: transferPolicy.maxValuePerUse,
-        valueLimit: transferPolicy.valueLimit
-      });
+      require(found, "Transfer not allowed");
+      require(transaction.value <= transferPolicy.maxValuePerUse, "Value exceeds limit");
+      transferPolicy.valueLimit.checkAndUpdate(state.transferValue[target], transaction.value);
     }
-    return
-      SessionSpec({
-        // Signer addresses are not stored in SessionStorage,
-        // and are filled in later in the `sessionSpec()` getter.
-        signer: address(0),
-        expiry: session.expiry[account],
-        feeLimit: session.feeLimit[account],
-        callPolicies: callPolicies,
-        transferPolicies: transferPolicies
-      });
   }
 
   function remainingLimit(
@@ -321,9 +235,11 @@ library SessionLib {
     }
   }
 
-  function getState(SessionStorage storage session, address account) internal view returns (SessionState memory) {
-    SessionSpec memory spec = getSpec(session, account);
-
+  function getState(
+    SessionStorage storage session,
+    address account,
+    SessionSpec calldata spec
+  ) internal view returns (SessionState memory) {
     LimitState[] memory transferValue = new LimitState[](spec.transferPolicies.length);
     LimitState[] memory callValue = new LimitState[](spec.callPolicies.length);
     LimitState[] memory callParams = new LimitState[](MAX_CONSTRAINTS * spec.callPolicies.length); // there will be empty ones at the end
@@ -332,11 +248,7 @@ library SessionLib {
     for (uint256 i = 0; i < transferValue.length; i++) {
       TransferSpec memory transferSpec = spec.transferPolicies[i];
       transferValue[i] = LimitState({
-        remaining: remainingLimit(
-          transferSpec.valueLimit,
-          session.trackers.transferValue[transferSpec.target],
-          account
-        ),
+        remaining: remainingLimit(transferSpec.valueLimit, session.transferValue[transferSpec.target], account),
         target: spec.transferPolicies[i].target,
         selector: bytes4(0),
         index: 0
@@ -346,11 +258,7 @@ library SessionLib {
     for (uint256 i = 0; i < callValue.length; i++) {
       CallSpec memory callSpec = spec.callPolicies[i];
       callValue[i] = LimitState({
-        remaining: remainingLimit(
-          callSpec.valueLimit,
-          session.trackers.callValue[callSpec.target][callSpec.selector],
-          account
-        ),
+        remaining: remainingLimit(callSpec.valueLimit, session.callValue[callSpec.target][callSpec.selector], account),
         target: callSpec.target,
         selector: callSpec.selector,
         index: 0
@@ -361,7 +269,7 @@ library SessionLib {
           callParams[paramLimitIndex++] = LimitState({
             remaining: remainingLimit(
               callSpec.constraints[j].limit,
-              session.trackers.params[callSpec.target][callSpec.selector][j],
+              session.params[callSpec.target][callSpec.selector][j],
               account
             ),
             target: callSpec.target,
@@ -380,7 +288,7 @@ library SessionLib {
     return
       SessionState({
         status: session.status[account],
-        fee: remainingLimit(spec.feeLimit, session.trackers.fee, account),
+        fee: remainingLimit(spec.feeLimit, session.fee, account),
         transferValue: transferValue,
         callValue: callValue,
         callParams: callParams
@@ -390,39 +298,26 @@ library SessionLib {
 
 contract SessionKeyValidator is IHook, IValidationHook, IModuleValidator, IModule {
   using SessionLib for SessionLib.SessionStorage;
-  using EnumerableSet for EnumerableSet.AddressSet;
+  using EnumerableSet for EnumerableSet.Bytes32Set;
 
-  bytes4 constant EIP1271_SUCCESS_RETURN_VALUE = 0x1626ba7e;
-
-  // session owner => session storage
-  mapping(address => SessionLib.SessionStorage) private sessions;
-  // account => owners
-  mapping(address => EnumerableSet.AddressSet) sessionOwners;
+  // TODO: add more events for session state changes
+  event SessionCreated(address indexed account, bytes32 indexed sessionHash, SessionLib.SessionSpec sessionSpec);
 
-  function sessionSpec(address account, address signer) public view returns (SessionLib.SessionSpec memory spec) {
-    spec = sessions[signer].getSpec(account);
-    spec.signer = signer;
-  }
+  bytes4 constant EIP1271_SUCCESS_RETURN_VALUE = 0x1626ba7e;
 
-  function sessionState(address account, address signer) public view returns (SessionLib.SessionState memory) {
-    return sessions[signer].getState(account);
-  }
+  // account => hashes of session specs
+  // Can be used to trustlessly revoke all session keys.
+  // TODO: Is emitting an event sufficient?
+  // mapping(address => EnumerableSet.Bytes32Set) private sessionHashes;
+  mapping(address => uint256) private sessionCounter;
+  // session hash => session state
+  mapping(bytes32 => SessionLib.SessionStorage) private sessionStates;
 
-  function activeSigners(address account) external view returns (address[] memory) {
-    return sessionOwners[account].values();
-  }
-
-  function sessionList(
-    address account
-  ) external view returns (SessionLib.SessionState[] memory states, SessionLib.SessionSpec[] memory specs) {
-    uint256 length = sessionOwners[account].length();
-    states = new SessionLib.SessionState[](length);
-    specs = new SessionLib.SessionSpec[](length);
-    for (uint256 i = 0; i < length; i++) {
-      address signer = sessionOwners[account].at(i);
-      specs[i] = sessionSpec(account, signer);
-      states[i] = sessionState(account, signer);
-    }
+  function sessionState(
+    address account,
+    SessionLib.SessionSpec calldata spec
+  ) external view returns (SessionLib.SessionState memory) {
+    return sessionStates[keccak256(abi.encode(spec))].getState(account, spec);
   }
 
   function handleValidation(bytes32 signedHash, bytes memory signature) external view returns (bool) {
@@ -434,21 +329,24 @@ contract SessionKeyValidator is IHook, IValidationHook, IModuleValidator, IModul
     if (sessionData.length == 0) {
       return false;
     }
-    SessionLib.SessionSpec memory newSession = abi.decode(sessionData, (SessionLib.SessionSpec));
-    createSession(newSession);
+    SessionLib.SessionSpec memory sessionSpec = abi.decode(sessionData, (SessionLib.SessionSpec));
+    createSession(sessionSpec);
     return true;
   }
 
-  function createSession(SessionLib.SessionSpec memory newSession) public {
+  function createSession(SessionLib.SessionSpec memory sessionSpec) public {
+    bytes32 sessionHash = keccak256(abi.encode(sessionSpec));
     require(_isInitialized(msg.sender), "Account not initialized");
-    require(newSession.signer != address(0), "Invalid signer");
+    require(sessionSpec.signer != address(0), "Invalid signer");
     require(
-      sessions[newSession.signer].status[msg.sender] == SessionLib.Status.NotInitialized,
+      sessionStates[sessionHash].status[msg.sender] == SessionLib.Status.NotInitialized,
       "Session already exists"
     );
-    require(newSession.feeLimit.limitType != SessionLib.LimitType.Unlimited, "Unlimited fee allowance is not safe");
-    sessionOwners[msg.sender].add(newSession.signer);
-    sessions[newSession.signer].fill(newSession, msg.sender);
+    require(sessionSpec.feeLimit.limitType != SessionLib.LimitType.Unlimited, "Unlimited fee allowance is not safe");
+    // sessionHashes[msg.sender].add(sessionHash);
+    sessionCounter[msg.sender]++;
+    sessionStates[sessionHash].status[msg.sender] = SessionLib.Status.Active;
+    emit SessionCreated(msg.sender, sessionHash, sessionSpec);
   }
 
   function init(bytes calldata data) external {
@@ -481,7 +379,8 @@ contract SessionKeyValidator is IHook, IValidationHook, IModuleValidator, IModul
     // is installed again later, there will be no active sessions from the past.
     // Problem: if there are too many keys, this will run out of gas.
     // Solution: before uninstalling, require that all keys are revoked manually.
-    require(sessionOwners[msg.sender].length() == 0, "Revoke all keys first");
+    // require(sessionHashes[msg.sender].length() == 0, "Revoke all keys first");
+    require(sessionCounter[msg.sender] == 0, "Revoke all keys first");
   }
 
   function supportsInterface(bytes4 interfaceId) external pure override returns (bool) {
@@ -494,15 +393,16 @@ contract SessionKeyValidator is IHook, IValidationHook, IModuleValidator, IModul
   }
 
   // TODO: make the session owner able revoke its own key, in case it was leaked, to prevent further misuse?
-  function revokeKey(address sessionOwner) public {
-    require(sessions[sessionOwner].status[msg.sender] == SessionLib.Status.Active, "Nothing to revoke");
-    sessions[sessionOwner].status[msg.sender] = SessionLib.Status.Closed;
-    sessionOwners[msg.sender].remove(sessionOwner);
+  function revokeKey(bytes32 sessionHash) public {
+    require(sessionStates[sessionHash].status[msg.sender] == SessionLib.Status.Active, "Nothing to revoke");
+    sessionStates[sessionHash].status[msg.sender] = SessionLib.Status.Closed;
+    // sessionHashes[msg.sender].remove(sessionHash);
+    sessionCounter[msg.sender]--;
   }
 
-  function revokeKeys(address[] calldata owners) external {
-    for (uint256 i = 0; i < owners.length; i++) {
-      revokeKey(owners[i]);
+  function revokeKeys(bytes32[] calldata sessionHashes) external {
+    for (uint256 i = 0; i < sessionHashes.length; i++) {
+      revokeKey(sessionHashes[i]);
     }
   }
 
@@ -525,22 +425,25 @@ contract SessionKeyValidator is IHook, IValidationHook, IModuleValidator, IModul
    */
   function isValidSignature(bytes32 hash, bytes memory signature) public view returns (bytes4 magic) {
     magic = EIP1271_SUCCESS_RETURN_VALUE;
-    (address recoveredAddress, ) = ECDSA.tryRecover(hash, signature);
-    SessionLib.Status status = sessions[recoveredAddress].status[msg.sender];
-    if (status != SessionLib.Status.Active) {
-      magic = bytes4(0);
-    }
+    // TODO: Does this method have to work standalone? If not, validtionHook is sufficient for validation.
+    // (address recoveredAddress, ) = ECDSA.tryRecover(hash, signature);
+    // SessionLib.Status status = sessions[recoveredAddress].status[msg.sender];
+    // if (status != SessionLib.Status.Active) {
+    //   magic = bytes4(0);
+    // }
   }
 
-  function validationHook(bytes32 signedHash, Transaction calldata transaction, bytes calldata _hookData) external {
+  function validationHook(bytes32 signedHash, Transaction calldata transaction, bytes calldata hookData) external {
     (bytes memory signature, address validator, ) = abi.decode(transaction.signature, (bytes, address, bytes[]));
     if (validator != address(this)) {
       // This transaction is not meant to be validated by this module
       return;
     }
+    SessionLib.SessionSpec memory spec = abi.decode(hookData, (SessionLib.SessionSpec));
     (address recoveredAddress, ) = ECDSA.tryRecover(signedHash, signature);
     require(recoveredAddress != address(0), "Invalid signer");
-    sessions[recoveredAddress].validate(transaction);
+    bytes32 sessionHash = keccak256(abi.encode(spec));
+    sessionStates[sessionHash].validate(transaction, spec);
   }
 
   /**
diff --git a/packages/contracts/test/SessionKeyTest.ts b/packages/contracts/test/SessionKeyTest.ts
index 217fcfa7..81eac69b 100644
--- a/packages/contracts/test/SessionKeyTest.ts
+++ b/packages/contracts/test/SessionKeyTest.ts
@@ -70,7 +70,7 @@ class SessionTester {
         [
           this.sessionOwner.signingKey.sign(hash).serialized,
           sessionKeyModuleAddress,
-          ["0x"], // this array supplies data for hooks
+          [await this.encodeSession()], // this array supplies data for hooks
         ],
       ),
       address: this.proxyAccountAddress,
@@ -85,12 +85,11 @@ class SessionTester {
       secret: fixtures.wallet.privateKey,
     }, provider);
 
-    const [oldList] = await sessionKeyModuleContract.sessionList(this.proxyAccountAddress);
-    const oldState = await sessionKeyModuleContract.sessionState(this.proxyAccountAddress, this.sessionOwner.address);
-    expect(oldState.status).to.equal(0, "session should not be initialized");
-
     this.session = this.getSession(newSession);
 
+    const oldState = await sessionKeyModuleContract.sessionState(this.proxyAccountAddress, this.session);
+    expect(oldState.status).to.equal(0, "session should not exist yet");
+
     const aaTx = {
       ...await this.aaTxTemplate(),
       to: await sessionKeyModuleContract.getAddress(),
@@ -100,52 +99,42 @@ class SessionTester {
 
     const signedTransaction = await smartAccount.signTransaction(aaTx);
     const tx = await provider.broadcastTransaction(signedTransaction);
-    await tx.wait();
+    const receipt = await tx.wait();
+    logInfo(`\`createSession\` gas used: ${receipt.gasUsed.toString()}`);
 
-    const [newList] = await sessionKeyModuleContract.sessionList(this.proxyAccountAddress);
-    expect(newList).to.have.lengthOf(oldList.length + 1, "session should be created");
-    const newState = await sessionKeyModuleContract.sessionState(this.proxyAccountAddress, this.sessionOwner.address);
+    const newState = await sessionKeyModuleContract.sessionState(this.proxyAccountAddress, this.session);
     expect(newState.status).to.equal(1, "session should be active");
-    this.assertSession(await sessionKeyModuleContract.sessionSpec(this.proxyAccountAddress, this.sessionOwner.address));
   }
 
-  assertSession(session: SessionLib.SessionSpecStruct) {
-    const deepEqual = (a, b) => Object.keys(a).forEach((key) => {
-      if (Array.isArray(a[key]) && Array.isArray(b[key])) {
-        expect(a[key]).to.have.lengthOf(b[key].length, `key ${key} should have same length`);
-        a[key].forEach((item, i) => deepEqual(item, b[key][i]));
-      } else if (typeof a[key] === "object" && typeof b[key] === "object") {
-        deepEqual(a[key], b[key]);
-      } else {
-        expect(a[key]).to.equal(b[key], `key ${key} should match`);
-      }
-    });
-
-    deepEqual(this.session, session);
+  async encodeSession() {
+    const sessionKeyModuleContract = await fixtures.getSessionKeyContract();
+    return "0x" + sessionKeyModuleContract.interface.encodeFunctionData("createSession", [this.session]).slice(10);
   }
 
   async revokeKey() {
     const sessionKeyModuleContract = await fixtures.getSessionKeyContract();
-    let state = await sessionKeyModuleContract.sessionState(this.proxyAccountAddress, this.sessionOwner.address);
-    expect(state.status).to.equal(1, "session should be active");
+    const oldState = await sessionKeyModuleContract.sessionState(this.proxyAccountAddress, this.session);
+    expect(oldState.status).to.equal(1, "session should be active");
 
     const smartAccount = new SmartAccount({
       address: this.proxyAccountAddress,
       secret: fixtures.wallet.privateKey,
     }, provider);
 
+    const sessionHash = ethers.keccak256(await this.encodeSession());
+
     const aaTx = {
       ...await this.aaTxTemplate(),
       to: await sessionKeyModuleContract.getAddress(),
-      data: sessionKeyModuleContract.interface.encodeFunctionData("revokeKey", [this.sessionOwner.address]),
+      data: sessionKeyModuleContract.interface.encodeFunctionData("revokeKey", [sessionHash]),
     };
     aaTx.gasLimit = await provider.estimateGas(aaTx);
 
     const signedTransaction = await smartAccount.signTransaction(aaTx);
     const tx = await provider.broadcastTransaction(signedTransaction);
     await tx.wait();
-    state = await sessionKeyModuleContract.sessionState(this.proxyAccountAddress, this.sessionOwner.address);
-    expect(state.status).to.equal(2, "session should be revoked");
+    const newState = await sessionKeyModuleContract.sessionState(this.proxyAccountAddress, this.session);
+    expect(newState.status).to.equal(2, "session should be revoked");
   }
 
   async sendTxSuccess(txRequest: ethers.TransactionRequest = {}) {
@@ -384,7 +373,7 @@ describe("SessionKeyModule tests", function () {
 
     it("should reject a session key transaction that goes over total limit", async () => {
       const sessionKeyModuleContract = await fixtures.getSessionKeyContract();
-      const remainingLimits = await sessionKeyModuleContract.sessionState(proxyAccountAddress, tester.sessionOwner.address);
+      const remainingLimits = await sessionKeyModuleContract.sessionState(proxyAccountAddress, tester.session);
       expect(remainingLimits.callParams[0].remaining).to.equal(500n, "should have 500 tokens remaining in allowance");
 
       await tester.sendTxFail({

From d628d0c717599818219f3c641559310f3b881757 Mon Sep 17 00:00:00 2001
From: Lyova Potyomkin <lyova.potyomkin@gmail.com>
Date: Fri, 1 Nov 2024 12:43:12 +0200
Subject: [PATCH 02/42] feat: signer assertion and more events

---
 .../src/validators/SessionKeyValidator.sol       | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/packages/contracts/src/validators/SessionKeyValidator.sol b/packages/contracts/src/validators/SessionKeyValidator.sol
index 8926d5de..12ca49b7 100644
--- a/packages/contracts/src/validators/SessionKeyValidator.sol
+++ b/packages/contracts/src/validators/SessionKeyValidator.sol
@@ -300,14 +300,14 @@ contract SessionKeyValidator is IHook, IValidationHook, IModuleValidator, IModul
   using SessionLib for SessionLib.SessionStorage;
   using EnumerableSet for EnumerableSet.Bytes32Set;
 
-  // TODO: add more events for session state changes
   event SessionCreated(address indexed account, bytes32 indexed sessionHash, SessionLib.SessionSpec sessionSpec);
+  event SessionRevoked(address indexed account, bytes32 indexed sessionHash);
 
   bytes4 constant EIP1271_SUCCESS_RETURN_VALUE = 0x1626ba7e;
 
   // account => hashes of session specs
-  // Can be used to trustlessly revoke all session keys.
-  // TODO: Is emitting an event sufficient?
+  // Can be used to revoke all session keys in case offchain storage is not available.
+  // TODO: Is emitting an event sufficient instead?
   // mapping(address => EnumerableSet.Bytes32Set) private sessionHashes;
   mapping(address => uint256) private sessionCounter;
   // session hash => session state
@@ -398,6 +398,7 @@ contract SessionKeyValidator is IHook, IValidationHook, IModuleValidator, IModul
     sessionStates[sessionHash].status[msg.sender] = SessionLib.Status.Closed;
     // sessionHashes[msg.sender].remove(sessionHash);
     sessionCounter[msg.sender]--;
+    emit SessionRevoked(msg.sender, sessionHash);
   }
 
   function revokeKeys(bytes32[] calldata sessionHashes) external {
@@ -425,12 +426,7 @@ contract SessionKeyValidator is IHook, IValidationHook, IModuleValidator, IModul
    */
   function isValidSignature(bytes32 hash, bytes memory signature) public view returns (bytes4 magic) {
     magic = EIP1271_SUCCESS_RETURN_VALUE;
-    // TODO: Does this method have to work standalone? If not, validtionHook is sufficient for validation.
-    // (address recoveredAddress, ) = ECDSA.tryRecover(hash, signature);
-    // SessionLib.Status status = sessions[recoveredAddress].status[msg.sender];
-    // if (status != SessionLib.Status.Active) {
-    //   magic = bytes4(0);
-    // }
+    // TODO: Does this method have to work standalone? If not, validationHook is sufficient for validation.
   }
 
   function validationHook(bytes32 signedHash, Transaction calldata transaction, bytes calldata hookData) external {
@@ -441,7 +437,7 @@ contract SessionKeyValidator is IHook, IValidationHook, IModuleValidator, IModul
     }
     SessionLib.SessionSpec memory spec = abi.decode(hookData, (SessionLib.SessionSpec));
     (address recoveredAddress, ) = ECDSA.tryRecover(signedHash, signature);
-    require(recoveredAddress != address(0), "Invalid signer");
+    require(recoveredAddress == spec.signer, "Invalid signer");
     bytes32 sessionHash = keccak256(abi.encode(spec));
     sessionStates[sessionHash].validate(transaction, spec);
   }

From 82fc11d105250d86a0d8250ffc5d3380c049cc3c Mon Sep 17 00:00:00 2001
From: Lyova Potyomkin <lyova.potyomkin@gmail.com>
Date: Fri, 1 Nov 2024 12:47:18 +0200
Subject: [PATCH 03/42] chore: update abi

---
 packages/sdk/src/abi/SessionKeyModule.ts | 496 +++++++++++------------
 1 file changed, 227 insertions(+), 269 deletions(-)

diff --git a/packages/sdk/src/abi/SessionKeyModule.ts b/packages/sdk/src/abi/SessionKeyModule.ts
index 4a811d55..03ed6a25 100644
--- a/packages/sdk/src/abi/SessionKeyModule.ts
+++ b/packages/sdk/src/abi/SessionKeyModule.ts
@@ -48,23 +48,190 @@ export const SessionKeyModuleAbi = [
     type: "event",
   },
   {
+    anonymous: false,
     inputs: [
       {
+        indexed: true,
         internalType: "address",
         name: "account",
         type: "address",
       },
-    ],
-    name: "activeSigners",
-    outputs: [
       {
-        internalType: "address[]",
-        name: "",
-        type: "address[]",
+        indexed: true,
+        internalType: "bytes32",
+        name: "sessionHash",
+        type: "bytes32",
+      },
+      {
+        components: [
+          {
+            internalType: "address",
+            name: "signer",
+            type: "address",
+          },
+          {
+            internalType: "uint256",
+            name: "expiry",
+            type: "uint256",
+          },
+          {
+            components: [
+              {
+                internalType: "enum SessionLib.LimitType",
+                name: "limitType",
+                type: "uint8",
+              },
+              {
+                internalType: "uint256",
+                name: "limit",
+                type: "uint256",
+              },
+              {
+                internalType: "uint256",
+                name: "period",
+                type: "uint256",
+              },
+            ],
+            internalType: "struct SessionLib.UsageLimit",
+            name: "feeLimit",
+            type: "tuple",
+          },
+          {
+            components: [
+              {
+                internalType: "address",
+                name: "target",
+                type: "address",
+              },
+              {
+                internalType: "bytes4",
+                name: "selector",
+                type: "bytes4",
+              },
+              {
+                internalType: "uint256",
+                name: "maxValuePerUse",
+                type: "uint256",
+              },
+              {
+                components: [
+                  {
+                    internalType: "enum SessionLib.LimitType",
+                    name: "limitType",
+                    type: "uint8",
+                  },
+                  {
+                    internalType: "uint256",
+                    name: "limit",
+                    type: "uint256",
+                  },
+                  {
+                    internalType: "uint256",
+                    name: "period",
+                    type: "uint256",
+                  },
+                ],
+                internalType: "struct SessionLib.UsageLimit",
+                name: "valueLimit",
+                type: "tuple",
+              },
+              {
+                components: [
+                  {
+                    internalType: "enum SessionLib.Condition",
+                    name: "condition",
+                    type: "uint8",
+                  },
+                  {
+                    internalType: "uint64",
+                    name: "index",
+                    type: "uint64",
+                  },
+                  {
+                    internalType: "bytes32",
+                    name: "refValue",
+                    type: "bytes32",
+                  },
+                  {
+                    components: [
+                      {
+                        internalType: "enum SessionLib.LimitType",
+                        name: "limitType",
+                        type: "uint8",
+                      },
+                      {
+                        internalType: "uint256",
+                        name: "limit",
+                        type: "uint256",
+                      },
+                      {
+                        internalType: "uint256",
+                        name: "period",
+                        type: "uint256",
+                      },
+                    ],
+                    internalType: "struct SessionLib.UsageLimit",
+                    name: "limit",
+                    type: "tuple",
+                  },
+                ],
+                internalType: "struct SessionLib.Constraint[]",
+                name: "constraints",
+                type: "tuple[]",
+              },
+            ],
+            internalType: "struct SessionLib.CallSpec[]",
+            name: "callPolicies",
+            type: "tuple[]",
+          },
+          {
+            components: [
+              {
+                internalType: "address",
+                name: "target",
+                type: "address",
+              },
+              {
+                internalType: "uint256",
+                name: "maxValuePerUse",
+                type: "uint256",
+              },
+              {
+                components: [
+                  {
+                    internalType: "enum SessionLib.LimitType",
+                    name: "limitType",
+                    type: "uint8",
+                  },
+                  {
+                    internalType: "uint256",
+                    name: "limit",
+                    type: "uint256",
+                  },
+                  {
+                    internalType: "uint256",
+                    name: "period",
+                    type: "uint256",
+                  },
+                ],
+                internalType: "struct SessionLib.UsageLimit",
+                name: "valueLimit",
+                type: "tuple",
+              },
+            ],
+            internalType: "struct SessionLib.TransferSpec[]",
+            name: "transferPolicies",
+            type: "tuple[]",
+          },
+        ],
+        indexed: false,
+        internalType: "struct SessionLib.SessionSpec",
+        name: "sessionSpec",
+        type: "tuple",
       },
     ],
-    stateMutability: "view",
-    type: "function",
+    name: "SessionCreated",
+    type: "event",
   },
   {
     inputs: [
@@ -250,7 +417,7 @@ export const SessionKeyModuleAbi = [
           },
         ],
         internalType: "struct SessionLib.SessionSpec",
-        name: "newSession",
+        name: "sessionSpec",
         type: "tuple",
       },
     ],
@@ -449,121 +616,9 @@ export const SessionKeyModuleAbi = [
   {
     inputs: [
       {
-        internalType: "address",
-        name: "account",
-        type: "address",
-      },
-      {
-        internalType: "address",
-        name: "signer",
-        type: "address",
-      },
-    ],
-    name: "remainingSessionLimits",
-    outputs: [
-      {
-        components: [
-          {
-            internalType: "uint256",
-            name: "fee",
-            type: "uint256",
-          },
-          {
-            components: [
-              {
-                internalType: "uint256",
-                name: "remaining",
-                type: "uint256",
-              },
-              {
-                internalType: "address",
-                name: "target",
-                type: "address",
-              },
-              {
-                internalType: "bytes4",
-                name: "selector",
-                type: "bytes4",
-              },
-              {
-                internalType: "uint256",
-                name: "index",
-                type: "uint256",
-              },
-            ],
-            internalType: "struct SessionLib.LimitState[]",
-            name: "transferValue",
-            type: "tuple[]",
-          },
-          {
-            components: [
-              {
-                internalType: "uint256",
-                name: "remaining",
-                type: "uint256",
-              },
-              {
-                internalType: "address",
-                name: "target",
-                type: "address",
-              },
-              {
-                internalType: "bytes4",
-                name: "selector",
-                type: "bytes4",
-              },
-              {
-                internalType: "uint256",
-                name: "index",
-                type: "uint256",
-              },
-            ],
-            internalType: "struct SessionLib.LimitState[]",
-            name: "callValue",
-            type: "tuple[]",
-          },
-          {
-            components: [
-              {
-                internalType: "uint256",
-                name: "remaining",
-                type: "uint256",
-              },
-              {
-                internalType: "address",
-                name: "target",
-                type: "address",
-              },
-              {
-                internalType: "bytes4",
-                name: "selector",
-                type: "bytes4",
-              },
-              {
-                internalType: "uint256",
-                name: "index",
-                type: "uint256",
-              },
-            ],
-            internalType: "struct SessionLib.LimitState[]",
-            name: "callParams",
-            type: "tuple[]",
-          },
-        ],
-        internalType: "struct SessionLib.SessionState",
-        name: "",
-        type: "tuple",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "sessionOwner",
-        type: "address",
+        internalType: "bytes32",
+        name: "sessionHash",
+        type: "bytes32",
       },
     ],
     name: "revokeKey",
@@ -574,9 +629,9 @@ export const SessionKeyModuleAbi = [
   {
     inputs: [
       {
-        internalType: "address[]",
-        name: "owners",
-        type: "address[]",
+        internalType: "bytes32[]",
+        name: "sessionHashes",
+        type: "bytes32[]",
       },
     ],
     name: "revokeKeys",
@@ -591,19 +646,6 @@ export const SessionKeyModuleAbi = [
         name: "account",
         type: "address",
       },
-      {
-        internalType: "address",
-        name: "signer",
-        type: "address",
-      },
-    ],
-    name: "session",
-    outputs: [
-      {
-        internalType: "enum SessionLib.Status",
-        name: "status",
-        type: "uint8",
-      },
       {
         components: [
           {
@@ -771,60 +813,54 @@ export const SessionKeyModuleAbi = [
         type: "tuple",
       },
     ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "account",
-        type: "address",
-      },
-    ],
-    name: "sessionList",
+    name: "sessionState",
     outputs: [
-      {
-        internalType: "enum SessionLib.Status[]",
-        name: "statuses",
-        type: "uint8[]",
-      },
       {
         components: [
           {
-            internalType: "address",
-            name: "signer",
-            type: "address",
+            internalType: "enum SessionLib.Status",
+            name: "status",
+            type: "uint8",
           },
           {
             internalType: "uint256",
-            name: "expiry",
+            name: "fee",
             type: "uint256",
           },
           {
             components: [
-              {
-                internalType: "enum SessionLib.LimitType",
-                name: "limitType",
-                type: "uint8",
-              },
               {
                 internalType: "uint256",
-                name: "limit",
+                name: "remaining",
                 type: "uint256",
               },
+              {
+                internalType: "address",
+                name: "target",
+                type: "address",
+              },
+              {
+                internalType: "bytes4",
+                name: "selector",
+                type: "bytes4",
+              },
               {
                 internalType: "uint256",
-                name: "period",
+                name: "index",
                 type: "uint256",
               },
             ],
-            internalType: "struct SessionLib.UsageLimit",
-            name: "feeLimit",
-            type: "tuple",
+            internalType: "struct SessionLib.LimitState[]",
+            name: "transferValue",
+            type: "tuple[]",
           },
           {
             components: [
+              {
+                internalType: "uint256",
+                name: "remaining",
+                type: "uint256",
+              },
               {
                 internalType: "address",
                 name: "target",
@@ -837,123 +873,45 @@ export const SessionKeyModuleAbi = [
               },
               {
                 internalType: "uint256",
-                name: "maxValuePerUse",
+                name: "index",
                 type: "uint256",
               },
-              {
-                components: [
-                  {
-                    internalType: "enum SessionLib.LimitType",
-                    name: "limitType",
-                    type: "uint8",
-                  },
-                  {
-                    internalType: "uint256",
-                    name: "limit",
-                    type: "uint256",
-                  },
-                  {
-                    internalType: "uint256",
-                    name: "period",
-                    type: "uint256",
-                  },
-                ],
-                internalType: "struct SessionLib.UsageLimit",
-                name: "valueLimit",
-                type: "tuple",
-              },
-              {
-                components: [
-                  {
-                    internalType: "enum SessionLib.Condition",
-                    name: "condition",
-                    type: "uint8",
-                  },
-                  {
-                    internalType: "uint64",
-                    name: "index",
-                    type: "uint64",
-                  },
-                  {
-                    internalType: "bytes32",
-                    name: "refValue",
-                    type: "bytes32",
-                  },
-                  {
-                    components: [
-                      {
-                        internalType: "enum SessionLib.LimitType",
-                        name: "limitType",
-                        type: "uint8",
-                      },
-                      {
-                        internalType: "uint256",
-                        name: "limit",
-                        type: "uint256",
-                      },
-                      {
-                        internalType: "uint256",
-                        name: "period",
-                        type: "uint256",
-                      },
-                    ],
-                    internalType: "struct SessionLib.UsageLimit",
-                    name: "limit",
-                    type: "tuple",
-                  },
-                ],
-                internalType: "struct SessionLib.Constraint[]",
-                name: "constraints",
-                type: "tuple[]",
-              },
             ],
-            internalType: "struct SessionLib.CallSpec[]",
-            name: "callPolicies",
+            internalType: "struct SessionLib.LimitState[]",
+            name: "callValue",
             type: "tuple[]",
           },
           {
             components: [
+              {
+                internalType: "uint256",
+                name: "remaining",
+                type: "uint256",
+              },
               {
                 internalType: "address",
                 name: "target",
                 type: "address",
               },
               {
-                internalType: "uint256",
-                name: "maxValuePerUse",
-                type: "uint256",
+                internalType: "bytes4",
+                name: "selector",
+                type: "bytes4",
               },
               {
-                components: [
-                  {
-                    internalType: "enum SessionLib.LimitType",
-                    name: "limitType",
-                    type: "uint8",
-                  },
-                  {
-                    internalType: "uint256",
-                    name: "limit",
-                    type: "uint256",
-                  },
-                  {
-                    internalType: "uint256",
-                    name: "period",
-                    type: "uint256",
-                  },
-                ],
-                internalType: "struct SessionLib.UsageLimit",
-                name: "valueLimit",
-                type: "tuple",
+                internalType: "uint256",
+                name: "index",
+                type: "uint256",
               },
             ],
-            internalType: "struct SessionLib.TransferSpec[]",
-            name: "transferPolicies",
+            internalType: "struct SessionLib.LimitState[]",
+            name: "callParams",
             type: "tuple[]",
           },
         ],
-        internalType: "struct SessionLib.SessionSpec[]",
-        name: "specs",
-        type: "tuple[]",
+        internalType: "struct SessionLib.SessionState",
+        name: "",
+        type: "tuple",
       },
     ],
     stateMutability: "view",
@@ -1074,7 +1032,7 @@ export const SessionKeyModuleAbi = [
       },
       {
         internalType: "bytes",
-        name: "_hookData",
+        name: "hookData",
         type: "bytes",
       },
     ],

From efd733acc8dc2a8ae2557acb8f7979e00ebf0a38 Mon Sep 17 00:00:00 2001
From: Lyova Potyomkin <lyova.potyomkin@gmail.com>
Date: Fri, 1 Nov 2024 12:53:26 +0200
Subject: [PATCH 04/42] fix: remove max_constraints

---
 .../contracts/src/validators/SessionKeyValidator.sol   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/contracts/src/validators/SessionKeyValidator.sol b/packages/contracts/src/validators/SessionKeyValidator.sol
index 12ca49b7..2c9896a5 100644
--- a/packages/contracts/src/validators/SessionKeyValidator.sol
+++ b/packages/contracts/src/validators/SessionKeyValidator.sol
@@ -20,9 +20,6 @@ library SessionLib {
   using SessionLib for SessionLib.Constraint;
   using SessionLib for SessionLib.UsageLimit;
 
-  // TODO: we don't need to store constraints, so we can remove this restriction
-  uint256 constant MAX_CONSTRAINTS = 16;
-
   // We do not permit session keys to be reused to open multiple sessions
   // (after one expires or is closed, e.g.).
   // For each session key, its session status can only be changed
@@ -240,9 +237,14 @@ library SessionLib {
     address account,
     SessionSpec calldata spec
   ) internal view returns (SessionState memory) {
+    uint256 totalConstraints = 0;
+    for (uint256 i = 0; i < spec.callPolicies.length; i++) {
+      totalConstraints += spec.callPolicies[i].constraints.length;
+    }
+
     LimitState[] memory transferValue = new LimitState[](spec.transferPolicies.length);
     LimitState[] memory callValue = new LimitState[](spec.callPolicies.length);
-    LimitState[] memory callParams = new LimitState[](MAX_CONSTRAINTS * spec.callPolicies.length); // there will be empty ones at the end
+    LimitState[] memory callParams = new LimitState[](totalConstraints); // there will be empty ones at the end
     uint256 paramLimitIndex = 0;
 
     for (uint256 i = 0; i < transferValue.length; i++) {

From edb247203acd1e27e4a9786821a54166d44626b2 Mon Sep 17 00:00:00 2001
From: Lyova Potyomkin <lyova.potyomkin@gmail.com>
Date: Fri, 1 Nov 2024 14:03:04 +0200
Subject: [PATCH 05/42] chore: rename

---
 .../src/validators/SessionKeyValidator.sol    | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/packages/contracts/src/validators/SessionKeyValidator.sol b/packages/contracts/src/validators/SessionKeyValidator.sol
index 2c9896a5..e70739fb 100644
--- a/packages/contracts/src/validators/SessionKeyValidator.sol
+++ b/packages/contracts/src/validators/SessionKeyValidator.sol
@@ -313,13 +313,17 @@ contract SessionKeyValidator is IHook, IValidationHook, IModuleValidator, IModul
   // mapping(address => EnumerableSet.Bytes32Set) private sessionHashes;
   mapping(address => uint256) private sessionCounter;
   // session hash => session state
-  mapping(bytes32 => SessionLib.SessionStorage) private sessionStates;
+  mapping(bytes32 => SessionLib.SessionStorage) private sessions;
 
   function sessionState(
     address account,
     SessionLib.SessionSpec calldata spec
   ) external view returns (SessionLib.SessionState memory) {
-    return sessionStates[keccak256(abi.encode(spec))].getState(account, spec);
+    return sessions[keccak256(abi.encode(spec))].getState(account, spec);
+  }
+
+  function sessionStatus(address account, bytes32 sessionHash) external view returns (SessionLib.Status) {
+    return sessions[sessionHash].status[account];
   }
 
   function handleValidation(bytes32 signedHash, bytes memory signature) external view returns (bool) {
@@ -340,14 +344,11 @@ contract SessionKeyValidator is IHook, IValidationHook, IModuleValidator, IModul
     bytes32 sessionHash = keccak256(abi.encode(sessionSpec));
     require(_isInitialized(msg.sender), "Account not initialized");
     require(sessionSpec.signer != address(0), "Invalid signer");
-    require(
-      sessionStates[sessionHash].status[msg.sender] == SessionLib.Status.NotInitialized,
-      "Session already exists"
-    );
+    require(sessions[sessionHash].status[msg.sender] == SessionLib.Status.NotInitialized, "Session already exists");
     require(sessionSpec.feeLimit.limitType != SessionLib.LimitType.Unlimited, "Unlimited fee allowance is not safe");
     // sessionHashes[msg.sender].add(sessionHash);
     sessionCounter[msg.sender]++;
-    sessionStates[sessionHash].status[msg.sender] = SessionLib.Status.Active;
+    sessions[sessionHash].status[msg.sender] = SessionLib.Status.Active;
     emit SessionCreated(msg.sender, sessionHash, sessionSpec);
   }
 
@@ -396,8 +397,8 @@ contract SessionKeyValidator is IHook, IValidationHook, IModuleValidator, IModul
 
   // TODO: make the session owner able revoke its own key, in case it was leaked, to prevent further misuse?
   function revokeKey(bytes32 sessionHash) public {
-    require(sessionStates[sessionHash].status[msg.sender] == SessionLib.Status.Active, "Nothing to revoke");
-    sessionStates[sessionHash].status[msg.sender] = SessionLib.Status.Closed;
+    require(sessions[sessionHash].status[msg.sender] == SessionLib.Status.Active, "Nothing to revoke");
+    sessions[sessionHash].status[msg.sender] = SessionLib.Status.Closed;
     // sessionHashes[msg.sender].remove(sessionHash);
     sessionCounter[msg.sender]--;
     emit SessionRevoked(msg.sender, sessionHash);
@@ -441,7 +442,7 @@ contract SessionKeyValidator is IHook, IValidationHook, IModuleValidator, IModul
     (address recoveredAddress, ) = ECDSA.tryRecover(signedHash, signature);
     require(recoveredAddress == spec.signer, "Invalid signer");
     bytes32 sessionHash = keccak256(abi.encode(spec));
-    sessionStates[sessionHash].validate(transaction, spec);
+    sessions[sessionHash].validate(transaction, spec);
   }
 
   /**

From 9c5db0723e3af289f73cd7cdc0c52eb9547fde7a Mon Sep 17 00:00:00 2001
From: Lyova Potyomkin <lyova.potyomkin@gmail.com>
Date: Sun, 3 Nov 2024 00:24:08 +0200
Subject: [PATCH 06/42] fix: update abi

---
 packages/sdk/src/abi/SessionKeyModule.ts | 544 ++++++++++-------------
 1 file changed, 226 insertions(+), 318 deletions(-)

diff --git a/packages/sdk/src/abi/SessionKeyModule.ts b/packages/sdk/src/abi/SessionKeyModule.ts
index fff115c1..c21f3b2b 100644
--- a/packages/sdk/src/abi/SessionKeyModule.ts
+++ b/packages/sdk/src/abi/SessionKeyModule.ts
@@ -48,23 +48,209 @@ export const SessionKeyModuleAbi = [
     type: "event",
   },
   {
+    anonymous: false,
     inputs: [
       {
+        indexed: true,
         internalType: "address",
         name: "account",
         type: "address",
       },
+      {
+        indexed: true,
+        internalType: "bytes32",
+        name: "sessionHash",
+        type: "bytes32",
+      },
+      {
+        components: [
+          {
+            internalType: "address",
+            name: "signer",
+            type: "address",
+          },
+          {
+            internalType: "uint256",
+            name: "expiresAt",
+            type: "uint256",
+          },
+          {
+            components: [
+              {
+                internalType: "enum SessionLib.LimitType",
+                name: "limitType",
+                type: "uint8",
+              },
+              {
+                internalType: "uint256",
+                name: "limit",
+                type: "uint256",
+              },
+              {
+                internalType: "uint256",
+                name: "period",
+                type: "uint256",
+              },
+            ],
+            internalType: "struct SessionLib.UsageLimit",
+            name: "feeLimit",
+            type: "tuple",
+          },
+          {
+            components: [
+              {
+                internalType: "address",
+                name: "target",
+                type: "address",
+              },
+              {
+                internalType: "bytes4",
+                name: "selector",
+                type: "bytes4",
+              },
+              {
+                internalType: "uint256",
+                name: "maxValuePerUse",
+                type: "uint256",
+              },
+              {
+                components: [
+                  {
+                    internalType: "enum SessionLib.LimitType",
+                    name: "limitType",
+                    type: "uint8",
+                  },
+                  {
+                    internalType: "uint256",
+                    name: "limit",
+                    type: "uint256",
+                  },
+                  {
+                    internalType: "uint256",
+                    name: "period",
+                    type: "uint256",
+                  },
+                ],
+                internalType: "struct SessionLib.UsageLimit",
+                name: "valueLimit",
+                type: "tuple",
+              },
+              {
+                components: [
+                  {
+                    internalType: "enum SessionLib.Condition",
+                    name: "condition",
+                    type: "uint8",
+                  },
+                  {
+                    internalType: "uint64",
+                    name: "index",
+                    type: "uint64",
+                  },
+                  {
+                    internalType: "bytes32",
+                    name: "refValue",
+                    type: "bytes32",
+                  },
+                  {
+                    components: [
+                      {
+                        internalType: "enum SessionLib.LimitType",
+                        name: "limitType",
+                        type: "uint8",
+                      },
+                      {
+                        internalType: "uint256",
+                        name: "limit",
+                        type: "uint256",
+                      },
+                      {
+                        internalType: "uint256",
+                        name: "period",
+                        type: "uint256",
+                      },
+                    ],
+                    internalType: "struct SessionLib.UsageLimit",
+                    name: "limit",
+                    type: "tuple",
+                  },
+                ],
+                internalType: "struct SessionLib.Constraint[]",
+                name: "constraints",
+                type: "tuple[]",
+              },
+            ],
+            internalType: "struct SessionLib.CallSpec[]",
+            name: "callPolicies",
+            type: "tuple[]",
+          },
+          {
+            components: [
+              {
+                internalType: "address",
+                name: "target",
+                type: "address",
+              },
+              {
+                internalType: "uint256",
+                name: "maxValuePerUse",
+                type: "uint256",
+              },
+              {
+                components: [
+                  {
+                    internalType: "enum SessionLib.LimitType",
+                    name: "limitType",
+                    type: "uint8",
+                  },
+                  {
+                    internalType: "uint256",
+                    name: "limit",
+                    type: "uint256",
+                  },
+                  {
+                    internalType: "uint256",
+                    name: "period",
+                    type: "uint256",
+                  },
+                ],
+                internalType: "struct SessionLib.UsageLimit",
+                name: "valueLimit",
+                type: "tuple",
+              },
+            ],
+            internalType: "struct SessionLib.TransferSpec[]",
+            name: "transferPolicies",
+            type: "tuple[]",
+          },
+        ],
+        indexed: false,
+        internalType: "struct SessionLib.SessionSpec",
+        name: "sessionSpec",
+        type: "tuple",
+      },
     ],
-    name: "activeSigners",
-    outputs: [
+    name: "SessionCreated",
+    type: "event",
+  },
+  {
+    anonymous: false,
+    inputs: [
       {
-        internalType: "address[]",
-        name: "",
-        type: "address[]",
+        indexed: true,
+        internalType: "address",
+        name: "account",
+        type: "address",
+      },
+      {
+        indexed: true,
+        internalType: "bytes32",
+        name: "sessionHash",
+        type: "bytes32",
       },
     ],
-    stateMutability: "view",
-    type: "function",
+    name: "SessionRevoked",
+    type: "event",
   },
   {
     inputs: [
@@ -250,7 +436,7 @@ export const SessionKeyModuleAbi = [
           },
         ],
         internalType: "struct SessionLib.SessionSpec",
-        name: "newSession",
+        name: "sessionSpec",
         type: "tuple",
       },
     ],
@@ -449,9 +635,9 @@ export const SessionKeyModuleAbi = [
   {
     inputs: [
       {
-        internalType: "address",
-        name: "sessionOwner",
-        type: "address",
+        internalType: "bytes32",
+        name: "sessionHash",
+        type: "bytes32",
       },
     ],
     name: "revokeKey",
@@ -462,9 +648,9 @@ export const SessionKeyModuleAbi = [
   {
     inputs: [
       {
-        internalType: "address[]",
-        name: "owners",
-        type: "address[]",
+        internalType: "bytes32[]",
+        name: "sessionHashes",
+        type: "bytes32[]",
       },
     ],
     name: "revokeKeys",
@@ -479,292 +665,6 @@ export const SessionKeyModuleAbi = [
         name: "account",
         type: "address",
       },
-    ],
-    name: "sessionList",
-    outputs: [
-      {
-        components: [
-          {
-            internalType: "enum SessionLib.Status",
-            name: "status",
-            type: "uint8",
-          },
-          {
-            internalType: "uint256",
-            name: "fee",
-            type: "uint256",
-          },
-          {
-            components: [
-              {
-                internalType: "uint256",
-                name: "remaining",
-                type: "uint256",
-              },
-              {
-                internalType: "address",
-                name: "target",
-                type: "address",
-              },
-              {
-                internalType: "bytes4",
-                name: "selector",
-                type: "bytes4",
-              },
-              {
-                internalType: "uint256",
-                name: "index",
-                type: "uint256",
-              },
-            ],
-            internalType: "struct SessionLib.LimitState[]",
-            name: "transferValue",
-            type: "tuple[]",
-          },
-          {
-            components: [
-              {
-                internalType: "uint256",
-                name: "remaining",
-                type: "uint256",
-              },
-              {
-                internalType: "address",
-                name: "target",
-                type: "address",
-              },
-              {
-                internalType: "bytes4",
-                name: "selector",
-                type: "bytes4",
-              },
-              {
-                internalType: "uint256",
-                name: "index",
-                type: "uint256",
-              },
-            ],
-            internalType: "struct SessionLib.LimitState[]",
-            name: "callValue",
-            type: "tuple[]",
-          },
-          {
-            components: [
-              {
-                internalType: "uint256",
-                name: "remaining",
-                type: "uint256",
-              },
-              {
-                internalType: "address",
-                name: "target",
-                type: "address",
-              },
-              {
-                internalType: "bytes4",
-                name: "selector",
-                type: "bytes4",
-              },
-              {
-                internalType: "uint256",
-                name: "index",
-                type: "uint256",
-              },
-            ],
-            internalType: "struct SessionLib.LimitState[]",
-            name: "callParams",
-            type: "tuple[]",
-          },
-        ],
-        internalType: "struct SessionLib.SessionState[]",
-        name: "states",
-        type: "tuple[]",
-      },
-      {
-        components: [
-          {
-            internalType: "address",
-            name: "signer",
-            type: "address",
-          },
-          {
-            internalType: "uint256",
-            name: "expiresAt",
-            type: "uint256",
-          },
-          {
-            components: [
-              {
-                internalType: "enum SessionLib.LimitType",
-                name: "limitType",
-                type: "uint8",
-              },
-              {
-                internalType: "uint256",
-                name: "limit",
-                type: "uint256",
-              },
-              {
-                internalType: "uint256",
-                name: "period",
-                type: "uint256",
-              },
-            ],
-            internalType: "struct SessionLib.UsageLimit",
-            name: "feeLimit",
-            type: "tuple",
-          },
-          {
-            components: [
-              {
-                internalType: "address",
-                name: "target",
-                type: "address",
-              },
-              {
-                internalType: "bytes4",
-                name: "selector",
-                type: "bytes4",
-              },
-              {
-                internalType: "uint256",
-                name: "maxValuePerUse",
-                type: "uint256",
-              },
-              {
-                components: [
-                  {
-                    internalType: "enum SessionLib.LimitType",
-                    name: "limitType",
-                    type: "uint8",
-                  },
-                  {
-                    internalType: "uint256",
-                    name: "limit",
-                    type: "uint256",
-                  },
-                  {
-                    internalType: "uint256",
-                    name: "period",
-                    type: "uint256",
-                  },
-                ],
-                internalType: "struct SessionLib.UsageLimit",
-                name: "valueLimit",
-                type: "tuple",
-              },
-              {
-                components: [
-                  {
-                    internalType: "enum SessionLib.Condition",
-                    name: "condition",
-                    type: "uint8",
-                  },
-                  {
-                    internalType: "uint64",
-                    name: "index",
-                    type: "uint64",
-                  },
-                  {
-                    internalType: "bytes32",
-                    name: "refValue",
-                    type: "bytes32",
-                  },
-                  {
-                    components: [
-                      {
-                        internalType: "enum SessionLib.LimitType",
-                        name: "limitType",
-                        type: "uint8",
-                      },
-                      {
-                        internalType: "uint256",
-                        name: "limit",
-                        type: "uint256",
-                      },
-                      {
-                        internalType: "uint256",
-                        name: "period",
-                        type: "uint256",
-                      },
-                    ],
-                    internalType: "struct SessionLib.UsageLimit",
-                    name: "limit",
-                    type: "tuple",
-                  },
-                ],
-                internalType: "struct SessionLib.Constraint[]",
-                name: "constraints",
-                type: "tuple[]",
-              },
-            ],
-            internalType: "struct SessionLib.CallSpec[]",
-            name: "callPolicies",
-            type: "tuple[]",
-          },
-          {
-            components: [
-              {
-                internalType: "address",
-                name: "target",
-                type: "address",
-              },
-              {
-                internalType: "uint256",
-                name: "maxValuePerUse",
-                type: "uint256",
-              },
-              {
-                components: [
-                  {
-                    internalType: "enum SessionLib.LimitType",
-                    name: "limitType",
-                    type: "uint8",
-                  },
-                  {
-                    internalType: "uint256",
-                    name: "limit",
-                    type: "uint256",
-                  },
-                  {
-                    internalType: "uint256",
-                    name: "period",
-                    type: "uint256",
-                  },
-                ],
-                internalType: "struct SessionLib.UsageLimit",
-                name: "valueLimit",
-                type: "tuple",
-              },
-            ],
-            internalType: "struct SessionLib.TransferSpec[]",
-            name: "transferPolicies",
-            type: "tuple[]",
-          },
-        ],
-        internalType: "struct SessionLib.SessionSpec[]",
-        name: "specs",
-        type: "tuple[]",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "account",
-        type: "address",
-      },
-      {
-        internalType: "address",
-        name: "signer",
-        type: "address",
-      },
-    ],
-    name: "sessionSpec",
-    outputs: [
       {
         components: [
           {
@@ -932,22 +832,6 @@ export const SessionKeyModuleAbi = [
         type: "tuple",
       },
     ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "account",
-        type: "address",
-      },
-      {
-        internalType: "address",
-        name: "signer",
-        type: "address",
-      },
-    ],
     name: "sessionState",
     outputs: [
       {
@@ -959,7 +843,7 @@ export const SessionKeyModuleAbi = [
           },
           {
             internalType: "uint256",
-            name: "fee",
+            name: "feesRemaining",
             type: "uint256",
           },
           {
@@ -1052,6 +936,30 @@ export const SessionKeyModuleAbi = [
     stateMutability: "view",
     type: "function",
   },
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "account",
+        type: "address",
+      },
+      {
+        internalType: "bytes32",
+        name: "sessionHash",
+        type: "bytes32",
+      },
+    ],
+    name: "sessionStatus",
+    outputs: [
+      {
+        internalType: "enum SessionLib.Status",
+        name: "",
+        type: "uint8",
+      },
+    ],
+    stateMutability: "view",
+    type: "function",
+  },
   {
     inputs: [
       {
@@ -1167,7 +1075,7 @@ export const SessionKeyModuleAbi = [
       },
       {
         internalType: "bytes",
-        name: "_hookData",
+        name: "hookData",
         type: "bytes",
       },
     ],

From 3bce3f0f0619311d564d7e1ac4a3a21906a823aa Mon Sep 17 00:00:00 2001
From: Lyova Potyomkin <lyova.potyomkin@gmail.com>
Date: Sun, 3 Nov 2024 00:55:47 +0200
Subject: [PATCH 07/42] fix: gas estimation

---
 packages/contracts/test/SessionKeyTest.ts | 14 +++++++++++---
 packages/contracts/test/utils.ts          | 14 +++++++++++++-
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/packages/contracts/test/SessionKeyTest.ts b/packages/contracts/test/SessionKeyTest.ts
index 8781643d..b1b4d1a5 100644
--- a/packages/contracts/test/SessionKeyTest.ts
+++ b/packages/contracts/test/SessionKeyTest.ts
@@ -142,12 +142,14 @@ class SessionTester {
       ...await this.aaTxTemplate(),
       ...txRequest,
     };
-    // FIXME gas estimation is incorrect
+    // TODO: uncomment once gas estimation is fixed one era-test-node.
+    // It works fine with the local server.
     // aaTx.gasLimit = await provider.estimateGas(aaTx);
 
     const signedTransaction = await this.sessionAccount.signTransaction(aaTx);
     const tx = await provider.broadcastTransaction(signedTransaction);
-    await tx.wait();
+    const receipt = await tx.wait();
+    logInfo(`\`sessionTx\` gas used: ${receipt.gasUsed}`);
   }
 
   async sendTxFail(tx: ethers.TransactionRequest = {}) {
@@ -216,7 +218,13 @@ class SessionTester {
       chainId: (await provider.getNetwork()).chainId,
       nonce: await provider.getTransactionCount(this.proxyAccountAddress),
       gasPrice: await provider.getGasPrice(),
-      customData: { gasPerPubdata: utils.DEFAULT_GAS_PER_PUBDATA_LIMIT },
+      customData: {
+        gasPerPubdata: utils.DEFAULT_GAS_PER_PUBDATA_LIMIT,
+        customSignature: abiCoder.encode(
+          ["bytes", "address", "bytes[]"],
+          [ethers.zeroPadValue("0x1b", 65), await fixtures.getSessionKeyModuleAddress(), [await this.encodeSession()]],
+        ),
+      },
       gasLimit: 0n,
     };
   }
diff --git a/packages/contracts/test/utils.ts b/packages/contracts/test/utils.ts
index b112aec2..0313a10b 100644
--- a/packages/contracts/test/utils.ts
+++ b/packages/contracts/test/utils.ts
@@ -128,12 +128,24 @@ export class ContractFixtures {
 // Load env file
 dotenv.config();
 
+// TODO: remove once SDK fix is released
+class FixedProvider extends Provider {
+  getRpcTransaction(tx: ethers.TransactionRequest) {
+    const result = <any> super.getRpcTransaction(tx);
+    if (tx.customData?.customSignature) {
+      result.eip712Meta ??= {};
+      result.eip712Meta.customSignature = Array.from(ethers.getBytes(tx.customData.customSignature));
+    }
+    return result;
+  }
+}
+
 export const getProvider = () => {
   const rpcUrl = hre.network.config["url"];
   if (!rpcUrl) throw `⛔️ RPC URL wasn't found in "${hre.network.name}"! Please add a "url" field to the network config in hardhat.config.ts`;
 
   // Initialize ZKsync Provider
-  const provider = new Provider(rpcUrl);
+  const provider = new FixedProvider(rpcUrl);
 
   return provider;
 };

From 109a2fbcbe5917f091aac0a19a704facaa44be86 Mon Sep 17 00:00:00 2001
From: Lyova Potyomkin <lyova.potyomkin@gmail.com>
Date: Sun, 3 Nov 2024 01:16:44 +0200
Subject: [PATCH 08/42] chore: add more logs

---
 packages/contracts/test/SessionKeyTest.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/contracts/test/SessionKeyTest.ts b/packages/contracts/test/SessionKeyTest.ts
index b1b4d1a5..4441f346 100644
--- a/packages/contracts/test/SessionKeyTest.ts
+++ b/packages/contracts/test/SessionKeyTest.ts
@@ -145,6 +145,7 @@ class SessionTester {
     // TODO: uncomment once gas estimation is fixed one era-test-node.
     // It works fine with the local server.
     // aaTx.gasLimit = await provider.estimateGas(aaTx);
+    logInfo(`\`sessionTx\` gas estimated: ${await provider.estimateGas(aaTx)}`);
 
     const signedTransaction = await this.sessionAccount.signTransaction(aaTx);
     const tx = await provider.broadcastTransaction(signedTransaction);

From 077ec6e40839651911cd38487c42dd127d18cf7a Mon Sep 17 00:00:00 2001
From: Lyova Potyomkin <lyova.potyomkin@gmail.com>
Date: Mon, 11 Nov 2024 15:41:47 +0200
Subject: [PATCH 09/42] chore: update sdk

---
 packages/contracts/package.json           |   2 +-
 packages/contracts/test/utils.ts          |  14 +--
 packages/demo-app/package.json            |   2 +-
 packages/nft-quest-contracts/package.json |   2 +-
 packages/nft-quest/package.json           |   2 +-
 pnpm-lock.yaml                            | 124 ++++++++++------------
 6 files changed, 64 insertions(+), 82 deletions(-)

diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index 2a6fd0eb..5fb19fa8 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -33,7 +33,7 @@
     "ts-node": "10.9.2",
     "typechain": "8.3.2",
     "typescript": "5.6.2",
-    "zksync-ethers": "6.13.0"
+    "zksync-ethers": "6.15.0"
   },
   "dependencies": {
     "@matterlabs/zksync-contracts": "^0.6.1",
diff --git a/packages/contracts/test/utils.ts b/packages/contracts/test/utils.ts
index 2e40fd60..93cb1606 100644
--- a/packages/contracts/test/utils.ts
+++ b/packages/contracts/test/utils.ts
@@ -122,24 +122,12 @@ export class ContractFixtures {
 // Load env file
 dotenv.config();
 
-// TODO: remove once SDK fix is released
-class FixedProvider extends Provider {
-  getRpcTransaction(tx: ethers.TransactionRequest) {
-    const result = <any> super.getRpcTransaction(tx);
-    if (tx.customData?.customSignature) {
-      result.eip712Meta ??= {};
-      result.eip712Meta.customSignature = Array.from(ethers.getBytes(tx.customData.customSignature));
-    }
-    return result;
-  }
-}
-
 export const getProvider = () => {
   const rpcUrl = hre.network.config["url"];
   if (!rpcUrl) throw `⛔️ RPC URL wasn't found in "${hre.network.name}"! Please add a "url" field to the network config in hardhat.config.ts`;
 
   // Initialize ZKsync Provider
-  const provider = new FixedProvider(rpcUrl);
+  const provider = new Provider(rpcUrl);
 
   return provider;
 };
diff --git a/packages/demo-app/package.json b/packages/demo-app/package.json
index 187c4121..20e11166 100644
--- a/packages/demo-app/package.json
+++ b/packages/demo-app/package.json
@@ -21,7 +21,7 @@
     "vue": "^3.4.21",
     "wagmi": "^2.12.17",
     "zksync-sso": "workspace:*",
-    "zksync-ethers": "^6.12.1"
+    "zksync-ethers": "^6.15.0"
   },
   "devDependencies": {
     "@nuxt/eslint": "^0.5.7",
diff --git a/packages/nft-quest-contracts/package.json b/packages/nft-quest-contracts/package.json
index edffb729..1b28a380 100644
--- a/packages/nft-quest-contracts/package.json
+++ b/packages/nft-quest-contracts/package.json
@@ -19,6 +19,6 @@
     "mocha": "^10.7.0",
     "ts-node": "^10.9.2",
     "typescript": "^5.5.4",
-    "zksync-ethers": "^6.11.0"
+    "zksync-ethers": "^6.15.0"
   }
 }
diff --git a/packages/nft-quest/package.json b/packages/nft-quest/package.json
index fa067c30..4e2cf038 100644
--- a/packages/nft-quest/package.json
+++ b/packages/nft-quest/package.json
@@ -37,7 +37,7 @@
     "vue-load-image": "^1.1.0",
     "vue-router": "latest",
     "zksync-sso": "workspace:*",
-    "zksync-ethers": "^6.14.0"
+    "zksync-ethers": "^6.15.0"
   },
   "devDependencies": {
     "@nuxtjs/tailwindcss": "^6.12.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b2dd7f4f..ff3b2f35 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -279,10 +279,10 @@ importers:
         version: 0.2.2
       '@matterlabs/hardhat-zksync':
         specifier: 1.2.0
-        version: 1.2.0(s5mnuinjslozaedgq4f5sjptyy)
+        version: 1.2.0(e32ijlvs4nitlwogqpjpupt3om)
       '@matterlabs/hardhat-zksync-deploy':
         specifier: 1.5.0
-        version: 1.5.0(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))(zksync-ethers@6.13.0(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10)))
+        version: 1.5.0(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))(zksync-ethers@6.15.0(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10)))
       '@nomicfoundation/hardhat-chai-matchers':
         specifier: 2.0.8
         version: 2.0.8(@nomicfoundation/hardhat-ethers@3.0.8(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)))(chai@4.5.0)(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))
@@ -341,8 +341,8 @@ importers:
         specifier: 8.3.2
         version: 8.3.2(typescript@5.6.2)
       zksync-ethers:
-        specifier: 6.13.0
-        version: 6.13.0(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10))
+        specifier: 6.15.0
+        version: 6.15.0(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10))
 
   packages/demo-app:
     dependencies:
@@ -386,8 +386,8 @@ importers:
         specifier: ^2.12.17
         version: 2.12.25(@tanstack/query-core@5.59.16)(@tanstack/react-query@5.59.16(react@18.3.1))(bufferutil@4.0.8)(ioredis@5.4.1)(react-native@0.76.0(@babel/core@7.26.0)(@babel/preset-env@7.26.0(@babel/core@7.26.0))(bufferutil@4.0.8)(react@18.3.1)(utf-8-validate@5.0.10))(react@18.3.1)(typescript@5.6.2)(utf-8-validate@5.0.10)(viem@2.21.14(bufferutil@4.0.8)(typescript@5.6.2)(utf-8-validate@5.0.10)(zod@3.22.4))(zod@3.22.4)
       zksync-ethers:
-        specifier: ^6.12.1
-        version: 6.14.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))
+        specifier: ^6.15.0
+        version: 6.15.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))
       zksync-sso:
         specifier: workspace:*
         version: link:../sdk
@@ -409,7 +409,7 @@ importers:
     dependencies:
       '@matterlabs/hardhat-zksync':
         specifier: 1.2.0
-        version: 1.2.0(jq27lisszh63x44gykkfav2efe)
+        version: 1.2.0(gzbl74e4hs234pcoapof4dgi5a)
       '@matterlabs/zksync-contracts':
         specifier: ^0.6.1
         version: 0.6.1(@openzeppelin/contracts-upgradeable@4.9.6)(@openzeppelin/contracts@4.9.6)
@@ -492,8 +492,8 @@ importers:
         specifier: latest
         version: 4.4.5(vue@3.5.12(typescript@5.6.2))
       zksync-ethers:
-        specifier: ^6.14.0
-        version: 6.14.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))
+        specifier: ^6.15.0
+        version: 6.15.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))
       zksync-sso:
         specifier: workspace:*
         version: link:../sdk
@@ -515,7 +515,7 @@ importers:
     devDependencies:
       '@matterlabs/hardhat-zksync':
         specifier: ^1.1.0
-        version: 1.2.0(jq27lisszh63x44gykkfav2efe)
+        version: 1.2.0(gzbl74e4hs234pcoapof4dgi5a)
       '@matterlabs/zksync-contracts':
         specifier: ^0.6.1
         version: 0.6.1(@openzeppelin/contracts-upgradeable@4.9.6)(@openzeppelin/contracts@4.9.6)
@@ -553,8 +553,8 @@ importers:
         specifier: ^5.5.4
         version: 5.6.2
       zksync-ethers:
-        specifier: ^6.11.0
-        version: 6.14.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))
+        specifier: ^6.15.0
+        version: 6.15.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))
 
   packages/sdk:
     dependencies:
@@ -11122,14 +11122,8 @@ packages:
     resolution: {integrity: sha512-zK7YHHz4ZXpW89AHXUPbQVGKI7uvkd3hzusTdotCg1UxyaVtg0zFJSTfW/Dq5f7OBBVnq6cZIaC8Ti4hb6dtCA==}
     engines: {node: '>= 14'}
 
-  zksync-ethers@6.13.0:
-    resolution: {integrity: sha512-BQH2w9vqinjI4lcC2A+AYU+X/7ZPPMrzn7xPqFtC+yrzWoKhmTaTvyX2ssYuXMStqNyEfDjNNBKkS8IZLaFL6w==}
-    engines: {node: '>=18.9.0'}
-    peerDependencies:
-      ethers: ^6.7.1
-
-  zksync-ethers@6.14.0:
-    resolution: {integrity: sha512-wP30kYCB45L8NNWChj+EWbN6lesecMGtVvoPpqPIoSsCLYDDSGCZ2snZ8zI9zAyOQ8AcVyvH8hjQScAJjpXtzg==}
+  zksync-ethers@6.15.0:
+    resolution: {integrity: sha512-zafUxA/lysBO+9Wd6B3qNtDElsPwvAc2b4nBc/YiB4QY4H0pIBvV3/JqxHXXTppEo4gyHAX/+M5brW2qb4YnKA==}
     engines: {node: '>=18.9.0'}
     peerDependencies:
       ethers: ^6.7.1
@@ -13251,7 +13245,7 @@ snapshots:
       - encoding
       - supports-color
 
-  '@matterlabs/hardhat-zksync-deploy@1.5.0(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))(zksync-ethers@6.13.0(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10)))':
+  '@matterlabs/hardhat-zksync-deploy@1.5.0(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))(zksync-ethers@6.15.0(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10)))':
     dependencies:
       '@matterlabs/hardhat-zksync-solc': 1.2.5(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))
       chai: 4.5.0
@@ -13264,12 +13258,12 @@ snapshots:
       sinon: 18.0.1
       sinon-chai: 3.7.0(chai@4.5.0)(sinon@18.0.1)
       ts-morph: 22.0.0
-      zksync-ethers: 6.13.0(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10))
+      zksync-ethers: 6.15.0(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10))
     transitivePeerDependencies:
       - encoding
       - supports-color
 
-  '@matterlabs/hardhat-zksync-deploy@1.5.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))(zksync-ethers@6.14.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10)))':
+  '@matterlabs/hardhat-zksync-deploy@1.5.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))(zksync-ethers@6.15.0(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10)))':
     dependencies:
       '@matterlabs/hardhat-zksync-solc': 1.2.5(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))
       chai: 4.5.0
@@ -13282,12 +13276,12 @@ snapshots:
       sinon: 18.0.1
       sinon-chai: 3.7.0(chai@4.5.0)(sinon@18.0.1)
       ts-morph: 22.0.0
-      zksync-ethers: 6.14.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))
+      zksync-ethers: 6.15.0(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10))
     transitivePeerDependencies:
       - encoding
       - supports-color
 
-  '@matterlabs/hardhat-zksync-deploy@1.5.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@22.8.0)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))(zksync-ethers@6.14.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10)))':
+  '@matterlabs/hardhat-zksync-deploy@1.5.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@22.8.0)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))(zksync-ethers@6.15.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10)))':
     dependencies:
       '@matterlabs/hardhat-zksync-solc': 1.2.5(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@22.8.0)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))
       chai: 4.5.0
@@ -13300,21 +13294,21 @@ snapshots:
       sinon: 18.0.1
       sinon-chai: 3.7.0(chai@4.5.0)(sinon@18.0.1)
       ts-morph: 22.0.0
-      zksync-ethers: 6.14.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))
+      zksync-ethers: 6.15.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))
     transitivePeerDependencies:
       - encoding
       - supports-color
 
-  '@matterlabs/hardhat-zksync-ethers@1.2.1(bufferutil@4.0.8)(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10))(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)(zksync-ethers@6.13.0(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10)))':
+  '@matterlabs/hardhat-zksync-ethers@1.2.1(bufferutil@4.0.8)(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10))(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)(zksync-ethers@6.15.0(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10)))':
     dependencies:
-      '@matterlabs/hardhat-zksync-deploy': 1.5.0(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))(zksync-ethers@6.13.0(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10)))
+      '@matterlabs/hardhat-zksync-deploy': 1.5.0(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))(zksync-ethers@6.15.0(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10)))
       '@matterlabs/hardhat-zksync-solc': 1.2.5(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))
       '@nomicfoundation/hardhat-ethers': 3.0.8(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))
       chai: 4.5.0
       chalk: 4.1.2
       ethers: 6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10)
       hardhat: 2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)
-      zksync-ethers: 6.13.0(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10))
+      zksync-ethers: 6.15.0(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10))
     transitivePeerDependencies:
       - bufferutil
       - c-kzg
@@ -13324,16 +13318,16 @@ snapshots:
       - typescript
       - utf-8-validate
 
-  '@matterlabs/hardhat-zksync-ethers@1.2.1(bufferutil@4.0.8)(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)(zksync-ethers@6.14.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10)))':
+  '@matterlabs/hardhat-zksync-ethers@1.2.1(bufferutil@4.0.8)(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)(zksync-ethers@6.15.0(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10)))':
     dependencies:
-      '@matterlabs/hardhat-zksync-deploy': 1.5.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))(zksync-ethers@6.14.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10)))
+      '@matterlabs/hardhat-zksync-deploy': 1.5.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))(zksync-ethers@6.15.0(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10)))
       '@matterlabs/hardhat-zksync-solc': 1.2.5(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))
       '@nomicfoundation/hardhat-ethers': 3.0.8(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))
       chai: 4.5.0
       chalk: 4.1.2
       ethers: 6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10)
       hardhat: 2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)
-      zksync-ethers: 6.14.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))
+      zksync-ethers: 6.15.0(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10))
     transitivePeerDependencies:
       - bufferutil
       - c-kzg
@@ -13343,16 +13337,16 @@ snapshots:
       - typescript
       - utf-8-validate
 
-  '@matterlabs/hardhat-zksync-ethers@1.2.1(bufferutil@4.0.8)(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@22.8.0)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)(zksync-ethers@6.14.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10)))':
+  '@matterlabs/hardhat-zksync-ethers@1.2.1(bufferutil@4.0.8)(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@22.8.0)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)(zksync-ethers@6.15.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10)))':
     dependencies:
-      '@matterlabs/hardhat-zksync-deploy': 1.5.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@22.8.0)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))(zksync-ethers@6.14.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10)))
+      '@matterlabs/hardhat-zksync-deploy': 1.5.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@22.8.0)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))(zksync-ethers@6.15.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10)))
       '@matterlabs/hardhat-zksync-solc': 1.2.5(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@22.8.0)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))
       '@nomicfoundation/hardhat-ethers': 3.0.8(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@22.8.0)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))
       chai: 4.5.0
       chalk: 4.1.2
       ethers: 6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10)
       hardhat: 2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@22.8.0)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)
-      zksync-ethers: 6.14.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))
+      zksync-ethers: 6.15.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))
     transitivePeerDependencies:
       - bufferutil
       - c-kzg
@@ -13436,8 +13430,8 @@ snapshots:
 
   '@matterlabs/hardhat-zksync-upgradable@1.7.0(@nomicfoundation/hardhat-ethers@3.0.8(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)))(@nomicfoundation/hardhat-verify@2.0.11(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)))(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)':
     dependencies:
-      '@matterlabs/hardhat-zksync-deploy': 1.5.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))(zksync-ethers@6.14.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10)))
-      '@matterlabs/hardhat-zksync-ethers': 1.2.1(bufferutil@4.0.8)(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)(zksync-ethers@6.14.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10)))
+      '@matterlabs/hardhat-zksync-deploy': 1.5.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))(zksync-ethers@6.15.0(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10)))
+      '@matterlabs/hardhat-zksync-ethers': 1.2.1(bufferutil@4.0.8)(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)(zksync-ethers@6.15.0(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10)))
       '@matterlabs/hardhat-zksync-solc': 1.2.5(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))
       '@openzeppelin/contracts-hardhat-zksync-upgradable': '@openzeppelin/contracts@5.1.0'
       '@openzeppelin/defender-sdk-base-client': 1.15.0
@@ -13454,7 +13448,7 @@ snapshots:
       proper-lockfile: 4.1.2
       semver: 7.6.3
       solidity-ast: 0.4.59
-      zksync-ethers: 6.14.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))
+      zksync-ethers: 6.15.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))
     transitivePeerDependencies:
       - '@nomicfoundation/hardhat-ethers'
       - '@nomicfoundation/hardhat-verify'
@@ -13469,8 +13463,8 @@ snapshots:
 
   '@matterlabs/hardhat-zksync-upgradable@1.7.0(@nomicfoundation/hardhat-ethers@3.0.8(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@22.8.0)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)))(@nomicfoundation/hardhat-verify@2.0.11(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@22.8.0)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)))(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@22.8.0)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)':
     dependencies:
-      '@matterlabs/hardhat-zksync-deploy': 1.5.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@22.8.0)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))(zksync-ethers@6.14.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10)))
-      '@matterlabs/hardhat-zksync-ethers': 1.2.1(bufferutil@4.0.8)(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@22.8.0)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)(zksync-ethers@6.14.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10)))
+      '@matterlabs/hardhat-zksync-deploy': 1.5.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@22.8.0)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))(zksync-ethers@6.15.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10)))
+      '@matterlabs/hardhat-zksync-ethers': 1.2.1(bufferutil@4.0.8)(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@22.8.0)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)(zksync-ethers@6.15.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10)))
       '@matterlabs/hardhat-zksync-solc': 1.2.5(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@22.8.0)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))
       '@openzeppelin/contracts-hardhat-zksync-upgradable': '@openzeppelin/contracts@5.1.0'
       '@openzeppelin/defender-sdk-base-client': 1.15.0
@@ -13487,7 +13481,7 @@ snapshots:
       proper-lockfile: 4.1.2
       semver: 7.6.3
       solidity-ast: 0.4.59
-      zksync-ethers: 6.14.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))
+      zksync-ethers: 6.15.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))
     transitivePeerDependencies:
       - '@nomicfoundation/hardhat-ethers'
       - '@nomicfoundation/hardhat-verify'
@@ -13538,23 +13532,23 @@ snapshots:
       - encoding
       - supports-color
 
-  '@matterlabs/hardhat-zksync@1.2.0(jq27lisszh63x44gykkfav2efe)':
+  '@matterlabs/hardhat-zksync@1.2.0(e32ijlvs4nitlwogqpjpupt3om)':
     dependencies:
-      '@matterlabs/hardhat-zksync-deploy': 1.5.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@22.8.0)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))(zksync-ethers@6.14.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10)))
-      '@matterlabs/hardhat-zksync-ethers': 1.2.1(bufferutil@4.0.8)(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@22.8.0)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)(zksync-ethers@6.14.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10)))
-      '@matterlabs/hardhat-zksync-node': 1.2.0(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@22.8.0)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))
-      '@matterlabs/hardhat-zksync-solc': 1.2.5(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@22.8.0)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))
-      '@matterlabs/hardhat-zksync-upgradable': 1.7.0(@nomicfoundation/hardhat-ethers@3.0.8(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@22.8.0)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)))(@nomicfoundation/hardhat-verify@2.0.11(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@22.8.0)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)))(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@22.8.0)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)
-      '@matterlabs/hardhat-zksync-verify': 1.6.0(@nomicfoundation/hardhat-verify@2.0.11(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@22.8.0)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)))(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@22.8.0)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))
-      '@nomicfoundation/hardhat-ethers': 3.0.8(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@22.8.0)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))
-      '@nomicfoundation/hardhat-verify': 2.0.11(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@22.8.0)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))
+      '@matterlabs/hardhat-zksync-deploy': 1.5.0(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))(zksync-ethers@6.15.0(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10)))
+      '@matterlabs/hardhat-zksync-ethers': 1.2.1(bufferutil@4.0.8)(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10))(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)(zksync-ethers@6.15.0(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10)))
+      '@matterlabs/hardhat-zksync-node': 1.2.0(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))
+      '@matterlabs/hardhat-zksync-solc': 1.2.5(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))
+      '@matterlabs/hardhat-zksync-upgradable': 1.7.0(@nomicfoundation/hardhat-ethers@3.0.8(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)))(@nomicfoundation/hardhat-verify@2.0.11(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)))(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)
+      '@matterlabs/hardhat-zksync-verify': 1.6.0(@nomicfoundation/hardhat-verify@2.0.11(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)))(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))
+      '@nomicfoundation/hardhat-ethers': 3.0.8(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))
+      '@nomicfoundation/hardhat-verify': 2.0.11(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))
       '@openzeppelin/upgrades-core': 1.40.0
       chai: 4.5.0
       ethers: 6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10)
-      hardhat: 2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@22.8.0)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)
+      hardhat: 2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)
       sinon: 18.0.1
       sinon-chai: 3.7.0(chai@4.5.0)(sinon@18.0.1)
-      zksync-ethers: 6.14.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))
+      zksync-ethers: 6.15.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))
     transitivePeerDependencies:
       - bufferutil
       - c-kzg
@@ -13563,23 +13557,23 @@ snapshots:
       - typescript
       - utf-8-validate
 
-  '@matterlabs/hardhat-zksync@1.2.0(s5mnuinjslozaedgq4f5sjptyy)':
+  '@matterlabs/hardhat-zksync@1.2.0(gzbl74e4hs234pcoapof4dgi5a)':
     dependencies:
-      '@matterlabs/hardhat-zksync-deploy': 1.5.0(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))(zksync-ethers@6.13.0(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10)))
-      '@matterlabs/hardhat-zksync-ethers': 1.2.1(bufferutil@4.0.8)(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10))(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)(zksync-ethers@6.13.0(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10)))
-      '@matterlabs/hardhat-zksync-node': 1.2.0(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))
-      '@matterlabs/hardhat-zksync-solc': 1.2.5(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))
-      '@matterlabs/hardhat-zksync-upgradable': 1.7.0(@nomicfoundation/hardhat-ethers@3.0.8(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)))(@nomicfoundation/hardhat-verify@2.0.11(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)))(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)
-      '@matterlabs/hardhat-zksync-verify': 1.6.0(@nomicfoundation/hardhat-verify@2.0.11(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)))(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))
-      '@nomicfoundation/hardhat-ethers': 3.0.8(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))
-      '@nomicfoundation/hardhat-verify': 2.0.11(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))
+      '@matterlabs/hardhat-zksync-deploy': 1.5.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@22.8.0)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))(zksync-ethers@6.15.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10)))
+      '@matterlabs/hardhat-zksync-ethers': 1.2.1(bufferutil@4.0.8)(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@22.8.0)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)(zksync-ethers@6.15.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10)))
+      '@matterlabs/hardhat-zksync-node': 1.2.0(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@22.8.0)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))
+      '@matterlabs/hardhat-zksync-solc': 1.2.5(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@22.8.0)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))
+      '@matterlabs/hardhat-zksync-upgradable': 1.7.0(@nomicfoundation/hardhat-ethers@3.0.8(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@22.8.0)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)))(@nomicfoundation/hardhat-verify@2.0.11(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@22.8.0)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)))(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@22.8.0)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)
+      '@matterlabs/hardhat-zksync-verify': 1.6.0(@nomicfoundation/hardhat-verify@2.0.11(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@22.8.0)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)))(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@22.8.0)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))
+      '@nomicfoundation/hardhat-ethers': 3.0.8(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@22.8.0)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))
+      '@nomicfoundation/hardhat-verify': 2.0.11(hardhat@2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@22.8.0)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10))
       '@openzeppelin/upgrades-core': 1.40.0
       chai: 4.5.0
       ethers: 6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10)
-      hardhat: 2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@20.16.10)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)
+      hardhat: 2.22.15(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.7.26(@swc/helpers@0.5.13))(@types/node@22.8.0)(typescript@5.6.2))(typescript@5.6.2)(utf-8-validate@5.0.10)
       sinon: 18.0.1
       sinon-chai: 3.7.0(chai@4.5.0)(sinon@18.0.1)
-      zksync-ethers: 6.14.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))
+      zksync-ethers: 6.15.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))
     transitivePeerDependencies:
       - bufferutil
       - c-kzg
@@ -25410,11 +25404,11 @@ snapshots:
       compress-commons: 6.0.2
       readable-stream: 4.5.2
 
-  zksync-ethers@6.13.0(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10)):
+  zksync-ethers@6.15.0(ethers@6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10)):
     dependencies:
       ethers: 6.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.10)
 
-  zksync-ethers@6.14.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10)):
+  zksync-ethers@6.15.0(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10)):
     dependencies:
       ethers: 6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10)
 

From 9e5a41723f24a5344dc9bc70cc2b9fe96b90b24d Mon Sep 17 00:00:00 2001
From: Lyova Potyomkin <lyova.potyomkin@gmail.com>
Date: Tue, 12 Nov 2024 07:06:34 +0200
Subject: [PATCH 10/42] feat: pass session in sdk

---
 packages/auth-server/nuxt.config.ts                 |  2 +-
 packages/auth-server/stores/client.ts               |  2 +-
 .../src/validators/SessionKeyValidator.sol          |  9 ++-------
 packages/sdk/src/client-auth-server/Signer.ts       |  2 +-
 packages/sdk/src/client/actions/account.ts          |  4 ++--
 packages/sdk/src/client/clients/session.ts          | 13 ++++++++++++-
 packages/sdk/src/utils/encoding.ts                  |  2 +-
 7 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/packages/auth-server/nuxt.config.ts b/packages/auth-server/nuxt.config.ts
index f181fd92..e0fa63f8 100644
--- a/packages/auth-server/nuxt.config.ts
+++ b/packages/auth-server/nuxt.config.ts
@@ -44,7 +44,7 @@ export default defineNuxtConfig({
   runtimeConfig: {
     public: {
       chain: zksyncInMemoryNode,
-      paymaster: "0x0683E542081D9CeBBFe83f07A3102eB2Da318613",
+      paymaster: "0x2d4E123dEe0554cC19CdE4A8914BDdF1F4192B93",
     },
   },
   $production: {
diff --git a/packages/auth-server/stores/client.ts b/packages/auth-server/stores/client.ts
index 10dde900..6e7eb070 100644
--- a/packages/auth-server/stores/client.ts
+++ b/packages/auth-server/stores/client.ts
@@ -33,7 +33,7 @@ export const contractsByChain: Record<SupportedChainId, ChainContracts> = {
     accountFactory: "0x",
   },
   [zksyncInMemoryNode.id]: {
-    session: "0xCfcCD82F2fA50d86e8C91c1cE75f6935806Ae4D2",
+    session: "0xc81BdB6e98da8e23aa646969A7e942752b9B10c4",
     passkey: "0x07734BA326b6AD13BfC0115b0903EB14268F1617",
     accountFactory: "0xaAF5f437fB0524492886fbA64D703df15BF619AE",
   },
diff --git a/packages/contracts/src/validators/SessionKeyValidator.sol b/packages/contracts/src/validators/SessionKeyValidator.sol
index 1e5bbd3b..52367f84 100644
--- a/packages/contracts/src/validators/SessionKeyValidator.sol
+++ b/packages/contracts/src/validators/SessionKeyValidator.sol
@@ -308,10 +308,8 @@ contract SessionKeyValidator is IHook, IValidationHook, IModuleValidator, IModul
 
   bytes4 constant EIP1271_SUCCESS_RETURN_VALUE = 0x1626ba7e;
 
-  // account => hashes of session specs
-  // Can be used to revoke all session keys in case offchain storage is not available.
-  // TODO: Is emitting an event sufficient instead?
-  // mapping(address => EnumerableSet.Bytes32Set) private sessionHashes;
+  // account => number of open sessions
+  // NOTE: expired sessions are still counted if not explicitly revoked
   mapping(address => uint256) private sessionCounter;
   // session hash => session state
   mapping(bytes32 => SessionLib.SessionStorage) private sessions;
@@ -347,7 +345,6 @@ contract SessionKeyValidator is IHook, IValidationHook, IModuleValidator, IModul
     require(sessionSpec.signer != address(0), "Invalid signer");
     require(sessions[sessionHash].status[msg.sender] == SessionLib.Status.NotInitialized, "Session already exists");
     require(sessionSpec.feeLimit.limitType != SessionLib.LimitType.Unlimited, "Unlimited fee allowance is not safe");
-    // sessionHashes[msg.sender].add(sessionHash);
     sessionCounter[msg.sender]++;
     sessions[sessionHash].status[msg.sender] = SessionLib.Status.Active;
     emit SessionCreated(msg.sender, sessionHash, sessionSpec);
@@ -383,7 +380,6 @@ contract SessionKeyValidator is IHook, IValidationHook, IModuleValidator, IModul
     // is installed again later, there will be no active sessions from the past.
     // Problem: if there are too many keys, this will run out of gas.
     // Solution: before uninstalling, require that all keys are revoked manually.
-    // require(sessionHashes[msg.sender].length() == 0, "Revoke all keys first");
     require(sessionCounter[msg.sender] == 0, "Revoke all keys first");
   }
 
@@ -400,7 +396,6 @@ contract SessionKeyValidator is IHook, IValidationHook, IModuleValidator, IModul
   function revokeKey(bytes32 sessionHash) public {
     require(sessions[sessionHash].status[msg.sender] == SessionLib.Status.Active, "Nothing to revoke");
     sessions[sessionHash].status[msg.sender] = SessionLib.Status.Closed;
-    // sessionHashes[msg.sender].remove(sessionHash);
     sessionCounter[msg.sender]--;
     emit SessionRevoked(msg.sender, sessionHash);
   }
diff --git a/packages/sdk/src/client-auth-server/Signer.ts b/packages/sdk/src/client-auth-server/Signer.ts
index dbdc940f..b18d5e30 100644
--- a/packages/sdk/src/client-auth-server/Signer.ts
+++ b/packages/sdk/src/client-auth-server/Signer.ts
@@ -8,7 +8,7 @@ import type { AppMetadata, RequestArguments, SessionPreferences } from "./interf
 import type { AuthServerRpcSchema, ExtractParams, ExtractReturnType, Method, RPCRequestMessage, RPCResponseMessage, RpcSchema } from "./rpc.js";
 import type { WalletProviderSessionPreferences } from "./WalletProvider.js";
 
-type Account = {
+export type Account = {
   address: Address;
   activeChainId: Chain["id"];
   session?: SessionPreferences & { sessionKey: Hash } | undefined;
diff --git a/packages/sdk/src/client/actions/account.ts b/packages/sdk/src/client/actions/account.ts
index e6dff661..04b02518 100644
--- a/packages/sdk/src/client/actions/account.ts
+++ b/packages/sdk/src/client/actions/account.ts
@@ -4,7 +4,7 @@ import { getGeneralPaymasterInput } from "viem/zksync";
 
 import { FactoryAbi } from "../../abi/Factory.js";
 import type { SessionData } from "../../client-auth-server/interface.js";
-import { encodeCreateSessionParameters, encodeModuleData, encodePasskeyModuleParameters } from "../../utils/encoding.js";
+import { encodeModuleData, encodePasskeyModuleParameters, encodeSession } from "../../utils/encoding.js";
 import { noThrow } from "../../utils/helpers.js";
 import { getPasskeySignatureFromPublicKeyBytes, getPublicKeyBytesFromPasskeySignature } from "../../utils/passkey.js";
 
@@ -80,7 +80,7 @@ export const deployAccount = async <
 
   const encodedSessionKeyModuleData = encodeModuleData({
     address: args.contracts.session,
-    parameters: args.initialSession == null ? "0x" : encodeCreateSessionParameters(args.initialSession),
+    parameters: args.initialSession == null ? "0x" : encodeSession(args.initialSession),
   });
 
   let deployProxyArgs = {
diff --git a/packages/sdk/src/client/clients/session.ts b/packages/sdk/src/client/clients/session.ts
index 6b7261b8..479be8f4 100644
--- a/packages/sdk/src/client/clients/session.ts
+++ b/packages/sdk/src/client/clients/session.ts
@@ -1,6 +1,9 @@
 import { type Account, type Address, type Chain, type Client, createClient, encodeAbiParameters, getAddress, type Hash, type Prettify, publicActions, type PublicRpcSchema, type RpcSchema, type Transport, type WalletClientConfig, type WalletRpcSchema } from "viem";
 import { privateKeyToAccount } from "viem/accounts";
 
+import { type Account as ZKsyncAccount } from "../../client-auth-server/Signer.js";
+import { encodeSession } from "../../utils/encoding.js";
+import { StorageItem } from "../../utils/storage.js";
 import { type ZksyncAccountSessionActions, zksyncAccountSessionActions } from "../decorators/session.js";
 import { type ZksyncAccountWalletActions, zksyncAccountWalletActions } from "../decorators/session_wallet.js";
 import { toSmartAccount } from "../smart-account.js";
@@ -24,12 +27,20 @@ export function createZksyncSessionClient<
   const account = toSmartAccount({
     address: parameters.address,
     sign: async ({ hash }) => {
+      console.log("SIGNING SESSION TX");
+      const accountInfo = new StorageItem<ZKsyncAccount | null>(StorageItem.scopedStorageKey("account"), null).get();
       if (!parameters.sessionKey) throw new Error("Session key wasn't provided, can't sign");
+      if (!accountInfo?.session) throw new Error("Session not found in local storage");
+      if (accountInfo.session.sessionKey != parameters.sessionKey) throw new Error("Session key doesn't match the one in local storage");
       const sessionKeySigner = privateKeyToAccount(parameters.sessionKey);
+      const sessionPublicKey = sessionKeySigner.address;
+      console.log("session signer", sessionPublicKey);
+      const session = { ...accountInfo.session, sessionPublicKey };
+      console.log(session);
       const hashSignature = await sessionKeySigner.sign({ hash });
       return encodeAbiParameters(
         [{ type: "bytes" }, { type: "address" }, { type: "bytes[]" }],
-        [hashSignature, parameters.contracts.session, ["0x"]], // FIXME: this is assuming there are no other hooks
+        [hashSignature, parameters.contracts.session, [encodeSession(session)]], // FIXME: this is assuming there are no other hooks
       );
     },
   });
diff --git a/packages/sdk/src/utils/encoding.ts b/packages/sdk/src/utils/encoding.ts
index 6713918e..1be57d5a 100644
--- a/packages/sdk/src/utils/encoding.ts
+++ b/packages/sdk/src/utils/encoding.ts
@@ -3,7 +3,7 @@ import { type Address, encodeAbiParameters, type Hash, parseAbiParameters, toHex
 import type { SessionData } from "../client-auth-server/interface.js";
 import { getSession } from "../utils/session.js";
 
-export const encodeCreateSessionParameters = (session: SessionData) => {
+export const encodeSession = (session: SessionData) => {
   const sessionSpec = {
     components: [
       { name: "signer", type: "address" },

From fbefbfe3c403ee52248986d1404022de54493761 Mon Sep 17 00:00:00 2001
From: Lyova Potyomkin <lyova.potyomkin@gmail.com>
Date: Tue, 12 Nov 2024 08:06:13 +0200
Subject: [PATCH 11/42] fix: sdk bug

---
 packages/contracts/test/SessionKeyTest.ts  | 6 +++++-
 packages/sdk/src/client/clients/session.ts | 3 ---
 packages/sdk/src/utils/encoding.ts         | 6 ++----
 packages/sdk/src/utils/session.ts          | 2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/packages/contracts/test/SessionKeyTest.ts b/packages/contracts/test/SessionKeyTest.ts
index 61dad54b..839d2cf8 100644
--- a/packages/contracts/test/SessionKeyTest.ts
+++ b/packages/contracts/test/SessionKeyTest.ts
@@ -224,7 +224,11 @@ class SessionTester {
         gasPerPubdata: utils.DEFAULT_GAS_PER_PUBDATA_LIMIT,
         customSignature: abiCoder.encode(
           ["bytes", "address", "bytes[]"],
-          [ethers.zeroPadValue("0x1b", 65), await fixtures.getSessionKeyModuleAddress(), [await this.encodeSession()]],
+          [
+            ethers.zeroPadValue("0x1b", 65),
+            await fixtures.getSessionKeyModuleAddress(),
+            [await this.encodeSession()],
+          ],
         ),
       },
       gasLimit: 0n,
diff --git a/packages/sdk/src/client/clients/session.ts b/packages/sdk/src/client/clients/session.ts
index 479be8f4..8cca37f5 100644
--- a/packages/sdk/src/client/clients/session.ts
+++ b/packages/sdk/src/client/clients/session.ts
@@ -27,16 +27,13 @@ export function createZksyncSessionClient<
   const account = toSmartAccount({
     address: parameters.address,
     sign: async ({ hash }) => {
-      console.log("SIGNING SESSION TX");
       const accountInfo = new StorageItem<ZKsyncAccount | null>(StorageItem.scopedStorageKey("account"), null).get();
       if (!parameters.sessionKey) throw new Error("Session key wasn't provided, can't sign");
       if (!accountInfo?.session) throw new Error("Session not found in local storage");
       if (accountInfo.session.sessionKey != parameters.sessionKey) throw new Error("Session key doesn't match the one in local storage");
       const sessionKeySigner = privateKeyToAccount(parameters.sessionKey);
       const sessionPublicKey = sessionKeySigner.address;
-      console.log("session signer", sessionPublicKey);
       const session = { ...accountInfo.session, sessionPublicKey };
-      console.log(session);
       const hashSignature = await sessionKeySigner.sign({ hash });
       return encodeAbiParameters(
         [{ type: "bytes" }, { type: "address" }, { type: "bytes[]" }],
diff --git a/packages/sdk/src/utils/encoding.ts b/packages/sdk/src/utils/encoding.ts
index 1be57d5a..15d55156 100644
--- a/packages/sdk/src/utils/encoding.ts
+++ b/packages/sdk/src/utils/encoding.ts
@@ -75,10 +75,8 @@ export const encodeSession = (session: SessionData) => {
     type: "tuple",
   };
 
-  return encodeAbiParameters(
-    [sessionSpec],
-    [{ ...getSession(session), signer: session.sessionPublicKey }],
-  );
+  const fullSession = { ...getSession(session), signer: session.sessionPublicKey };
+  return encodeAbiParameters([sessionSpec], [fullSession]);
 };
 
 export const encodePasskeyModuleParameters = (passkey: { passkeyPublicKey: [Buffer, Buffer]; expectedOrigin: string }) => {
diff --git a/packages/sdk/src/utils/session.ts b/packages/sdk/src/utils/session.ts
index 74692b06..5962cc18 100644
--- a/packages/sdk/src/utils/session.ts
+++ b/packages/sdk/src/utils/session.ts
@@ -23,7 +23,7 @@ export function getLimit(limit: bigint | Limit | undefined) {
       period: 0n,
     };
   }
-  if (!limit.period) {
+  if (!limit.period || limit.period == 0n) {
     return {
       limitType: LimitType.Lifetime,
       limit: BigInt(limit.limit),

From 499c6809ccc3b39cc77f45838151560452dad310 Mon Sep 17 00:00:00 2001
From: Lyova Potyomkin <lyova.potyomkin@gmail.com>
Date: Tue, 12 Nov 2024 08:09:25 +0200
Subject: [PATCH 12/42] fix: remove hardcoded gas limits

---
 packages/contracts/test/SessionKeyTest.ts | 5 +----
 packages/sdk/src/client/smart-account.ts  | 1 -
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/contracts/test/SessionKeyTest.ts b/packages/contracts/test/SessionKeyTest.ts
index 839d2cf8..aed13e03 100644
--- a/packages/contracts/test/SessionKeyTest.ts
+++ b/packages/contracts/test/SessionKeyTest.ts
@@ -143,9 +143,7 @@ class SessionTester {
       ...await this.aaTxTemplate(),
       ...txRequest,
     };
-    // TODO: uncomment once gas estimation is fixed one era-test-node.
-    // It works fine with the local server.
-    // aaTx.gasLimit = await provider.estimateGas(aaTx);
+    aaTx.gasLimit = await provider.estimateGas(aaTx);
     logInfo(`\`sessionTx\` gas estimated: ${await provider.estimateGas(aaTx)}`);
 
     const signedTransaction = await this.sessionAccount.signTransaction(aaTx);
@@ -381,7 +379,6 @@ describe("SessionKeyModule tests", function () {
       await tester.sendTxSuccess({
         to: await erc20.getAddress(),
         data: erc20.interface.encodeFunctionData("transfer", [sessionTarget, 1000n]),
-        gasLimit: 10_000_000n,
       });
       expect(await erc20.balanceOf(sessionTarget))
         .to.equal(1000n, "session target should have received the tokens");
diff --git a/packages/sdk/src/client/smart-account.ts b/packages/sdk/src/client/smart-account.ts
index c215a699..acb33ed1 100644
--- a/packages/sdk/src/client/smart-account.ts
+++ b/packages/sdk/src/client/smart-account.ts
@@ -41,7 +41,6 @@ export function toSmartAccount(
         ...transaction,
         from: this.address!,
         type: "eip712",
-        gas: 100_000_000n, // TODO remove when gas estimation is fixed
       } as ZksyncTransactionSerializableEIP712;
 
       const eip712DomainAndMessage = getEip712Domain(signableTransaction);

From 89c631cd2b5466d8aac5a20e7fc1d6eb6a415254 Mon Sep 17 00:00:00 2001
From: Lyova Potyomkin <lyova.potyomkin@gmail.com>
Date: Tue, 12 Nov 2024 08:32:00 +0200
Subject: [PATCH 13/42] fix: leave hardcoded gas limit in sdk for now

---
 packages/sdk/src/client/smart-account.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/sdk/src/client/smart-account.ts b/packages/sdk/src/client/smart-account.ts
index acb33ed1..c215a699 100644
--- a/packages/sdk/src/client/smart-account.ts
+++ b/packages/sdk/src/client/smart-account.ts
@@ -41,6 +41,7 @@ export function toSmartAccount(
         ...transaction,
         from: this.address!,
         type: "eip712",
+        gas: 100_000_000n, // TODO remove when gas estimation is fixed
       } as ZksyncTransactionSerializableEIP712;
 
       const eip712DomainAndMessage = getEip712Domain(signableTransaction);

From 2bd1bb3a8f54f3d426a649f4198b27fb4e8d9458 Mon Sep 17 00:00:00 2001
From: Jack Hamer <jackhamer0990@gmail.com>
Date: Tue, 12 Nov 2024 16:44:24 +0200
Subject: [PATCH 14/42] fix: session interface improvements

---
 .../auth-server/components/views/Connect.vue  |  10 +-
 .../views/confirmation/RequestSession.vue     |  49 +++--
 packages/demo-app/pages/index.vue             |   6 +-
 packages/nft-quest/stores/connector.ts        |  20 +-
 packages/sdk/src/client-auth-server/Signer.ts |  37 ++--
 .../src/client-auth-server/WalletProvider.ts  |   8 +-
 packages/sdk/src/client-auth-server/index.ts  |   1 +
 .../sdk/src/client-auth-server/interface.ts   |  48 +----
 packages/sdk/src/client-auth-server/rpc.ts    |  17 +-
 .../sdk/src/client-auth-server/session.ts     | 105 ++++++++++
 packages/sdk/src/client/actions/account.ts    |   4 +-
 packages/sdk/src/client/actions/session.ts    |  11 +-
 packages/sdk/src/client/clients/common.ts     |   6 -
 packages/sdk/src/client/clients/session.ts    |  28 +--
 packages/sdk/src/client/decorators/passkey.ts |  11 +-
 .../src/client/decorators/session_wallet.ts   |   2 -
 packages/sdk/src/client/index.ts              |   1 -
 packages/sdk/src/connector/index.ts           |   4 +-
 packages/sdk/src/index.ts                     |   5 +-
 packages/sdk/src/utils/encoding.ts            |  89 ++-------
 packages/sdk/src/utils/session.ts             | 186 ++++++++++++------
 21 files changed, 351 insertions(+), 297 deletions(-)
 create mode 100644 packages/sdk/src/client-auth-server/session.ts
 delete mode 100644 packages/sdk/src/client/clients/common.ts

diff --git a/packages/auth-server/components/views/Connect.vue b/packages/auth-server/components/views/Connect.vue
index 7c12b313..ca497aac 100644
--- a/packages/auth-server/components/views/Connect.vue
+++ b/packages/auth-server/components/views/Connect.vue
@@ -1,8 +1,8 @@
 <template>
-  <ViewsConfirmationRequestAccounts v-if="!session" />
+  <ViewsConfirmationRequestAccounts v-if="!sessionPreferences" />
   <ViewsConfirmationRequestSession
     v-else
-    :session="session"
+    :session-preferences="sessionPreferences"
   />
 </template>
 
@@ -11,10 +11,10 @@ import type { SessionPreferences } from "zksync-sso";
 
 const { request } = storeToRefs(useRequestsStore());
 
-const session = computed<SessionPreferences | undefined>(() => {
+const sessionPreferences = computed<SessionPreferences | undefined>(() => {
   if (request.value?.content.action.method !== "eth_requestAccounts") return undefined;
-  if ("session" in (request.value.content.action.params!)) {
-    return request.value.content.action.params.session;
+  if ("sessionPreferences" in (request.value.content.action.params!)) {
+    return request.value.content.action.params.sessionPreferences;
   }
   return undefined;
 });
diff --git a/packages/auth-server/components/views/confirmation/RequestSession.vue b/packages/auth-server/components/views/confirmation/RequestSession.vue
index b4e62412..9ddd2784 100644
--- a/packages/auth-server/components/views/confirmation/RequestSession.vue
+++ b/packages/auth-server/components/views/confirmation/RequestSession.vue
@@ -88,7 +88,7 @@
     </button>
     <CommonHeightTransition :opened="advancedInfoOpened">
       <CommonLine>
-        <pre class="p-3 text-xs overflow-auto">{{ JSON.stringify(formattedSession, null, 4) }}</pre>
+        <pre class="p-3 text-xs overflow-auto">{{ JSON.stringify(sessionConfig, null, 4) }}</pre>
       </CommonLine>
     </CommonHeightTransition>
 
@@ -116,14 +116,15 @@
 <script lang="ts" setup>
 import { ChevronDownIcon } from "@heroicons/vue/24/outline";
 import { useTimeAgo } from "@vueuse/core";
-import { type Address, formatUnits } from "viem";
+import { type Address, formatUnits, parseEther } from "viem";
 import { generatePrivateKey, privateKeyToAddress } from "viem/accounts";
 import type { SessionPreferences } from "zksync-sso";
 import type { AuthServerRpcSchema, ExtractReturnType } from "zksync-sso/client-auth-server";
-import { getSession } from "zksync-sso/utils";
+import { formatSessionPreferences } from "zksync-sso/client-auth-server";
+import { LimitType } from "zksync-sso/utils";
 
 const props = defineProps({
-  session: {
+  sessionPreferences: {
     type: Object as PropType<SessionPreferences>,
     required: true,
   },
@@ -134,10 +135,20 @@ const { respond, deny } = useRequestsStore();
 const { responseInProgress, requestChain } = storeToRefs(useRequestsStore());
 const { fetchTokenInfo } = useTokenUtilities(computed(() => requestChain.value!.id));
 const { getClient } = useClientStore();
-const formattedSession = computed(() => getSession(props.session));
+const sessionConfig = computed(() => formatSessionPreferences(
+  props.sessionPreferences,
+  {
+    expiresAt: BigInt(Math.floor(Date.now() / 1000) + 60 * 60 * 24), // 24 hours
+    fee: {
+      limitType: LimitType.Lifetime,
+      limit: parseEther("0.01"),
+      period: 0n,
+    },
+  },
+));
 
 const domain = computed(() => new URL(origin.value).host);
-const sessionExpiresIn = useTimeAgo(Number(formattedSession.value.expiresAt) * 1000);
+const sessionExpiresIn = useTimeAgo(Number(sessionConfig.value.expiresAt) * 1000);
 
 const advancedInfoOpened = ref(false);
 
@@ -165,11 +176,11 @@ const { result: tokensList, inProgress: tokensLoading, execute: fetchTokens } =
 });
 
 const spendLimitTokens = computed(() => {
-  if (!formattedSession.value || !tokensList.value) return;
+  if (!sessionConfig.value || !tokensList.value) return;
   let spendLimits: { [tokenAddress: string]: bigint } = {
-    [BASE_TOKEN_ADDRESS]: formattedSession.value.feeLimit.limit,
+    [BASE_TOKEN_ADDRESS]: sessionConfig.value.feeLimit.limit,
   };
-  spendLimits = (formattedSession.value.transferPolicies || []).reduce((acc, transferPolicy) => {
+  spendLimits = (sessionConfig.value.transferPolicies || []).reduce((acc, transferPolicy) => {
     return {
       ...acc,
       [BASE_TOKEN_ADDRESS]: (acc[BASE_TOKEN_ADDRESS] || BigInt(0)) + BigInt(transferPolicy.valueLimit.limit),
@@ -193,22 +204,20 @@ const confirmConnection = async () => {
   respond(async () => {
     const client = getClient({ chainId: requestChain.value!.id });
     const sessionKey = generatePrivateKey();
-    const sessionPreferences = formattedSession.value;
-
-    const _session = await client.createSession({
-      session: {
-        ...sessionPreferences,
-        sessionPublicKey: privateKeyToAddress(sessionKey),
+    const session = {
+      sessionKey,
+      sessionConfig: {
+        signer: privateKeyToAddress(sessionKey),
+        ...sessionConfig.value,
       },
-    });
+    };
+
+    const _session = await client.createSession({ sessionConfig: session.sessionConfig });
     const response: ExtractReturnType<"eth_requestAccounts", AuthServerRpcSchema> = {
       account: {
         address: client.account.address,
         activeChainId: client.chain.id,
-        session: {
-          ...sessionPreferences,
-          sessionKey,
-        },
+        session,
       },
       chainsInfo: supportedChains.map((chain) => ({
         id: chain.id,
diff --git a/packages/demo-app/pages/index.vue b/packages/demo-app/pages/index.vue
index 96bac2d8..2757947e 100644
--- a/packages/demo-app/pages/index.vue
+++ b/packages/demo-app/pages/index.vue
@@ -50,10 +50,10 @@ const testTransferTarget = "0x55bE1B079b53962746B2e86d12f158a41DF294A6";
 const zksyncConnector = zksyncAccountConnector({
   authServerUrl: "http://localhost:3002/confirm",
   session: {
-    feeLimit: parseEther("0.1"),
-    transferPolicies: [
+    fee: parseEther("0.1"),
+    transfers: [
       {
-        target: testTransferTarget,
+        to: testTransferTarget,
         valueLimit: parseEther("0.1"),
       },
     ],
diff --git a/packages/nft-quest/stores/connector.ts b/packages/nft-quest/stores/connector.ts
index 3618ad95..472e0ef7 100644
--- a/packages/nft-quest/stores/connector.ts
+++ b/packages/nft-quest/stores/connector.ts
@@ -1,8 +1,7 @@
 import { connect, createConfig, type CreateConnectorFn, disconnect, getAccount, http, reconnect, watchAccount } from "@wagmi/core";
+import { zksyncInMemoryNode, zksyncLocalNode, zksyncSepoliaTestnet } from "@wagmi/core/chains";
 import { type Address, type Hash, parseEther } from "viem";
-import { zksyncInMemoryNode, zksyncLocalNode, zksyncSepoliaTestnet } from "viem/chains";
 import { zksyncAccountConnector } from "zksync-sso/connector";
-import { getSession } from "zksync-sso/utils";
 
 export const useConnectorStore = defineStore("connector", () => {
   const runtimeConfig = useRuntimeConfig();
@@ -10,7 +9,7 @@ export const useConnectorStore = defineStore("connector", () => {
     zksyncSepoliaTestnet,
     zksyncInMemoryNode,
     zksyncLocalNode,
-  ].filter((x) => x.id == runtimeConfig.public.chain.id);
+  ] as const;
   type SupportedChainId = (typeof supportedChains)[number]["id"];
 
   const connector = zksyncAccountConnector({
@@ -19,13 +18,13 @@ export const useConnectorStore = defineStore("connector", () => {
       icon: `${runtimeConfig.public.baseUrl}/favicon.svg`,
     },
     authServerUrl: runtimeConfig.public.authServerUrl,
-    session: getSession({
-      feeLimit: parseEther("0.1"),
-      callPolicies: [{
-        target: runtimeConfig.public.contracts.nft as Hash,
+    session: {
+      fee: parseEther("0.1"),
+      contractCalls: [{
+        address: runtimeConfig.public.contracts.nft as Hash,
         function: "mint(address)",
       }],
-    }),
+    },
   });
   const wagmiConfig = createConfig({
     chains: supportedChains,
@@ -45,9 +44,12 @@ export const useConnectorStore = defineStore("connector", () => {
   });
 
   const connectAccount = async () => {
+    const chain = supportedChains.filter((x) => x.id == runtimeConfig.public.chain.id)[0];
+    if (!chain) throw new Error(`Chain with id ${runtimeConfig.public.chain.id} is missing from the supported chains list`);
+
     return await connect(wagmiConfig, {
       connector,
-      chainId: supportedChains[0].id,
+      chainId: chain.id,
     });
   };
 
diff --git a/packages/sdk/src/client-auth-server/Signer.ts b/packages/sdk/src/client-auth-server/Signer.ts
index b18d5e30..0d1f1f5f 100644
--- a/packages/sdk/src/client-auth-server/Signer.ts
+++ b/packages/sdk/src/client-auth-server/Signer.ts
@@ -2,16 +2,19 @@ import { type Address, type Chain, type Hash, hexToNumber, http, type RpcSchema
 
 import { createZksyncSessionClient, type ZksyncAccountSessionClient } from "../client/index.js";
 import type { Communicator } from "../communicator/index.js";
-import { getSession } from "../utils/session.js";
+import { type SessionConfig } from "../utils/session.js";
 import { StorageItem } from "../utils/storage.js";
-import type { AppMetadata, RequestArguments, SessionPreferences } from "./interface.js";
+import type { AppMetadata, RequestArguments } from "./interface.js";
 import type { AuthServerRpcSchema, ExtractParams, ExtractReturnType, Method, RPCRequestMessage, RPCResponseMessage, RpcSchema } from "./rpc.js";
-import type { WalletProviderSessionPreferences } from "./WalletProvider.js";
+import type { SessionPreferences } from "./session.js";
 
-export type Account = {
+type Account = {
   address: Address;
   activeChainId: Chain["id"];
-  session?: SessionPreferences & { sessionKey: Hash } | undefined;
+  session?: {
+    sessionKey: Hash;
+    sessionConfig: SessionConfig;
+  };
 };
 
 interface SignerInterface {
@@ -33,7 +36,7 @@ type SignerConstructorParams = {
   updateListener: UpdateListener;
   chains: readonly Chain[];
   transports?: Record<number, Transport>;
-  session?: () => WalletProviderSessionPreferences | Promise<WalletProviderSessionPreferences>;
+  session?: () => SessionPreferences | Promise<SessionPreferences>;
 };
 
 type ChainsInfo = ExtractReturnType<"eth_requestAccounts", AuthServerRpcSchema>["chainsInfo"];
@@ -44,7 +47,7 @@ export class Signer implements SignerInterface {
   private readonly updateListener: UpdateListener;
   private readonly chains: readonly Chain[];
   private readonly transports: Record<number, Transport> = {};
-  private readonly sessionParameters?: () => (WalletProviderSessionPreferences | Promise<WalletProviderSessionPreferences>);
+  private readonly sessionParameters?: () => (SessionPreferences | Promise<SessionPreferences>);
 
   private _account: StorageItem<Account | null>;
   private _chainsInfo = new StorageItem<ChainsInfo>(StorageItem.scopedStorageKey("chainsInfo"), []);
@@ -112,10 +115,11 @@ export class Signer implements SignerInterface {
     if (session) {
       this.walletClient = createZksyncSessionClient({
         address: this.account.address,
+        sessionKey: session.sessionKey,
+        sessionConfig: session.sessionConfig,
         contracts: chainInfo.contracts,
         chain,
         transport: this.transports[chain.id] || http(),
-        sessionKey: session.sessionKey,
       });
     } else {
       this.walletClient = undefined;
@@ -123,7 +127,7 @@ export class Signer implements SignerInterface {
   }
 
   async handshake(): Promise<Address[]> {
-    let session: SessionPreferences | undefined;
+    let sessionPreferences: SessionPreferences | undefined;
     let metadata: AppMetadata = {
       name: "Unknown DApp",
       icon: null,
@@ -135,18 +139,7 @@ export class Signer implements SignerInterface {
     }
     if (this.sessionParameters) {
       try {
-        const sessionParameters = await this.sessionParameters();
-        session = {
-          ...sessionParameters,
-          expiresAt: undefined,
-        };
-        if (sessionParameters.expiresAt) {
-          if (sessionParameters.expiresAt instanceof Date) {
-            session.expiresAt = BigInt(Math.ceil(sessionParameters.expiresAt.getTime() / 1000));
-          } else {
-            session.expiresAt = sessionParameters.expiresAt;
-          }
-        }
+        sessionPreferences = await this.sessionParameters();
       } catch (error) {
         console.error("Failed to get session data. Proceeding connection with no session.", error);
       }
@@ -155,7 +148,7 @@ export class Signer implements SignerInterface {
       method: "eth_requestAccounts",
       params: {
         metadata,
-        session: session ? getSession(session) : undefined,
+        sessionPreferences,
       },
     });
     const handshakeData = responseMessage.content.result!;
diff --git a/packages/sdk/src/client-auth-server/WalletProvider.ts b/packages/sdk/src/client-auth-server/WalletProvider.ts
index fcb59fc7..f3affabf 100644
--- a/packages/sdk/src/client-auth-server/WalletProvider.ts
+++ b/packages/sdk/src/client-auth-server/WalletProvider.ts
@@ -9,22 +9,18 @@ import type {
   AppMetadata,
   ProviderInterface,
   RequestArguments,
-  SessionPreferences,
 } from "./interface.js";
 import { type ExtractReturnType, type Method } from "./rpc.js";
+import type { SessionPreferences } from "./session.js";
 import { Signer } from "./Signer.js";
 
 const DEFAULT_AUTH_SERVER_URL = "https://auth-test.zksync.dev/confirm";
 
-export type WalletProviderSessionPreferences = Omit<SessionPreferences, "expiresAt"> & {
-  expiresAt?: Date | bigint;
-};
-
 export type WalletProviderConstructorOptions = {
   metadata: Partial<AppMetadata> | undefined;
   chains: readonly Chain[];
   transports?: Record<number, Transport>;
-  session?: WalletProviderSessionPreferences | (() => WalletProviderSessionPreferences | Promise<WalletProviderSessionPreferences>);
+  session?: SessionPreferences | (() => SessionPreferences | Promise<SessionPreferences>);
   authServerUrl?: string;
 };
 
diff --git a/packages/sdk/src/client-auth-server/index.ts b/packages/sdk/src/client-auth-server/index.ts
index 7809e8fd..28e8b552 100644
--- a/packages/sdk/src/client-auth-server/index.ts
+++ b/packages/sdk/src/client-auth-server/index.ts
@@ -1,2 +1,3 @@
 export * from "./interface.js";
 export * from "./rpc.js";
+export * from "./session.js";
diff --git a/packages/sdk/src/client-auth-server/interface.ts b/packages/sdk/src/client-auth-server/interface.ts
index d9a16a19..3b3c95fe 100644
--- a/packages/sdk/src/client-auth-server/interface.ts
+++ b/packages/sdk/src/client-auth-server/interface.ts
@@ -1,5 +1,5 @@
 import { EventEmitter } from "eventemitter3";
-import type { AbiFunction, Address, Hash, RpcSchema as RpcSchemaGeneric } from "viem";
+import type { RpcSchema as RpcSchemaGeneric } from "viem";
 
 import type { ExtractParams, ExtractReturnType, Method, RpcSchema } from "./rpc.js";
 
@@ -37,49 +37,3 @@ export interface AppMetadata {
   name: string;
   icon: string | null;
 }
-
-export enum Condition {
-  Unconstrained = 0,
-  Equal = 1,
-  Greater = 2,
-  Less = 3,
-  GreaterEqual = 4,
-  LessEqual = 5,
-  NotEqual = 6,
-}
-
-export type Limit = {
-  limit: bigint;
-  period?: bigint;
-};
-
-export type CallPolicy = {
-  target: Address;
-  function?: string | AbiFunction;
-  selector?: Hash; // if function is not provided
-  maxValuePerUse?: bigint;
-  valueLimit?: bigint | Limit;
-  constraints?: {
-    index: number | bigint;
-    condition?: Condition | keyof typeof Condition;
-    refValue?: Hash;
-    limit?: Limit;
-  }[];
-};
-
-export type TransferPolicy = {
-  target: Address;
-  maxValuePerUse?: bigint;
-  valueLimit?: bigint | Limit;
-};
-
-export interface SessionPreferences {
-  expiresAt?: bigint;
-  feeLimit?: bigint | Limit;
-  callPolicies?: CallPolicy[];
-  transferPolicies?: TransferPolicy[];
-};
-
-export interface SessionData extends SessionPreferences {
-  sessionPublicKey: Address;
-}
diff --git a/packages/sdk/src/client-auth-server/rpc.ts b/packages/sdk/src/client-auth-server/rpc.ts
index 6555a866..55c49dc0 100644
--- a/packages/sdk/src/client-auth-server/rpc.ts
+++ b/packages/sdk/src/client-auth-server/rpc.ts
@@ -1,25 +1,30 @@
-import type { Address, Hash, PublicRpcSchema, RpcSchema as RpcSchemaGeneric, WalletRpcSchema } from "viem";
+import type { Address, Chain, Hash, PublicRpcSchema, RpcSchema as RpcSchemaGeneric, WalletRpcSchema } from "viem";
 
 import type { SessionRequiredContracts } from "../client/index.js";
 import type { Message } from "../communicator/index.js";
 import type { SerializedEthereumRpcError } from "../errors/index.js";
-import type { AppMetadata, RequestArguments, SessionPreferences } from "./interface.js";
+import type { SessionConfig } from "../utils/session.js";
+import type { AppMetadata, RequestArguments } from "./interface.js";
+import type { SessionPreferences } from "./session.js";
 
 export type AuthServerRpcSchema = [
   {
     Method: "eth_requestAccounts";
     Parameters: {
       metadata: AppMetadata;
-      session?: SessionPreferences;
+      sessionPreferences?: SessionPreferences;
     };
     ReturnType: {
       account: {
         address: Address;
-        activeChainId: number;
-        session?: SessionPreferences & { sessionKey: Hash };
+        activeChainId: Chain["id"];
+        session?: {
+          sessionKey: Hash;
+          sessionConfig: SessionConfig;
+        };
       };
       chainsInfo: {
-        id: number;
+        id: Chain["id"];
         capabilities: Record<string, unknown>;
         contracts: SessionRequiredContracts;
       }[];
diff --git a/packages/sdk/src/client-auth-server/session.ts b/packages/sdk/src/client-auth-server/session.ts
new file mode 100644
index 00000000..a46a477e
--- /dev/null
+++ b/packages/sdk/src/client-auth-server/session.ts
@@ -0,0 +1,105 @@
+import { type AbiFunction, type Address, type Hash, toFunctionSelector, toHex } from "viem";
+
+import { ConstraintCondition, type Limit, LimitType, LimitZero, type SessionConfig } from "../utils/session.js";
+
+type PartialLimit = bigint | {
+  limit: bigint;
+  period?: bigint;
+};
+
+type PartialCallPolicy = {
+  address: Address;
+  function?: string | AbiFunction;
+  selector?: Hash; // if function is not provided
+  maxValuePerUse?: bigint;
+  valueLimit?: PartialLimit;
+  constraints?: {
+    index: number;
+    condition?: ConstraintCondition | keyof typeof ConstraintCondition;
+    refValue?: Hash;
+    limit?: PartialLimit;
+  }[];
+};
+
+type PartialTransferPolicy = {
+  to: Address;
+  maxValuePerUse?: bigint;
+  valueLimit?: PartialLimit;
+};
+
+export interface SessionPreferences {
+  expiresAt?: bigint | Date;
+  fee?: PartialLimit;
+  contractCalls?: PartialCallPolicy[];
+  transfers?: PartialTransferPolicy[];
+};
+
+const formatLimitPreferences = (limit: PartialLimit): Limit => {
+  if (typeof limit === "bigint") {
+    return {
+      limitType: LimitType.Lifetime,
+      limit,
+      period: 0n,
+    };
+  }
+  if (!limit.period || limit.period == 0n) {
+    return {
+      limitType: LimitType.Lifetime,
+      limit: BigInt(limit.limit),
+      period: 0n,
+    };
+  }
+  return {
+    limitType: LimitType.Allowance,
+    limit: BigInt(limit.limit),
+    period: BigInt(limit.period),
+  };
+};
+
+const formatDatePreferences = (date: bigint | Date): bigint => {
+  if (!date) {
+    return BigInt(Math.floor(Date.now() / 1000) + 60 * 60 * 24); // 24h by default
+  }
+  if (date instanceof Date) {
+    return BigInt(Math.floor(date.getTime() / 1000));
+  }
+  return BigInt(date);
+};
+
+export function formatSessionPreferences(
+  preferences: SessionPreferences,
+  defaults: {
+    expiresAt: bigint;
+    fee: Limit;
+  },
+): Omit<SessionConfig, "signer"> {
+  return {
+    expiresAt: preferences.expiresAt ? formatDatePreferences(preferences.expiresAt) : defaults.expiresAt,
+    feeLimit: preferences.fee ? formatLimitPreferences(preferences.fee) : defaults.fee,
+    callPolicies: preferences.contractCalls?.map((policy) => {
+      const valueLimit = policy.valueLimit ? formatLimitPreferences(policy.valueLimit) : LimitZero;
+      const selector = policy.function ? toFunctionSelector(policy.function) : policy.selector;
+      if (!selector) throw new Error("Missing function or selector in contract call policy");
+      return {
+        target: policy.address,
+        maxValuePerUse: policy.maxValuePerUse ?? valueLimit.limit,
+        valueLimit,
+        selector: selector,
+        constraints: policy.constraints?.map((constraint) => ({
+          index: BigInt(constraint.index),
+          condition: typeof constraint.condition == "string" ? ConstraintCondition[constraint.condition] : (constraint.condition ?? 0),
+          refValue: constraint.refValue ?? toHex("", { size: 32 }),
+          limit: constraint.limit ? formatLimitPreferences(constraint.limit) : LimitZero,
+        })) ?? [],
+      };
+    }) ?? [],
+    transferPolicies: preferences.transfers?.map((policy) => {
+      const valueLimit = policy.valueLimit ? formatLimitPreferences(policy.valueLimit) : LimitZero;
+      return {
+        target: policy.to,
+        maxValuePerUse: policy.maxValuePerUse ?? valueLimit.limit,
+        valueLimit,
+      };
+    }) ?? [],
+  };
+}
diff --git a/packages/sdk/src/client/actions/account.ts b/packages/sdk/src/client/actions/account.ts
index 04b02518..e1e6cbdb 100644
--- a/packages/sdk/src/client/actions/account.ts
+++ b/packages/sdk/src/client/actions/account.ts
@@ -3,10 +3,10 @@ import { readContract, waitForTransactionReceipt, writeContract } from "viem/act
 import { getGeneralPaymasterInput } from "viem/zksync";
 
 import { FactoryAbi } from "../../abi/Factory.js";
-import type { SessionData } from "../../client-auth-server/interface.js";
 import { encodeModuleData, encodePasskeyModuleParameters, encodeSession } from "../../utils/encoding.js";
 import { noThrow } from "../../utils/helpers.js";
 import { getPasskeySignatureFromPublicKeyBytes, getPublicKeyBytesFromPasskeySignature } from "../../utils/passkey.js";
+import type { SessionConfig } from "../../utils/session.js";
 
 /* TODO: try to get rid of most of the contract params like passkey, session */
 /* it should come from factory, not passed manually each time */
@@ -21,7 +21,7 @@ export type DeployAccountArgs = {
     passkey: Address;
     session: Address;
   };
-  initialSession?: SessionData;
+  initialSession?: SessionConfig;
   salt?: Uint8Array; // Random 32 bytes
   onTransactionSent?: (hash: Hash) => void;
 };
diff --git a/packages/sdk/src/client/actions/session.ts b/packages/sdk/src/client/actions/session.ts
index ee79c684..5750d3d2 100644
--- a/packages/sdk/src/client/actions/session.ts
+++ b/packages/sdk/src/client/actions/session.ts
@@ -3,9 +3,8 @@ import { waitForTransactionReceipt } from "viem/actions";
 import { getGeneralPaymasterInput, sendTransaction } from "viem/zksync";
 
 import { SessionKeyModuleAbi } from "../../abi/SessionKeyModule.js";
-import type { SessionData } from "../../client-auth-server/interface.js";
 import { noThrow } from "../../utils/helpers.js";
-import { getSession } from "../../utils/session.js";
+import type { SessionConfig } from "../../utils/session.js";
 
 /* DO NOT USE THIS. USE FUNCTION FROM PASSKEY ACTIONS INSTEAD */
 /* TODO: Remove */
@@ -70,7 +69,7 @@ export const createSessionWithPasskey = async <
 } */
 
 export type CreateSessionArgs = {
-  session: SessionData;
+  sessionConfig: SessionConfig;
   contracts: {
     session: Address; // session module
   };
@@ -87,16 +86,12 @@ export const createSession = async <
   const callData = encodeFunctionData({
     abi: SessionKeyModuleAbi,
     functionName: "createSession",
-    args: [{
-      ...getSession(args.session),
-      signer: args.session.sessionPublicKey,
-    }],
+    args: [args.sessionConfig],
   });
 
   let sendTransactionArgs = {
     to: args.contracts.session,
     data: callData,
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   } as any;
 
   if ((client as any).paymasterAddress) {
diff --git a/packages/sdk/src/client/clients/common.ts b/packages/sdk/src/client/clients/common.ts
deleted file mode 100644
index b7097295..00000000
--- a/packages/sdk/src/client/clients/common.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import type { Address } from "viem";
-
-export type ZksyncAccountContracts = {
-  session: Address; // Session, spend limit, etc.
-  accountFactory?: Address; // For account creation
-};
diff --git a/packages/sdk/src/client/clients/session.ts b/packages/sdk/src/client/clients/session.ts
index 8cca37f5..a2e3dd7a 100644
--- a/packages/sdk/src/client/clients/session.ts
+++ b/packages/sdk/src/client/clients/session.ts
@@ -1,9 +1,8 @@
 import { type Account, type Address, type Chain, type Client, createClient, encodeAbiParameters, getAddress, type Hash, type Prettify, publicActions, type PublicRpcSchema, type RpcSchema, type Transport, type WalletClientConfig, type WalletRpcSchema } from "viem";
 import { privateKeyToAccount } from "viem/accounts";
 
-import { type Account as ZKsyncAccount } from "../../client-auth-server/Signer.js";
 import { encodeSession } from "../../utils/encoding.js";
-import { StorageItem } from "../../utils/storage.js";
+import type { SessionConfig } from "../../utils/session.js";
 import { type ZksyncAccountSessionActions, zksyncAccountSessionActions } from "../decorators/session.js";
 import { type ZksyncAccountWalletActions, zksyncAccountWalletActions } from "../decorators/session_wallet.js";
 import { toSmartAccount } from "../smart-account.js";
@@ -27,17 +26,19 @@ export function createZksyncSessionClient<
   const account = toSmartAccount({
     address: parameters.address,
     sign: async ({ hash }) => {
-      const accountInfo = new StorageItem<ZKsyncAccount | null>(StorageItem.scopedStorageKey("account"), null).get();
-      if (!parameters.sessionKey) throw new Error("Session key wasn't provided, can't sign");
-      if (!accountInfo?.session) throw new Error("Session not found in local storage");
-      if (accountInfo.session.sessionKey != parameters.sessionKey) throw new Error("Session key doesn't match the one in local storage");
       const sessionKeySigner = privateKeyToAccount(parameters.sessionKey);
-      const sessionPublicKey = sessionKeySigner.address;
-      const session = { ...accountInfo.session, sessionPublicKey };
       const hashSignature = await sessionKeySigner.sign({ hash });
       return encodeAbiParameters(
-        [{ type: "bytes" }, { type: "address" }, { type: "bytes[]" }],
-        [hashSignature, parameters.contracts.session, [encodeSession(session)]], // FIXME: this is assuming there are no other hooks
+        [
+          { type: "bytes" },
+          { type: "address" },
+          { type: "bytes[]" },
+        ],
+        [
+          hashSignature,
+          parameters.contracts.session,
+          [encodeSession(parameters.sessionConfig)], // FIXME: this is assuming there are no other hooks
+        ],
       );
     },
   });
@@ -48,6 +49,7 @@ export function createZksyncSessionClient<
   })
     .extend(() => ({
       sessionKey: parameters.sessionKey,
+      sessionConfig: parameters.sessionConfig,
       contracts: parameters.contracts,
     }))
     .extend(publicActions)
@@ -60,7 +62,8 @@ export type SessionRequiredContracts = {
   session: Address; // Session, spend limit, etc.
 };
 type ZksyncAccountSessionData = {
-  sessionKey?: Hash;
+  sessionKey: Hash;
+  sessionConfig: SessionConfig;
   contracts: SessionRequiredContracts;
 };
 
@@ -94,7 +97,8 @@ export interface ZksyncAccountSessionClientConfig<
 > extends Omit<WalletClientConfig<transport, chain, Account, rpcSchema>, "account"> {
   chain: NonNullable<chain>;
   address: Address;
-  sessionKey?: Hash;
+  sessionKey: Hash;
+  sessionConfig: SessionConfig;
   contracts: SessionRequiredContracts;
   key?: string;
   name?: string;
diff --git a/packages/sdk/src/client/decorators/passkey.ts b/packages/sdk/src/client/decorators/passkey.ts
index e80fede6..c473306e 100644
--- a/packages/sdk/src/client/decorators/passkey.ts
+++ b/packages/sdk/src/client/decorators/passkey.ts
@@ -1,9 +1,7 @@
-import { type Account, type Chain, type Transport } from "viem";
+import { type Chain, type Transport } from "viem";
 
-import {
-  createSession, type CreateSessionArgs, type CreateSessionReturnType,
-} from "../actions/session.js";
-import type { ClientWithZksyncAccountSessionData } from "../clients/session.js";
+import { createSession, type CreateSessionArgs, type CreateSessionReturnType } from "../actions/session.js";
+import type { ClientWithZksyncAccountPasskeyData } from "../clients/passkey.js";
 
 export type ZksyncAccountPasskeyActions = {
   createSession: (args: Omit<CreateSessionArgs, "contracts">) => Promise<CreateSessionReturnType>;
@@ -12,8 +10,7 @@ export type ZksyncAccountPasskeyActions = {
 export function zksyncAccountPasskeyActions<
   transport extends Transport,
   chain extends Chain,
-  account extends Account,
->(client: ClientWithZksyncAccountSessionData<transport, chain, account>): ZksyncAccountPasskeyActions {
+>(client: ClientWithZksyncAccountPasskeyData<transport, chain>): ZksyncAccountPasskeyActions {
   return {
     createSession: async (args: Omit<CreateSessionArgs, "contracts">) => {
       return await createSession(client, {
diff --git a/packages/sdk/src/client/decorators/session_wallet.ts b/packages/sdk/src/client/decorators/session_wallet.ts
index 3f47fed1..f993ebb9 100644
--- a/packages/sdk/src/client/decorators/session_wallet.ts
+++ b/packages/sdk/src/client/decorators/session_wallet.ts
@@ -119,8 +119,6 @@ const verifyTransactionData = async (
   },
   client: ClientWithZksyncAccountSessionData
 ) => {
-  if (!client.sessionKey) throw new Error('Session key is not set');
-
   const spendLimitCache = new Map<Address, bigint>(); // Prevent multiple calls to getTokenSpendLimit (mostly for ETH)
   const exceedsSpendLimit = async (tokenAddress: Address, amount: bigint): Promise<boolean> => {
     if (!spendLimitCache.has(tokenAddress)) {
diff --git a/packages/sdk/src/client/index.ts b/packages/sdk/src/client/index.ts
index dcb62ae2..eaf69b0e 100644
--- a/packages/sdk/src/client/index.ts
+++ b/packages/sdk/src/client/index.ts
@@ -1,3 +1,2 @@
 export { deployAccount, fetchAccount } from "./actions/account.js";
-export * from "./clients/common.js";
 export * from "./clients/session.js";
diff --git a/packages/sdk/src/connector/index.ts b/packages/sdk/src/connector/index.ts
index ae60c2cd..43db4f70 100644
--- a/packages/sdk/src/connector/index.ts
+++ b/packages/sdk/src/connector/index.ts
@@ -10,11 +10,11 @@ import {
   UserRejectedRequestError,
 } from "viem";
 
-import { type AppMetadata, type ProviderInterface, WalletProvider, type WalletProviderSessionPreferences } from "../index.js";
+import { type AppMetadata, type ProviderInterface, type SessionPreferences, WalletProvider } from "../index.js";
 
 export type ZksyncAccountConnectorOptions = {
   metadata?: Partial<AppMetadata>;
-  session?: WalletProviderSessionPreferences | (() => WalletProviderSessionPreferences | Promise<WalletProviderSessionPreferences>);
+  session?: SessionPreferences | (() => SessionPreferences | Promise<SessionPreferences>);
   authServerUrl?: string;
 };
 
diff --git a/packages/sdk/src/index.ts b/packages/sdk/src/index.ts
index ab27072e..4d888cff 100644
--- a/packages/sdk/src/index.ts
+++ b/packages/sdk/src/index.ts
@@ -1,2 +1,3 @@
-export type { AppMetadata, ProviderInterface, SessionData, SessionPreferences } from "./client-auth-server/interface.js";
-export { WalletProvider, type WalletProviderConstructorOptions, type WalletProviderSessionPreferences } from "./client-auth-server/WalletProvider.js";
+export type { AppMetadata, ProviderInterface } from "./client-auth-server/interface.js";
+export type { SessionPreferences } from "./client-auth-server/session.js";
+export { WalletProvider, type WalletProviderConstructorOptions } from "./client-auth-server/WalletProvider.js";
diff --git a/packages/sdk/src/utils/encoding.ts b/packages/sdk/src/utils/encoding.ts
index 15d55156..efa70eac 100644
--- a/packages/sdk/src/utils/encoding.ts
+++ b/packages/sdk/src/utils/encoding.ts
@@ -1,82 +1,17 @@
-import { type Address, encodeAbiParameters, type Hash, parseAbiParameters, toHex } from "viem";
+import { type Address, encodeAbiParameters, encodeFunctionData, type Hash, parseAbiParameters, toHex } from "viem";
 
-import type { SessionData } from "../client-auth-server/interface.js";
-import { getSession } from "../utils/session.js";
+import { SessionKeyModuleAbi } from "../abi/SessionKeyModule.js";
+import type { SessionConfig } from "../utils/session.js";
+import { SessionSpec } from "./session.js";
 
-export const encodeSession = (session: SessionData) => {
-  const sessionSpec = {
-    components: [
-      { name: "signer", type: "address" },
-      { name: "expiresAt", type: "uint256" },
-      {
-        components: [
-          { name: "limitType", type: "uint8" },
-          { name: "limit", type: "uint256" },
-          { name: "period", type: "uint256" },
-        ],
-        name: "feeLimit",
-        type: "tuple",
-      },
-      {
-        components: [
-          { name: "target", type: "address" },
-          { name: "selector", type: "bytes4" },
-          { name: "maxValuePerUse", type: "uint256" },
-          {
-            components: [
-              { name: "limitType", type: "uint8" },
-              { name: "limit", type: "uint256" },
-              { name: "period", type: "uint256" },
-            ],
-            name: "valueLimit",
-            type: "tuple",
-          },
-          {
-            components: [
-              { name: "condition", type: "uint8" },
-              { name: "index", type: "uint64" },
-              { name: "refValue", type: "bytes32" },
-              {
-                components: [
-                  { name: "limitType", type: "uint8" },
-                  { name: "limit", type: "uint256" },
-                  { name: "period", type: "uint256" },
-                ],
-                name: "limit",
-                type: "tuple",
-              },
-            ],
-            name: "constraints",
-            type: "tuple[]",
-          },
-        ],
-        name: "callPolicies",
-        type: "tuple[]",
-      },
-      {
-        components: [
-          { name: "target", type: "address" },
-          { name: "maxValuePerUse", type: "uint256" },
-          {
-            components: [
-              { name: "limitType", type: "uint8" },
-              { name: "limit", type: "uint256" },
-              { name: "period", type: "uint256" },
-            ],
-            name: "valueLimit",
-            type: "tuple",
-          },
-        ],
-        name: "transferPolicies",
-        type: "tuple[]",
-      },
-    ],
-    name: "newSession",
-    type: "tuple",
-  };
-
-  const fullSession = { ...getSession(session), signer: session.sessionPublicKey };
-  return encodeAbiParameters([sessionSpec], [fullSession]);
+export const encodeSession = (sessionConfig: SessionConfig) => {
+  const callData = encodeFunctionData({
+    abi: SessionKeyModuleAbi,
+    functionName: "createSession",
+    args: [sessionConfig],
+  });
+  console.log("Equal", callData === encodeAbiParameters([SessionSpec], [sessionConfig]));
+  return encodeAbiParameters([SessionSpec], [sessionConfig]);
 };
 
 export const encodePasskeyModuleParameters = (passkey: { passkeyPublicKey: [Buffer, Buffer]; expectedOrigin: string }) => {
diff --git a/packages/sdk/src/utils/session.ts b/packages/sdk/src/utils/session.ts
index 5962cc18..f104450e 100644
--- a/packages/sdk/src/utils/session.ts
+++ b/packages/sdk/src/utils/session.ts
@@ -1,69 +1,135 @@
-import { toFunctionSelector, toHex } from "viem";
+import { type Address, type Hash } from "viem";
 
-import { Condition, type Limit, type SessionPreferences } from "../client-auth-server/interface.js";
+export const SessionSpec = {
+  components: [
+    { name: "signer", type: "address" },
+    { name: "expiresAt", type: "uint256" },
+    {
+      components: [
+        { name: "limitType", type: "uint8" },
+        { name: "limit", type: "uint256" },
+        { name: "period", type: "uint256" },
+      ],
+      name: "feeLimit",
+      type: "tuple",
+    },
+    {
+      components: [
+        { name: "target", type: "address" },
+        { name: "selector", type: "bytes4" },
+        { name: "maxValuePerUse", type: "uint256" },
+        {
+          components: [
+            { name: "limitType", type: "uint8" },
+            { name: "limit", type: "uint256" },
+            { name: "period", type: "uint256" },
+          ],
+          name: "valueLimit",
+          type: "tuple",
+        },
+        {
+          components: [
+            { name: "condition", type: "uint8" },
+            { name: "index", type: "uint64" },
+            { name: "refValue", type: "bytes32" },
+            {
+              components: [
+                { name: "limitType", type: "uint8" },
+                { name: "limit", type: "uint256" },
+                { name: "period", type: "uint256" },
+              ],
+              name: "limit",
+              type: "tuple",
+            },
+          ],
+          name: "constraints",
+          type: "tuple[]",
+        },
+      ],
+      name: "callPolicies",
+      type: "tuple[]",
+    },
+    {
+      components: [
+        { name: "target", type: "address" },
+        { name: "maxValuePerUse", type: "uint256" },
+        {
+          components: [
+            { name: "limitType", type: "uint8" },
+            { name: "limit", type: "uint256" },
+            { name: "period", type: "uint256" },
+          ],
+          name: "valueLimit",
+          type: "tuple",
+        },
+      ],
+      name: "transferPolicies",
+      type: "tuple[]",
+    },
+  ],
+  name: "newSession",
+  type: "tuple",
+} as const;
 
-enum LimitType {
+export enum LimitType {
   Unlimited = 0,
   Lifetime = 1,
   Allowance = 2,
 }
 
-export function getLimit(limit: bigint | Limit | undefined) {
-  if (!limit) {
-    return {
-      limitType: LimitType.Unlimited,
-      limit: 0n,
-      period: 0n,
-    };
-  }
-  if (typeof limit === "bigint") {
-    return {
-      limitType: LimitType.Lifetime,
-      limit,
-      period: 0n,
-    };
-  }
-  if (!limit.period || limit.period == 0n) {
-    return {
-      limitType: LimitType.Lifetime,
-      limit: BigInt(limit.limit),
-      period: 0n,
-    };
-  }
-  return {
-    limitType: LimitType.Allowance,
-    limit: BigInt(limit.limit),
-    period: BigInt(limit.period),
-  };
-}
+export type Limit = {
+  limitType: LimitType;
+  limit: bigint;
+  period: bigint;
+};
+
+export const LimitUnlimited = {
+  limitType: LimitType.Unlimited,
+  limit: 0n,
+  period: 0n,
+};
 
-export function getSession(session: SessionPreferences) {
-  return {
-    expiresAt: BigInt(session.expiresAt ?? Math.floor(Date.now() / 1000) + 60 * 60 * 24),
-    feeLimit: getLimit(session.feeLimit),
-    callPolicies: session.callPolicies?.map((policy) => {
-      const valueLimit = getLimit(policy.valueLimit);
-      const selector = policy.function ? toFunctionSelector(policy.function) : policy.selector;
-      return {
-        target: policy.target,
-        maxValuePerUse: policy.maxValuePerUse ?? valueLimit.limit,
-        valueLimit,
-        selector: selector || toHex("", { size: 4 }),
-        constraints: policy.constraints?.map((constraint) => ({
-          condition: typeof constraint.condition == "string" ? Condition[constraint.condition] : (constraint.condition ?? 0),
-          index: BigInt(constraint.index),
-          refValue: constraint.refValue ?? toHex("", { size: 32 }),
-          limit: getLimit(constraint.limit),
-        })) ?? [],
-      };
-    }) ?? [],
-    transferPolicies: session.transferPolicies?.map((policy) => {
-      const valueLimit = getLimit(policy.valueLimit);
-      return {
-        target: policy.target,
-        maxValuePerUse: policy.maxValuePerUse ?? valueLimit.limit,
-        valueLimit,
-      };
-    }) ?? [],
-  };
+export const LimitZero = {
+  limitType: LimitType.Unlimited,
+  limit: 0n,
+  period: 0n,
+};
+
+export enum ConstraintCondition {
+  Unconstrained = 0,
+  Equal = 1,
+  Greater = 2,
+  Less = 3,
+  GreaterEqual = 4,
+  LessEqual = 5,
+  NotEqual = 6,
 }
+
+export type Constraint = {
+  index: bigint;
+  condition: ConstraintCondition;
+  refValue: Hash;
+  limit: Limit;
+};
+
+export type CallPolicy = {
+  target: Address;
+  valueLimit: Limit;
+  maxValuePerUse: bigint;
+  selector: Hash;
+  constraints: Constraint[];
+};
+
+export type TransferPolicy = {
+  target: Address;
+  maxValuePerUse: bigint;
+  valueLimit: Limit;
+};
+
+export type SessionConfig = {
+  signer: Address;
+  expiresAt: bigint;
+  feeLimit: Limit;
+  callPolicies: CallPolicy[];
+  transferPolicies: TransferPolicy[];
+};

From c0578b3af4f6712e95e40f3dfaa0bb0a2283b629 Mon Sep 17 00:00:00 2001
From: Jack Hamer <jackhamer0990@gmail.com>
Date: Tue, 12 Nov 2024 17:21:40 +0200
Subject: [PATCH 15/42] fix: enable ci and fix docs

---
 .github/workflows/ci.yml                      |  2 -
 .github/workflows/lint.yml                    |  2 -
 docs/sdk/client-auth-server/README.md         |  6 +--
 docs/sdk/client/README.md                     | 50 ++++++++++++-------
 .../views/confirmation/RequestSession.vue     | 22 ++++----
 .../sdk/src/client-auth-server/session.ts     |  3 --
 6 files changed, 48 insertions(+), 37 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1a636b7f..aab527c0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,9 +2,7 @@ name: CI
 
 on:
   push:
-    branches: [ "main" ]
   pull_request:
-    branches: [ "main" ]
   workflow_dispatch:
 
 jobs:
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 130554d6..7a2029e2 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -2,9 +2,7 @@ name: Lint
 
 on:
   push:
-    branches: [ "main" ]
   pull_request:
-    branches: [ "main" ]
   workflow_dispatch:
 
 jobs:
diff --git a/docs/sdk/client-auth-server/README.md b/docs/sdk/client-auth-server/README.md
index c6e33e6a..66da464e 100644
--- a/docs/sdk/client-auth-server/README.md
+++ b/docs/sdk/client-auth-server/README.md
@@ -14,11 +14,11 @@ import { zksyncAccountConnector } from "zksync-sso/connector";
 const ssoConnector = zksyncAccountConnector({
   // Optional session configuration
   session: {
-    feeLimit: parseEther("0.1"),
+    fee: parseEther("0.1"),
     // Allow transfers to a specific address with a limit of 0.1 ETH
-    transferPolicies: [
+    transfers: [
       {
-        target: "0x188bd99cd7D4d78d4E605Aeea12C17B32CC3135A",
+        to: "0x188bd99cd7D4d78d4E605Aeea12C17B32CC3135A",
         valueLimit: parseEther("0.1"),
       },
     ],
diff --git a/docs/sdk/client/README.md b/docs/sdk/client/README.md
index 7a0d80c5..1d5d539c 100644
--- a/docs/sdk/client/README.md
+++ b/docs/sdk/client/README.md
@@ -71,20 +71,36 @@ development principles in mind.
    Now you can use the `passkeyClient` as a regular viem client. When signing
    transactions, user will be prompted for confirmation via passkey.
 
-4. Activating session key
-
-   ```ts
-   await passkeyClient.createSession({
-     session: {
-       sessionPublicKey,
-       expiresAt: Math.floor(Date.now() / 1000) + 60 * 60 * 24 * 7, // 1 week
-       feeLimit: { limit: parseEther("0.01") },
-       transferPolicies: [
-         {
-           target: transferTarget.address,
-           maxValuePerUse: parseEther("0.1"),
-         },
-       ],
-     },
-   });
-   ```
+4. Creating a session
+
+  ```ts
+  import { parseEther } from "viem";
+  import { LimitType } from "zksync-sso/utils";
+
+  await passkeyClient.createSession({
+    // See packages/sdk/src/client-auth-server/session.ts for an easier way to create the sessionConfig
+    sessionConfig: {
+      signer: sessionPublicKey,
+      expiresAt: BigInt(Math.floor(Date.now() / 1000) + 60 * 60 * 24), // 24 hours
+      feeLimit: {
+        limitType: LimitType.Lifetime,
+        limit: parseEther("0.01"),
+        period: 0n,
+      },
+      transferPolicies: [
+        {
+          target: "0x123...",
+          maxValuePerUse: parseEther("0.01"),
+          valueLimit: {
+            limitType: LimitType.Lifetime,
+            limit: parseEther("0.01"),
+            period: 0n,
+          },
+        }
+      ],
+      callPolicies: [
+        ...
+      ],
+    },
+  });
+  ```
diff --git a/packages/auth-server/components/views/confirmation/RequestSession.vue b/packages/auth-server/components/views/confirmation/RequestSession.vue
index 9ddd2784..0c0c1dbd 100644
--- a/packages/auth-server/components/views/confirmation/RequestSession.vue
+++ b/packages/auth-server/components/views/confirmation/RequestSession.vue
@@ -135,17 +135,19 @@ const { respond, deny } = useRequestsStore();
 const { responseInProgress, requestChain } = storeToRefs(useRequestsStore());
 const { fetchTokenInfo } = useTokenUtilities(computed(() => requestChain.value!.id));
 const { getClient } = useClientStore();
-const sessionConfig = computed(() => formatSessionPreferences(
-  props.sessionPreferences,
-  {
-    expiresAt: BigInt(Math.floor(Date.now() / 1000) + 60 * 60 * 24), // 24 hours
-    fee: {
-      limitType: LimitType.Lifetime,
-      limit: parseEther("0.01"),
-      period: 0n,
+const sessionConfig = computed(() => {
+  return formatSessionPreferences(
+    props.sessionPreferences,
+    {
+      expiresAt: BigInt(Math.floor(Date.now() / 1000) + 60 * 60 * 24), // 24 hours
+      fee: {
+        limitType: LimitType.Lifetime,
+        limit: parseEther("0.01"),
+        period: 0n,
+      },
     },
-  },
-));
+  );
+});
 
 const domain = computed(() => new URL(origin.value).host);
 const sessionExpiresIn = useTimeAgo(Number(sessionConfig.value.expiresAt) * 1000);
diff --git a/packages/sdk/src/client-auth-server/session.ts b/packages/sdk/src/client-auth-server/session.ts
index a46a477e..dae0c328 100644
--- a/packages/sdk/src/client-auth-server/session.ts
+++ b/packages/sdk/src/client-auth-server/session.ts
@@ -57,9 +57,6 @@ const formatLimitPreferences = (limit: PartialLimit): Limit => {
 };
 
 const formatDatePreferences = (date: bigint | Date): bigint => {
-  if (!date) {
-    return BigInt(Math.floor(Date.now() / 1000) + 60 * 60 * 24); // 24h by default
-  }
   if (date instanceof Date) {
     return BigInt(Math.floor(date.getTime() / 1000));
   }

From 4bc524de75f8c7fd57a423db59f9837b71dfacab Mon Sep 17 00:00:00 2001
From: Jack Hamer <jackhamer0990@gmail.com>
Date: Tue, 12 Nov 2024 17:25:47 +0200
Subject: [PATCH 16/42] fix: readme formatting

---
 docs/sdk/client/README.md | 60 +++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/docs/sdk/client/README.md b/docs/sdk/client/README.md
index 1d5d539c..13ec5b6f 100644
--- a/docs/sdk/client/README.md
+++ b/docs/sdk/client/README.md
@@ -73,34 +73,34 @@ development principles in mind.
 
 4. Creating a session
 
-  ```ts
-  import { parseEther } from "viem";
-  import { LimitType } from "zksync-sso/utils";
-
-  await passkeyClient.createSession({
-    // See packages/sdk/src/client-auth-server/session.ts for an easier way to create the sessionConfig
-    sessionConfig: {
-      signer: sessionPublicKey,
-      expiresAt: BigInt(Math.floor(Date.now() / 1000) + 60 * 60 * 24), // 24 hours
-      feeLimit: {
-        limitType: LimitType.Lifetime,
-        limit: parseEther("0.01"),
-        period: 0n,
-      },
-      transferPolicies: [
-        {
-          target: "0x123...",
-          maxValuePerUse: parseEther("0.01"),
-          valueLimit: {
-            limitType: LimitType.Lifetime,
-            limit: parseEther("0.01"),
-            period: 0n,
-          },
-        }
-      ],
-      callPolicies: [
-        ...
-      ],
+```ts
+import { parseEther } from "viem";
+import { LimitType } from "zksync-sso/utils";
+
+await passkeyClient.createSession({
+  // See packages/sdk/src/client-auth-server/session.ts for an easier way to create the sessionConfig
+  sessionConfig: {
+    signer: sessionPublicKey,
+    expiresAt: BigInt(Math.floor(Date.now() / 1000) + 60 * 60 * 24), // 24 hours
+    feeLimit: {
+      limitType: LimitType.Lifetime,
+      limit: parseEther("0.01"),
+      period: 0n,
     },
-  });
-  ```
+    transferPolicies: [
+      {
+        target: "0x123...",
+        maxValuePerUse: parseEther("0.01"),
+        valueLimit: {
+          limitType: LimitType.Lifetime,
+          limit: parseEther("0.01"),
+          period: 0n,
+        },
+      }
+    ],
+    callPolicies: [
+      ...
+    ],
+  },
+});
+```

From 13b4e07d470c6cdec916ee9ae6111d4f0324fc7e Mon Sep 17 00:00:00 2001
From: Jack Hamer <jackhamer0990@gmail.com>
Date: Tue, 12 Nov 2024 17:26:29 +0200
Subject: [PATCH 17/42] fix: remove redundant workflow triggers

---
 .github/workflows/ci.yml   | 1 -
 .github/workflows/lint.yml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index aab527c0..77b698b7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,7 +1,6 @@
 name: CI
 
 on:
-  push:
   pull_request:
   workflow_dispatch:
 
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 7a2029e2..ac3a7d8b 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -1,7 +1,6 @@
 name: Lint
 
 on:
-  push:
   pull_request:
   workflow_dispatch:
 

From f404b9e2fe2a5025a578b2d313d5a1466bdf2b6d Mon Sep 17 00:00:00 2001
From: Jack Hamer <jackhamer0990@gmail.com>
Date: Tue, 12 Nov 2024 17:29:57 +0200
Subject: [PATCH 18/42] fix: update contract addresses

---
 packages/auth-server/stores/client.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/auth-server/stores/client.ts b/packages/auth-server/stores/client.ts
index 8b79a733..51db3f53 100644
--- a/packages/auth-server/stores/client.ts
+++ b/packages/auth-server/stores/client.ts
@@ -25,8 +25,8 @@ export const contractsByChain: Record<SupportedChainId, ChainContracts> = {
   [zksyncInMemoryNode.id]: {
     session: "0xc81BdB6e98da8e23aa646969A7e942752b9B10c4",
     passkey: "0x07734BA326b6AD13BfC0115b0903EB14268F1617",
-    accountFactory: "0xaAF5f437fB0524492886fbA64D703df15BF619AE",
-    accountPaymaster: "0x4AFf97f4c3d77C6a4A695AA00e2f857c3E97411A",
+    accountFactory: "0x55C9400Ef6e7779433Dd4c5a0Cdb9514E5f43f96",
+    accountPaymaster: "0x381bd83F36c33E1bF48600E84edED6367F306C92",
   },
 };
 

From d09bd789b5fbe3de2a5400f2dd3dea810c179b14 Mon Sep 17 00:00:00 2001
From: Jack Hamer <jackhamer0990@gmail.com>
Date: Tue, 12 Nov 2024 17:40:11 +0200
Subject: [PATCH 19/42] fix: update addresses

---
 packages/auth-server/stores/client.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/auth-server/stores/client.ts b/packages/auth-server/stores/client.ts
index 8b79a733..e5bda169 100644
--- a/packages/auth-server/stores/client.ts
+++ b/packages/auth-server/stores/client.ts
@@ -26,7 +26,7 @@ export const contractsByChain: Record<SupportedChainId, ChainContracts> = {
     session: "0xc81BdB6e98da8e23aa646969A7e942752b9B10c4",
     passkey: "0x07734BA326b6AD13BfC0115b0903EB14268F1617",
     accountFactory: "0xaAF5f437fB0524492886fbA64D703df15BF619AE",
-    accountPaymaster: "0x4AFf97f4c3d77C6a4A695AA00e2f857c3E97411A",
+    accountPaymaster: "0x25f2725637E9340E8f2a59eCb92F5fE0dA8e8573",
   },
 };
 

From 6659e398e725e9d0127fc6db192b6c3139cb8a2f Mon Sep 17 00:00:00 2001
From: Jack Hamer <jackhamer0990@gmail.com>
Date: Tue, 12 Nov 2024 18:57:21 +0200
Subject: [PATCH 20/42] fix: popup communicator

---
 packages/auth-server/utils/communicator.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/auth-server/utils/communicator.ts b/packages/auth-server/utils/communicator.ts
index 425652bc..e841cab9 100644
--- a/packages/auth-server/utils/communicator.ts
+++ b/packages/auth-server/utils/communicator.ts
@@ -10,14 +10,9 @@ import type { Message, PopupConfigMessage } from "zksync-sso/communicator";
  */
 class PopupCommunicator {
   private listeners = new Map<(_: MessageEvent) => boolean, { reject: (_: Error) => void }>();
-  private openerOrigin: string;
+  private openerOrigin: string | null = null;
 
-  constructor() {
-    const origin = (new URLSearchParams(window.location.search)).get("origin");
-    if (!origin) throw new Error("Origin not defined in query params");
-    this.openerOrigin = origin;
-    window.addEventListener("message", this.messageHandler);
-  }
+  // constructor() {}
 
   /**
    * Handles incoming messages and routes them to the appropriate listeners.
@@ -76,6 +71,11 @@ class PopupCommunicator {
    * Initializes the communicator and sends a version message
    */
   init = () => {
+    const origin = (new URLSearchParams(window.location.search)).get("origin");
+    if (!origin) throw new Error("Origin not defined in query params");
+    this.openerOrigin = origin;
+    window.addEventListener("message", this.messageHandler);
+
     this.postMessage<PopupConfigMessage>({
       event: "PopupLoaded",
       id: crypto.randomUUID(),

From 827512c2e06bb5a1fabf113c3e96db2eb58c3c65 Mon Sep 17 00:00:00 2001
From: Jack Hamer <jackhamer0990@gmail.com>
Date: Tue, 12 Nov 2024 19:41:15 +0200
Subject: [PATCH 21/42] fix: e2e

---
 packages/contracts/test/SessionKeyTest.ts | 2 +-
 packages/nft-quest/stores/connector.ts    | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/contracts/test/SessionKeyTest.ts b/packages/contracts/test/SessionKeyTest.ts
index aed13e03..e03bc5fa 100644
--- a/packages/contracts/test/SessionKeyTest.ts
+++ b/packages/contracts/test/SessionKeyTest.ts
@@ -263,7 +263,7 @@ describe("SessionKeyModule tests", function () {
     logInfo(`Session Address                : ${await sessionModuleContract.getAddress()}`);
     logInfo(`Passkey Address                : ${await verifierContract.getAddress()}`);
     logInfo(`Account Factory Address        : ${await factoryContract.getAddress()}`);
-    logInfo(`Account Implementation Address : ${await erc7579Contract.getAddress()}`);
+    // logInfo(`Account Implementation Address : ${await erc7579Contract.getAddress()}`);
     logInfo(`Auth Server Paymaster Address  : ${await authServerPaymaster.getAddress()}`);
   });
 
diff --git a/packages/nft-quest/stores/connector.ts b/packages/nft-quest/stores/connector.ts
index 472e0ef7..3f14d516 100644
--- a/packages/nft-quest/stores/connector.ts
+++ b/packages/nft-quest/stores/connector.ts
@@ -10,7 +10,9 @@ export const useConnectorStore = defineStore("connector", () => {
     zksyncInMemoryNode,
     zksyncLocalNode,
   ] as const;
+  const chain = supportedChains.filter((x) => x.id == runtimeConfig.public.chain.id)[0];
   type SupportedChainId = (typeof supportedChains)[number]["id"];
+  if (!chain) throw new Error(`Chain with id ${runtimeConfig.public.chain.id} was not found in supported chains list`);
 
   const connector = zksyncAccountConnector({
     metadata: {
@@ -27,7 +29,7 @@ export const useConnectorStore = defineStore("connector", () => {
     },
   });
   const wagmiConfig = createConfig({
-    chains: supportedChains,
+    chains: [chain],
     connectors: [connector as CreateConnectorFn],
     transports: (Object.fromEntries(supportedChains.map((chain) => [chain.id, http()]))) as Record<SupportedChainId, ReturnType<typeof http>>,
   });
@@ -44,9 +46,6 @@ export const useConnectorStore = defineStore("connector", () => {
   });
 
   const connectAccount = async () => {
-    const chain = supportedChains.filter((x) => x.id == runtimeConfig.public.chain.id)[0];
-    if (!chain) throw new Error(`Chain with id ${runtimeConfig.public.chain.id} is missing from the supported chains list`);
-
     return await connect(wagmiConfig, {
       connector,
       chainId: chain.id,

From 95c3af81cc0b87563ae71b4790229d33e5400767 Mon Sep 17 00:00:00 2001
From: Jack Hamer <jackhamer0990@gmail.com>
Date: Tue, 12 Nov 2024 19:44:21 +0200
Subject: [PATCH 22/42] fix: move session defaults out of computed

---
 .../views/confirmation/RequestSession.vue     | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/packages/auth-server/components/views/confirmation/RequestSession.vue b/packages/auth-server/components/views/confirmation/RequestSession.vue
index 0c0c1dbd..8d6fedff 100644
--- a/packages/auth-server/components/views/confirmation/RequestSession.vue
+++ b/packages/auth-server/components/views/confirmation/RequestSession.vue
@@ -135,19 +135,16 @@ const { respond, deny } = useRequestsStore();
 const { responseInProgress, requestChain } = storeToRefs(useRequestsStore());
 const { fetchTokenInfo } = useTokenUtilities(computed(() => requestChain.value!.id));
 const { getClient } = useClientStore();
-const sessionConfig = computed(() => {
-  return formatSessionPreferences(
-    props.sessionPreferences,
-    {
-      expiresAt: BigInt(Math.floor(Date.now() / 1000) + 60 * 60 * 24), // 24 hours
-      fee: {
-        limitType: LimitType.Lifetime,
-        limit: parseEther("0.01"),
-        period: 0n,
-      },
-    },
-  );
-});
+
+const defaults = {
+  expiresAt: BigInt(Math.floor(Date.now() / 1000) + 60 * 60 * 24), // 24 hours
+  fee: {
+    limitType: LimitType.Lifetime,
+    limit: parseEther("0.01"),
+    period: 0n,
+  },
+};
+const sessionConfig = computed(() => formatSessionPreferences(props.sessionPreferences, defaults));
 
 const domain = computed(() => new URL(origin.value).host);
 const sessionExpiresIn = useTimeAgo(Number(sessionConfig.value.expiresAt) * 1000);

From c7636ba2f09d967cba628cac00164e86eff253a2 Mon Sep 17 00:00:00 2001
From: Jack Hamer <jackhamer0990@gmail.com>
Date: Wed, 13 Nov 2024 11:11:00 +0200
Subject: [PATCH 23/42] fix: rename fee to feeLimit

---
 docs/sdk/client-auth-server/README.md                       | 2 +-
 .../components/views/confirmation/RequestSession.vue        | 2 +-
 packages/demo-app/pages/index.vue                           | 2 +-
 packages/nft-quest/stores/connector.ts                      | 2 +-
 packages/sdk/src/client-auth-server/session.ts              | 6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/sdk/client-auth-server/README.md b/docs/sdk/client-auth-server/README.md
index 66da464e..6dcdfff3 100644
--- a/docs/sdk/client-auth-server/README.md
+++ b/docs/sdk/client-auth-server/README.md
@@ -14,7 +14,7 @@ import { zksyncAccountConnector } from "zksync-sso/connector";
 const ssoConnector = zksyncAccountConnector({
   // Optional session configuration
   session: {
-    fee: parseEther("0.1"),
+    feeLimit: parseEther("0.1"),
     // Allow transfers to a specific address with a limit of 0.1 ETH
     transfers: [
       {
diff --git a/packages/auth-server/components/views/confirmation/RequestSession.vue b/packages/auth-server/components/views/confirmation/RequestSession.vue
index 8d6fedff..e455c139 100644
--- a/packages/auth-server/components/views/confirmation/RequestSession.vue
+++ b/packages/auth-server/components/views/confirmation/RequestSession.vue
@@ -138,7 +138,7 @@ const { getClient } = useClientStore();
 
 const defaults = {
   expiresAt: BigInt(Math.floor(Date.now() / 1000) + 60 * 60 * 24), // 24 hours
-  fee: {
+  feeLimit: {
     limitType: LimitType.Lifetime,
     limit: parseEther("0.01"),
     period: 0n,
diff --git a/packages/demo-app/pages/index.vue b/packages/demo-app/pages/index.vue
index 2757947e..fd58fb7e 100644
--- a/packages/demo-app/pages/index.vue
+++ b/packages/demo-app/pages/index.vue
@@ -50,7 +50,7 @@ const testTransferTarget = "0x55bE1B079b53962746B2e86d12f158a41DF294A6";
 const zksyncConnector = zksyncAccountConnector({
   authServerUrl: "http://localhost:3002/confirm",
   session: {
-    fee: parseEther("0.1"),
+    feeLimit: parseEther("0.1"),
     transfers: [
       {
         to: testTransferTarget,
diff --git a/packages/nft-quest/stores/connector.ts b/packages/nft-quest/stores/connector.ts
index 3f14d516..dd7e3c33 100644
--- a/packages/nft-quest/stores/connector.ts
+++ b/packages/nft-quest/stores/connector.ts
@@ -21,7 +21,7 @@ export const useConnectorStore = defineStore("connector", () => {
     },
     authServerUrl: runtimeConfig.public.authServerUrl,
     session: {
-      fee: parseEther("0.1"),
+      feeLimit: parseEther("0.1"),
       contractCalls: [{
         address: runtimeConfig.public.contracts.nft as Hash,
         function: "mint(address)",
diff --git a/packages/sdk/src/client-auth-server/session.ts b/packages/sdk/src/client-auth-server/session.ts
index dae0c328..812ade1c 100644
--- a/packages/sdk/src/client-auth-server/session.ts
+++ b/packages/sdk/src/client-auth-server/session.ts
@@ -29,7 +29,7 @@ type PartialTransferPolicy = {
 
 export interface SessionPreferences {
   expiresAt?: bigint | Date;
-  fee?: PartialLimit;
+  feeLimit?: PartialLimit;
   contractCalls?: PartialCallPolicy[];
   transfers?: PartialTransferPolicy[];
 };
@@ -67,12 +67,12 @@ export function formatSessionPreferences(
   preferences: SessionPreferences,
   defaults: {
     expiresAt: bigint;
-    fee: Limit;
+    feeLimit: Limit;
   },
 ): Omit<SessionConfig, "signer"> {
   return {
     expiresAt: preferences.expiresAt ? formatDatePreferences(preferences.expiresAt) : defaults.expiresAt,
-    feeLimit: preferences.fee ? formatLimitPreferences(preferences.fee) : defaults.fee,
+    feeLimit: preferences.feeLimit ? formatLimitPreferences(preferences.feeLimit) : defaults.feeLimit,
     callPolicies: preferences.contractCalls?.map((policy) => {
       const valueLimit = policy.valueLimit ? formatLimitPreferences(policy.valueLimit) : LimitZero;
       const selector = policy.function ? toFunctionSelector(policy.function) : policy.selector;

From fd4333c697bc109912ac9572cba3a9d014f633d8 Mon Sep 17 00:00:00 2001
From: Jack Hamer <jackhamer0990@gmail.com>
Date: Wed, 13 Nov 2024 11:14:34 +0200
Subject: [PATCH 24/42] fix: limit zero incorrect LimitType

---
 packages/sdk/src/utils/session.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/sdk/src/utils/session.ts b/packages/sdk/src/utils/session.ts
index f104450e..6c8f0db9 100644
--- a/packages/sdk/src/utils/session.ts
+++ b/packages/sdk/src/utils/session.ts
@@ -90,7 +90,7 @@ export const LimitUnlimited = {
 };
 
 export const LimitZero = {
-  limitType: LimitType.Unlimited,
+  limitType: LimitType.Lifetime,
   limit: 0n,
   period: 0n,
 };

From f2fb3fd0b03e738acfdd83cbed612ae6a435773e Mon Sep 17 00:00:00 2001
From: Jack Hamer <jackhamer0990@gmail.com>
Date: Wed, 13 Nov 2024 11:35:48 +0200
Subject: [PATCH 25/42] fix: remove session spec, which is copy of
 createSession from abi

---
 packages/sdk/src/utils/encoding.ts |  6 +--
 packages/sdk/src/utils/session.ts  | 71 ------------------------------
 2 files changed, 3 insertions(+), 74 deletions(-)

diff --git a/packages/sdk/src/utils/encoding.ts b/packages/sdk/src/utils/encoding.ts
index efa70eac..3bfb82ee 100644
--- a/packages/sdk/src/utils/encoding.ts
+++ b/packages/sdk/src/utils/encoding.ts
@@ -2,7 +2,6 @@ import { type Address, encodeAbiParameters, encodeFunctionData, type Hash, parse
 
 import { SessionKeyModuleAbi } from "../abi/SessionKeyModule.js";
 import type { SessionConfig } from "../utils/session.js";
-import { SessionSpec } from "./session.js";
 
 export const encodeSession = (sessionConfig: SessionConfig) => {
   const callData = encodeFunctionData({
@@ -10,8 +9,9 @@ export const encodeSession = (sessionConfig: SessionConfig) => {
     functionName: "createSession",
     args: [sessionConfig],
   });
-  console.log("Equal", callData === encodeAbiParameters([SessionSpec], [sessionConfig]));
-  return encodeAbiParameters([SessionSpec], [sessionConfig]);
+  const selector = callData.slice(0, "0x".length + 8); // first 4 bytes for function selector
+  const args = `0x${callData.slice(selector.length, callData.length)}`; // the rest is the arguments
+  return args;
 };
 
 export const encodePasskeyModuleParameters = (passkey: { passkeyPublicKey: [Buffer, Buffer]; expectedOrigin: string }) => {
diff --git a/packages/sdk/src/utils/session.ts b/packages/sdk/src/utils/session.ts
index 6c8f0db9..434f3003 100644
--- a/packages/sdk/src/utils/session.ts
+++ b/packages/sdk/src/utils/session.ts
@@ -1,76 +1,5 @@
 import { type Address, type Hash } from "viem";
 
-export const SessionSpec = {
-  components: [
-    { name: "signer", type: "address" },
-    { name: "expiresAt", type: "uint256" },
-    {
-      components: [
-        { name: "limitType", type: "uint8" },
-        { name: "limit", type: "uint256" },
-        { name: "period", type: "uint256" },
-      ],
-      name: "feeLimit",
-      type: "tuple",
-    },
-    {
-      components: [
-        { name: "target", type: "address" },
-        { name: "selector", type: "bytes4" },
-        { name: "maxValuePerUse", type: "uint256" },
-        {
-          components: [
-            { name: "limitType", type: "uint8" },
-            { name: "limit", type: "uint256" },
-            { name: "period", type: "uint256" },
-          ],
-          name: "valueLimit",
-          type: "tuple",
-        },
-        {
-          components: [
-            { name: "condition", type: "uint8" },
-            { name: "index", type: "uint64" },
-            { name: "refValue", type: "bytes32" },
-            {
-              components: [
-                { name: "limitType", type: "uint8" },
-                { name: "limit", type: "uint256" },
-                { name: "period", type: "uint256" },
-              ],
-              name: "limit",
-              type: "tuple",
-            },
-          ],
-          name: "constraints",
-          type: "tuple[]",
-        },
-      ],
-      name: "callPolicies",
-      type: "tuple[]",
-    },
-    {
-      components: [
-        { name: "target", type: "address" },
-        { name: "maxValuePerUse", type: "uint256" },
-        {
-          components: [
-            { name: "limitType", type: "uint8" },
-            { name: "limit", type: "uint256" },
-            { name: "period", type: "uint256" },
-          ],
-          name: "valueLimit",
-          type: "tuple",
-        },
-      ],
-      name: "transferPolicies",
-      type: "tuple[]",
-    },
-  ],
-  name: "newSession",
-  type: "tuple",
-} as const;
-
 export enum LimitType {
   Unlimited = 0,
   Lifetime = 1,

From fcb0d79a5555650a7b92b918486ca2031bb0544f Mon Sep 17 00:00:00 2001
From: Jack Hamer <jackhamer0990@gmail.com>
Date: Wed, 13 Nov 2024 11:39:16 +0200
Subject: [PATCH 26/42] fix: sdk build

---
 packages/sdk/src/utils/encoding.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/sdk/src/utils/encoding.ts b/packages/sdk/src/utils/encoding.ts
index 3bfb82ee..f105fb65 100644
--- a/packages/sdk/src/utils/encoding.ts
+++ b/packages/sdk/src/utils/encoding.ts
@@ -1,4 +1,4 @@
-import { type Address, encodeAbiParameters, encodeFunctionData, type Hash, parseAbiParameters, toHex } from "viem";
+import { type Address, encodeAbiParameters, encodeFunctionData, type Hash, type Hex, parseAbiParameters, toHex } from "viem";
 
 import { SessionKeyModuleAbi } from "../abi/SessionKeyModule.js";
 import type { SessionConfig } from "../utils/session.js";
@@ -9,8 +9,8 @@ export const encodeSession = (sessionConfig: SessionConfig) => {
     functionName: "createSession",
     args: [sessionConfig],
   });
-  const selector = callData.slice(0, "0x".length + 8); // first 4 bytes for function selector
-  const args = `0x${callData.slice(selector.length, callData.length)}`; // the rest is the arguments
+  const selector = callData.slice(0, "0x".length + 8) as Hex; // first 4 bytes for function selector
+  const args = `0x${callData.slice(selector.length, callData.length)}` as Hex; // the rest is the arguments
   return args;
 };
 

From da9aa0d93d1a4e5f1a1913515007983927262743 Mon Sep 17 00:00:00 2001
From: Jack Hamer <jackhamer0990@gmail.com>
Date: Wed, 13 Nov 2024 15:34:23 +0200
Subject: [PATCH 27/42] fix: remove redundant bigint conversions

---
 packages/sdk/src/client-auth-server/session.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/sdk/src/client-auth-server/session.ts b/packages/sdk/src/client-auth-server/session.ts
index 812ade1c..e8c20837 100644
--- a/packages/sdk/src/client-auth-server/session.ts
+++ b/packages/sdk/src/client-auth-server/session.ts
@@ -45,14 +45,14 @@ const formatLimitPreferences = (limit: PartialLimit): Limit => {
   if (!limit.period || limit.period == 0n) {
     return {
       limitType: LimitType.Lifetime,
-      limit: BigInt(limit.limit),
+      limit: limit.limit,
       period: 0n,
     };
   }
   return {
     limitType: LimitType.Allowance,
-    limit: BigInt(limit.limit),
-    period: BigInt(limit.period),
+    limit: limit.limit,
+    period: limit.period,
   };
 };
 
@@ -60,7 +60,7 @@ const formatDatePreferences = (date: bigint | Date): bigint => {
   if (date instanceof Date) {
     return BigInt(Math.floor(date.getTime() / 1000));
   }
-  return BigInt(date);
+  return date;
 };
 
 export function formatSessionPreferences(

From c762d9defbc451c5d513ea0b73b5d6798eee6f19 Mon Sep 17 00:00:00 2001
From: Jack Hamer <jackhamer0990@gmail.com>
Date: Wed, 13 Nov 2024 16:32:44 +0200
Subject: [PATCH 28/42] fix: update interface to support specifying limit type

---
 .../sdk/src/client-auth-server/session.ts     | 39 ++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/packages/sdk/src/client-auth-server/session.ts b/packages/sdk/src/client-auth-server/session.ts
index e8c20837..941f110a 100644
--- a/packages/sdk/src/client-auth-server/session.ts
+++ b/packages/sdk/src/client-auth-server/session.ts
@@ -5,6 +5,15 @@ import { ConstraintCondition, type Limit, LimitType, LimitZero, type SessionConf
 type PartialLimit = bigint | {
   limit: bigint;
   period?: bigint;
+} | {
+  limitType: "lifetime" | LimitType.Lifetime;
+  limit: bigint;
+} | {
+  limitType: "unlimited" | LimitType.Unlimited;
+} | {
+  limitType: "allowance" | LimitType.Allowance;
+  limit: bigint;
+  period: bigint;
 };
 
 type PartialCallPolicy = {
@@ -35,6 +44,7 @@ export interface SessionPreferences {
 };
 
 const formatLimitPreferences = (limit: PartialLimit): Limit => {
+  /* Just bigint was passed */
   if (typeof limit === "bigint") {
     return {
       limitType: LimitType.Lifetime,
@@ -42,7 +52,34 @@ const formatLimitPreferences = (limit: PartialLimit): Limit => {
       period: 0n,
     };
   }
-  if (!limit.period || limit.period == 0n) {
+
+  /* LimitType was specified */
+  if ("limitType" in limit) {
+    if (limit.limitType === "lifetime" || limit.limitType === LimitType.Lifetime) {
+      return {
+        limitType: LimitType.Lifetime,
+        limit: limit.limit,
+        period: 0n,
+      };
+    } else if (limit.limitType === "unlimited" || limit.limitType === LimitType.Unlimited) {
+      return {
+        limitType: LimitType.Unlimited,
+        limit: 0n,
+        period: 0n,
+      };
+    } else if (limit.limitType === "allowance" || limit.limitType === LimitType.Allowance) {
+      return {
+        limitType: LimitType.Allowance,
+        limit: limit.limit,
+        period: limit.period,
+      };
+    }
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    throw new Error(`Invalid limit type: ${(limit as any).limitType}`);
+  }
+
+  /* LimitType not selected */
+  if (!limit.period) {
     return {
       limitType: LimitType.Lifetime,
       limit: limit.limit,

From c008cc0579890754b02b10410af9c7ad2eebc1f8 Mon Sep 17 00:00:00 2001
From: Jack Hamer <jackhamer0990@gmail.com>
Date: Wed, 13 Nov 2024 16:42:55 +0200
Subject: [PATCH 29/42] fix: use unlimited default limit for calls constraints

---
 packages/sdk/src/client-auth-server/session.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/sdk/src/client-auth-server/session.ts b/packages/sdk/src/client-auth-server/session.ts
index 941f110a..03fa5cb2 100644
--- a/packages/sdk/src/client-auth-server/session.ts
+++ b/packages/sdk/src/client-auth-server/session.ts
@@ -1,6 +1,6 @@
 import { type AbiFunction, type Address, type Hash, toFunctionSelector, toHex } from "viem";
 
-import { ConstraintCondition, type Limit, LimitType, LimitZero, type SessionConfig } from "../utils/session.js";
+import { ConstraintCondition, type Limit, LimitType, LimitUnlimited, LimitZero, type SessionConfig } from "../utils/session.js";
 
 type PartialLimit = bigint | {
   limit: bigint;
@@ -123,7 +123,7 @@ export function formatSessionPreferences(
           index: BigInt(constraint.index),
           condition: typeof constraint.condition == "string" ? ConstraintCondition[constraint.condition] : (constraint.condition ?? 0),
           refValue: constraint.refValue ?? toHex("", { size: 32 }),
-          limit: constraint.limit ? formatLimitPreferences(constraint.limit) : LimitZero,
+          limit: constraint.limit ? formatLimitPreferences(constraint.limit) : LimitUnlimited,
         })) ?? [],
       };
     }) ?? [],

From 3499fe22abdaed3c2cd60092245e481c402afcda Mon Sep 17 00:00:00 2001
From: Jack Hamer <jackhamer0990@gmail.com>
Date: Wed, 13 Nov 2024 20:33:33 +0200
Subject: [PATCH 30/42] fix: pass custom signature during session transaction
 estimation

---
 packages/auth-server/nuxt.config.ts           | 10 +++++
 packages/bank-demo/nuxt.config.ts             | 12 +++++-
 packages/demo-app/nuxt.config.ts              | 10 +++++
 packages/demo-app/pages/index.vue             |  1 -
 packages/nft-quest/composables/useMintNft.ts  | 17 +--------
 packages/nft-quest/nuxt.config.ts             | 10 +++++
 packages/sdk/src/client/clients/session.ts    | 38 +++++++++++++------
 .../client/decorators/publicActionsRewrite.ts | 37 ++++++++++++++++++
 packages/sdk/src/client/smart-account.ts      |  1 -
 packages/sdk/src/connector/index.ts           | 10 +++--
 packages/sdk/src/errors/errors.ts             |  2 +-
 11 files changed, 113 insertions(+), 35 deletions(-)
 create mode 100644 packages/sdk/src/client/decorators/publicActionsRewrite.ts

diff --git a/packages/auth-server/nuxt.config.ts b/packages/auth-server/nuxt.config.ts
index e0a8f5a7..8119e227 100644
--- a/packages/auth-server/nuxt.config.ts
+++ b/packages/auth-server/nuxt.config.ts
@@ -46,4 +46,14 @@ export default defineNuxtConfig({
       chainId: parseInt(process.env.NUXT_PUBLIC_DEFAULT_CHAIN_ID || "") || zksyncInMemoryNode.id,
     },
   },
+
+  vite: {
+    css: {
+      preprocessorOptions: {
+        scss: {
+          api: "modern", // Fix warning: "The legacy JS API is deprecated and will be removed in Dart Sass 2.0.0"
+        },
+      },
+    },
+  },
 });
diff --git a/packages/bank-demo/nuxt.config.ts b/packages/bank-demo/nuxt.config.ts
index acc99afa..e6a86890 100644
--- a/packages/bank-demo/nuxt.config.ts
+++ b/packages/bank-demo/nuxt.config.ts
@@ -49,5 +49,15 @@ export default defineNuxtConfig({
         explorerUrl: "http://34.121.229.57:3010/",
       }
     }
-  }
+  },
+
+  vite: {
+    css: {
+      preprocessorOptions: {
+        scss: {
+          api: "modern", // Fix warning: "The legacy JS API is deprecated and will be removed in Dart Sass 2.0.0"
+        },
+      },
+    },
+  },
 });
diff --git a/packages/demo-app/nuxt.config.ts b/packages/demo-app/nuxt.config.ts
index b836c1ab..cd3c5a9a 100644
--- a/packages/demo-app/nuxt.config.ts
+++ b/packages/demo-app/nuxt.config.ts
@@ -34,4 +34,14 @@ export default defineNuxtConfig({
       },
     },
   },
+
+  vite: {
+    css: {
+      preprocessorOptions: {
+        scss: {
+          api: "modern", // Fix warning: "The legacy JS API is deprecated and will be removed in Dart Sass 2.0.0"
+        },
+      },
+    },
+  },
 });
diff --git a/packages/demo-app/pages/index.vue b/packages/demo-app/pages/index.vue
index fd58fb7e..220c74ba 100644
--- a/packages/demo-app/pages/index.vue
+++ b/packages/demo-app/pages/index.vue
@@ -140,7 +140,6 @@ const sendTokens = async () => {
     await sendTransaction(wagmiConfig, {
       to: testTransferTarget,
       value: parseEther("0.1"),
-      gas: 100_000_000n,
     });
 
     balance.value = await getBalance(wagmiConfig, {
diff --git a/packages/nft-quest/composables/useMintNft.ts b/packages/nft-quest/composables/useMintNft.ts
index 9848c642..bd630811 100644
--- a/packages/nft-quest/composables/useMintNft.ts
+++ b/packages/nft-quest/composables/useMintNft.ts
@@ -1,5 +1,5 @@
-import { estimateGas, waitForTransactionReceipt, writeContract } from "@wagmi/core";
-import { type Address, encodeFunctionData } from "viem";
+import { waitForTransactionReceipt, writeContract } from "@wagmi/core";
+import type { Address } from "viem";
 import { getGeneralPaymasterInput } from "viem/zksync";
 
 export const useMintNft = async (_address: MaybeRef<Address>) => {
@@ -10,24 +10,11 @@ export const useMintNft = async (_address: MaybeRef<Address>) => {
     const { wagmiConfig } = storeToRefs(useConnectorStore());
 
     const mintingForAddress = address.value;
-    const data = encodeFunctionData({
-      abi: nftAbi,
-      functionName: "mint",
-      args: [address.value],
-    });
-
-    const estimatedGas = await estimateGas(wagmiConfig.value, {
-      to: runtimeConfig.public.contracts.nft as Address,
-      chainId: runtimeConfig.public.chain.id,
-      data,
-    });
-
     const transactionHash = await writeContract(wagmiConfig.value, {
       address: runtimeConfig.public.contracts.nft as Address,
       abi: nftAbi,
       functionName: "mint",
       args: [mintingForAddress],
-      gas: estimatedGas + (estimatedGas / 100n * 25n), // gas may be underestimated
       paymaster: runtimeConfig.public.contracts.paymaster as Address,
       paymasterInput: getGeneralPaymasterInput({ innerInput: "0x" }),
     });
diff --git a/packages/nft-quest/nuxt.config.ts b/packages/nft-quest/nuxt.config.ts
index 0bf91795..3715cbb5 100644
--- a/packages/nft-quest/nuxt.config.ts
+++ b/packages/nft-quest/nuxt.config.ts
@@ -90,4 +90,14 @@ export default defineNuxtConfig({
       },
     },
   },
+
+  vite: {
+    css: {
+      preprocessorOptions: {
+        scss: {
+          api: "modern", // Fix warning: "The legacy JS API is deprecated and will be removed in Dart Sass 2.0.0"
+        },
+      },
+    },
+  },
 });
diff --git a/packages/sdk/src/client/clients/session.ts b/packages/sdk/src/client/clients/session.ts
index a2e3dd7a..c0f22ca8 100644
--- a/packages/sdk/src/client/clients/session.ts
+++ b/packages/sdk/src/client/clients/session.ts
@@ -3,10 +3,30 @@ import { privateKeyToAccount } from "viem/accounts";
 
 import { encodeSession } from "../../utils/encoding.js";
 import type { SessionConfig } from "../../utils/session.js";
+import { publicActionsRewrite } from "../decorators/publicActionsRewrite.js";
 import { type ZksyncAccountSessionActions, zksyncAccountSessionActions } from "../decorators/session.js";
 import { type ZksyncAccountWalletActions, zksyncAccountWalletActions } from "../decorators/session_wallet.js";
 import { toSmartAccount } from "../smart-account.js";
 
+export const signSessionTransaction = (args: {
+  sessionKeySignedHash: Hash;
+  sessionContract: Address;
+  sessionConfig: SessionConfig;
+}) => {
+  return encodeAbiParameters(
+    [
+      { type: "bytes" },
+      { type: "address" },
+      { type: "bytes[]" },
+    ],
+    [
+      args.sessionKeySignedHash,
+      args.sessionContract,
+      [encodeSession(args.sessionConfig)], // FIXME: this is assuming there are no other hooks
+    ],
+  );
+};
+
 export function createZksyncSessionClient<
   transport extends Transport,
   chain extends Chain,
@@ -28,18 +48,11 @@ export function createZksyncSessionClient<
     sign: async ({ hash }) => {
       const sessionKeySigner = privateKeyToAccount(parameters.sessionKey);
       const hashSignature = await sessionKeySigner.sign({ hash });
-      return encodeAbiParameters(
-        [
-          { type: "bytes" },
-          { type: "address" },
-          { type: "bytes[]" },
-        ],
-        [
-          hashSignature,
-          parameters.contracts.session,
-          [encodeSession(parameters.sessionConfig)], // FIXME: this is assuming there are no other hooks
-        ],
-      );
+      return signSessionTransaction({
+        sessionKeySignedHash: hashSignature,
+        sessionContract: parameters.contracts.session,
+        sessionConfig: parameters.sessionConfig,
+      });
     },
   });
   const client = createClient<transport, chain, Account, rpcSchema>({
@@ -53,6 +66,7 @@ export function createZksyncSessionClient<
       contracts: parameters.contracts,
     }))
     .extend(publicActions)
+    .extend(publicActionsRewrite)
     .extend(zksyncAccountWalletActions)
     .extend(zksyncAccountSessionActions);
   return client;
diff --git a/packages/sdk/src/client/decorators/publicActionsRewrite.ts b/packages/sdk/src/client/decorators/publicActionsRewrite.ts
new file mode 100644
index 00000000..210b3587
--- /dev/null
+++ b/packages/sdk/src/client/decorators/publicActionsRewrite.ts
@@ -0,0 +1,37 @@
+import type { Account, Chain, Hex, PublicActions, Transport } from "viem";
+import { estimateContractGas, estimateGas } from "viem/actions";
+
+import { type ClientWithZksyncAccountSessionData, signSessionTransaction } from "../clients/session.js";
+
+const emptySignature = "0x" + "1b".padStart(65 * 2, "0") as Hex;
+
+export function publicActionsRewrite<
+  transport extends Transport,
+  chain extends Chain,
+  account extends Account,
+>(
+  client: ClientWithZksyncAccountSessionData<transport, chain, account>,
+): Pick<PublicActions<transport, chain, account>, "estimateContractGas" | "estimateGas"> {
+  return {
+    estimateContractGas: (args) => {
+      if (!("customSignature" in args)) {
+        (args as any).customSignature = signSessionTransaction({
+          sessionKeySignedHash: emptySignature,
+          sessionContract: client.contracts.session,
+          sessionConfig: client.sessionConfig,
+        });
+      }
+      return estimateContractGas(client, args as any);
+    },
+    estimateGas: async (args) => {
+      if (!("customSignature" in args)) {
+        (args as any).customSignature = signSessionTransaction({
+          sessionKeySignedHash: emptySignature,
+          sessionContract: client.contracts.session,
+          sessionConfig: client.sessionConfig,
+        });
+      }
+      return await estimateGas(client, args);
+    },
+  };
+}
diff --git a/packages/sdk/src/client/smart-account.ts b/packages/sdk/src/client/smart-account.ts
index c215a699..acb33ed1 100644
--- a/packages/sdk/src/client/smart-account.ts
+++ b/packages/sdk/src/client/smart-account.ts
@@ -41,7 +41,6 @@ export function toSmartAccount(
         ...transaction,
         from: this.address!,
         type: "eip712",
-        gas: 100_000_000n, // TODO remove when gas estimation is fixed
       } as ZksyncTransactionSerializableEIP712;
 
       const eip712DomainAndMessage = getEip712Domain(signableTransaction);
diff --git a/packages/sdk/src/connector/index.ts b/packages/sdk/src/connector/index.ts
index 43db4f70..1f6e260a 100644
--- a/packages/sdk/src/connector/index.ts
+++ b/packages/sdk/src/connector/index.ts
@@ -10,6 +10,7 @@ import {
   UserRejectedRequestError,
 } from "viem";
 
+import { EthereumProviderError } from "../errors/errors.js";
 import { type AppMetadata, type ProviderInterface, type SessionPreferences, WalletProvider } from "../index.js";
 
 export type ZksyncAccountConnectorOptions = {
@@ -155,17 +156,18 @@ export const zksyncAccountConnector = (parameters: ZksyncAccountConnectorOptions
       }
     },
     onAccountsChanged(accounts) {
-      if (accounts.length === 0) this.onDisconnect();
-      else config.emitter.emit("change", {
+      if (!accounts.length) return;
+      config.emitter.emit("change", {
         accounts: accounts.map((x) => getAddress(x)),
       });
     },
     onChainChanged(chain) {
       config.emitter.emit("change", { chainId: Number(chain) });
     },
-    async onDisconnect(_error) {
-      console.error("onDisconnect", _error);
+    async onDisconnect(error) {
       config.emitter.emit("disconnect");
+      if (error instanceof EthereumProviderError && error.code === 4900) return; // User initiated
+      console.error("Account disconnected", error);
     },
   }));
 };
diff --git a/packages/sdk/src/errors/errors.ts b/packages/sdk/src/errors/errors.ts
index 40af6ca7..e94ba309 100644
--- a/packages/sdk/src/errors/errors.ts
+++ b/packages/sdk/src/errors/errors.ts
@@ -149,7 +149,7 @@ class EthereumRpcError<T> extends Error {
   }
 }
 
-class EthereumProviderError<T> extends EthereumRpcError<T> {
+export class EthereumProviderError<T> extends EthereumRpcError<T> {
   /**
    * Create an Ethereum Provider JSON-RPC error.
    * `code` must be an integer in the 1000 <= 4999 range.

From 580a529b98d31b9b71e7a5ba1c10b18a86cbc511 Mon Sep 17 00:00:00 2001
From: Jack Hamer <jackhamer0990@gmail.com>
Date: Thu, 14 Nov 2024 12:02:28 +0200
Subject: [PATCH 31/42] fix: try fix estimation

---
 .../client/decorators/publicActionsRewrite.ts | 32 +++++++++++++++++--
 .../src/client/decorators/session_wallet.ts   | 13 +++++---
 2 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/packages/sdk/src/client/decorators/publicActionsRewrite.ts b/packages/sdk/src/client/decorators/publicActionsRewrite.ts
index 210b3587..18c120ae 100644
--- a/packages/sdk/src/client/decorators/publicActionsRewrite.ts
+++ b/packages/sdk/src/client/decorators/publicActionsRewrite.ts
@@ -1,5 +1,5 @@
 import type { Account, Chain, Hex, PublicActions, Transport } from "viem";
-import { estimateContractGas, estimateGas } from "viem/actions";
+import { estimateContractGas, estimateGas, getGasPrice, prepareTransactionRequest } from "viem/actions";
 
 import { type ClientWithZksyncAccountSessionData, signSessionTransaction } from "../clients/session.js";
 
@@ -11,9 +11,32 @@ export function publicActionsRewrite<
   account extends Account,
 >(
   client: ClientWithZksyncAccountSessionData<transport, chain, account>,
-): Pick<PublicActions<transport, chain, account>, "estimateContractGas" | "estimateGas"> {
+): Pick<PublicActions<transport, chain, account>, "estimateContractGas" | "estimateGas" | "prepareTransactionRequest"> {
   return {
+    prepareTransactionRequest: async (args) => {
+      console.log("123prepareTransactionRequest");
+      if (!("customSignature" in args)) {
+        (args as any).customSignature = signSessionTransaction({
+          sessionKeySignedHash: emptySignature,
+          sessionContract: client.contracts.session,
+          sessionConfig: client.sessionConfig,
+        });
+      }
+      console.log("Initial args", args);
+      const request = await prepareTransactionRequest(client as any, {
+        ...args,
+        type: "eip712",
+        typeHex: "0x71",
+        chainId: client.chain.id,
+        parameters: ["gas", "nonce"],
+        gasPrice: await getGasPrice(client),
+        gas: await estimateGas(client, args as any),
+      } as any) as any;
+      console.log("Request", request);
+      return request;
+    },
     estimateContractGas: (args) => {
+      console.log("123estimateContractGas");
       if (!("customSignature" in args)) {
         (args as any).customSignature = signSessionTransaction({
           sessionKeySignedHash: emptySignature,
@@ -24,6 +47,7 @@ export function publicActionsRewrite<
       return estimateContractGas(client, args as any);
     },
     estimateGas: async (args) => {
+      console.log("123estimateGas");
       if (!("customSignature" in args)) {
         (args as any).customSignature = signSessionTransaction({
           sessionKeySignedHash: emptySignature,
@@ -31,7 +55,9 @@ export function publicActionsRewrite<
           sessionConfig: client.sessionConfig,
         });
       }
-      return await estimateGas(client, args);
+      const estimated = await estimateGas(client, args);
+      console.log("Estimated", estimated);
+      return estimated;
     },
   };
 }
diff --git a/packages/sdk/src/client/decorators/session_wallet.ts b/packages/sdk/src/client/decorators/session_wallet.ts
index f993ebb9..af277406 100644
--- a/packages/sdk/src/client/decorators/session_wallet.ts
+++ b/packages/sdk/src/client/decorators/session_wallet.ts
@@ -1,6 +1,6 @@
 import { /* decodeFunctionData, erc20Abi, getAddress, */ type Account, type Chain, type Transport, type WalletActions } from "viem";
 import { deployContract, getAddresses, getChainId, prepareTransactionRequest, sendRawTransaction, signMessage, signTypedData, writeContract } from "viem/actions";
-import { getGeneralPaymasterInput, sendEip712Transaction, sendTransaction, signTransaction } from "viem/zksync";
+import { getGeneralPaymasterInput, sendEip712Transaction, signTransaction } from "viem/zksync";
 
 import type { ClientWithZksyncAccountSessionData } from "../clients/session.js";
 /* import { getTokenSpendLimit } from '../actions/session.js'; */
@@ -22,7 +22,11 @@ export function zksyncAccountWalletActions<
       prepareTransactionRequest(client, args),
     sendRawTransaction: (args) => sendRawTransaction(client, args),
     sendTransaction: async (args) => {
-      const tx = client.chain.formatters?.transaction?.format(args) || args;
+      const tx: any = {
+        ...(client.chain.formatters?.transaction?.format(args) || args),
+        type: "eip712",
+        account: client.account,
+      };
       /* await verifyTransactionData({
         value: tx.value,
         chain: tx.chain || undefined,
@@ -36,14 +40,15 @@ export function zksyncAccountWalletActions<
       if (tx.eip712Meta) {
         const transaction = {
           ...tx,
-          account: client.account,
           paymaster: tx.eip712Meta.paymasterParams.paymaster,
           // TODO: Find permanent fix as this only works for general paymasters with no input
           paymasterInput: getGeneralPaymasterInput({ innerInput: "0x" }),
         };
         return await sendEip712Transaction(client, transaction);
       }
-      return await sendTransaction(client, tx);
+
+      console.log("Sending transaction", tx);
+      return await sendEip712Transaction(client, tx);
     },
     signMessage: (args) => signMessage(client, args),
     // eslint-disable-next-line @typescript-eslint/no-explicit-any

From 4092f841cca150ea6ce25493b345fc8296c3af13 Mon Sep 17 00:00:00 2001
From: Jack Hamer <jackhamer0990@gmail.com>
Date: Thu, 14 Nov 2024 12:02:36 +0200
Subject: [PATCH 32/42] Revert "fix: try fix estimation"

This reverts commit 580a529b98d31b9b71e7a5ba1c10b18a86cbc511.
---
 .../client/decorators/publicActionsRewrite.ts | 32 ++-----------------
 .../src/client/decorators/session_wallet.ts   | 13 +++-----
 2 files changed, 7 insertions(+), 38 deletions(-)

diff --git a/packages/sdk/src/client/decorators/publicActionsRewrite.ts b/packages/sdk/src/client/decorators/publicActionsRewrite.ts
index 18c120ae..210b3587 100644
--- a/packages/sdk/src/client/decorators/publicActionsRewrite.ts
+++ b/packages/sdk/src/client/decorators/publicActionsRewrite.ts
@@ -1,5 +1,5 @@
 import type { Account, Chain, Hex, PublicActions, Transport } from "viem";
-import { estimateContractGas, estimateGas, getGasPrice, prepareTransactionRequest } from "viem/actions";
+import { estimateContractGas, estimateGas } from "viem/actions";
 
 import { type ClientWithZksyncAccountSessionData, signSessionTransaction } from "../clients/session.js";
 
@@ -11,32 +11,9 @@ export function publicActionsRewrite<
   account extends Account,
 >(
   client: ClientWithZksyncAccountSessionData<transport, chain, account>,
-): Pick<PublicActions<transport, chain, account>, "estimateContractGas" | "estimateGas" | "prepareTransactionRequest"> {
+): Pick<PublicActions<transport, chain, account>, "estimateContractGas" | "estimateGas"> {
   return {
-    prepareTransactionRequest: async (args) => {
-      console.log("123prepareTransactionRequest");
-      if (!("customSignature" in args)) {
-        (args as any).customSignature = signSessionTransaction({
-          sessionKeySignedHash: emptySignature,
-          sessionContract: client.contracts.session,
-          sessionConfig: client.sessionConfig,
-        });
-      }
-      console.log("Initial args", args);
-      const request = await prepareTransactionRequest(client as any, {
-        ...args,
-        type: "eip712",
-        typeHex: "0x71",
-        chainId: client.chain.id,
-        parameters: ["gas", "nonce"],
-        gasPrice: await getGasPrice(client),
-        gas: await estimateGas(client, args as any),
-      } as any) as any;
-      console.log("Request", request);
-      return request;
-    },
     estimateContractGas: (args) => {
-      console.log("123estimateContractGas");
       if (!("customSignature" in args)) {
         (args as any).customSignature = signSessionTransaction({
           sessionKeySignedHash: emptySignature,
@@ -47,7 +24,6 @@ export function publicActionsRewrite<
       return estimateContractGas(client, args as any);
     },
     estimateGas: async (args) => {
-      console.log("123estimateGas");
       if (!("customSignature" in args)) {
         (args as any).customSignature = signSessionTransaction({
           sessionKeySignedHash: emptySignature,
@@ -55,9 +31,7 @@ export function publicActionsRewrite<
           sessionConfig: client.sessionConfig,
         });
       }
-      const estimated = await estimateGas(client, args);
-      console.log("Estimated", estimated);
-      return estimated;
+      return await estimateGas(client, args);
     },
   };
 }
diff --git a/packages/sdk/src/client/decorators/session_wallet.ts b/packages/sdk/src/client/decorators/session_wallet.ts
index af277406..f993ebb9 100644
--- a/packages/sdk/src/client/decorators/session_wallet.ts
+++ b/packages/sdk/src/client/decorators/session_wallet.ts
@@ -1,6 +1,6 @@
 import { /* decodeFunctionData, erc20Abi, getAddress, */ type Account, type Chain, type Transport, type WalletActions } from "viem";
 import { deployContract, getAddresses, getChainId, prepareTransactionRequest, sendRawTransaction, signMessage, signTypedData, writeContract } from "viem/actions";
-import { getGeneralPaymasterInput, sendEip712Transaction, signTransaction } from "viem/zksync";
+import { getGeneralPaymasterInput, sendEip712Transaction, sendTransaction, signTransaction } from "viem/zksync";
 
 import type { ClientWithZksyncAccountSessionData } from "../clients/session.js";
 /* import { getTokenSpendLimit } from '../actions/session.js'; */
@@ -22,11 +22,7 @@ export function zksyncAccountWalletActions<
       prepareTransactionRequest(client, args),
     sendRawTransaction: (args) => sendRawTransaction(client, args),
     sendTransaction: async (args) => {
-      const tx: any = {
-        ...(client.chain.formatters?.transaction?.format(args) || args),
-        type: "eip712",
-        account: client.account,
-      };
+      const tx = client.chain.formatters?.transaction?.format(args) || args;
       /* await verifyTransactionData({
         value: tx.value,
         chain: tx.chain || undefined,
@@ -40,15 +36,14 @@ export function zksyncAccountWalletActions<
       if (tx.eip712Meta) {
         const transaction = {
           ...tx,
+          account: client.account,
           paymaster: tx.eip712Meta.paymasterParams.paymaster,
           // TODO: Find permanent fix as this only works for general paymasters with no input
           paymasterInput: getGeneralPaymasterInput({ innerInput: "0x" }),
         };
         return await sendEip712Transaction(client, transaction);
       }
-
-      console.log("Sending transaction", tx);
-      return await sendEip712Transaction(client, tx);
+      return await sendTransaction(client, tx);
     },
     signMessage: (args) => signMessage(client, args),
     // eslint-disable-next-line @typescript-eslint/no-explicit-any

From 94faafc8ebd7038dc3ec939021aa478d25399e9a Mon Sep 17 00:00:00 2001
From: Jack Hamer <jackhamer0990@gmail.com>
Date: Thu, 14 Nov 2024 12:02:40 +0200
Subject: [PATCH 33/42] Revert "fix: pass custom signature during session
 transaction estimation"

This reverts commit 3499fe22abdaed3c2cd60092245e481c402afcda.
---
 packages/auth-server/nuxt.config.ts           | 10 -----
 packages/bank-demo/nuxt.config.ts             | 12 +-----
 packages/demo-app/nuxt.config.ts              | 10 -----
 packages/demo-app/pages/index.vue             |  1 +
 packages/nft-quest/composables/useMintNft.ts  | 17 ++++++++-
 packages/nft-quest/nuxt.config.ts             | 10 -----
 packages/sdk/src/client/clients/session.ts    | 38 ++++++-------------
 .../client/decorators/publicActionsRewrite.ts | 37 ------------------
 packages/sdk/src/client/smart-account.ts      |  1 +
 packages/sdk/src/connector/index.ts           | 10 ++---
 packages/sdk/src/errors/errors.ts             |  2 +-
 11 files changed, 35 insertions(+), 113 deletions(-)
 delete mode 100644 packages/sdk/src/client/decorators/publicActionsRewrite.ts

diff --git a/packages/auth-server/nuxt.config.ts b/packages/auth-server/nuxt.config.ts
index 8119e227..e0a8f5a7 100644
--- a/packages/auth-server/nuxt.config.ts
+++ b/packages/auth-server/nuxt.config.ts
@@ -46,14 +46,4 @@ export default defineNuxtConfig({
       chainId: parseInt(process.env.NUXT_PUBLIC_DEFAULT_CHAIN_ID || "") || zksyncInMemoryNode.id,
     },
   },
-
-  vite: {
-    css: {
-      preprocessorOptions: {
-        scss: {
-          api: "modern", // Fix warning: "The legacy JS API is deprecated and will be removed in Dart Sass 2.0.0"
-        },
-      },
-    },
-  },
 });
diff --git a/packages/bank-demo/nuxt.config.ts b/packages/bank-demo/nuxt.config.ts
index e6a86890..acc99afa 100644
--- a/packages/bank-demo/nuxt.config.ts
+++ b/packages/bank-demo/nuxt.config.ts
@@ -49,15 +49,5 @@ export default defineNuxtConfig({
         explorerUrl: "http://34.121.229.57:3010/",
       }
     }
-  },
-
-  vite: {
-    css: {
-      preprocessorOptions: {
-        scss: {
-          api: "modern", // Fix warning: "The legacy JS API is deprecated and will be removed in Dart Sass 2.0.0"
-        },
-      },
-    },
-  },
+  }
 });
diff --git a/packages/demo-app/nuxt.config.ts b/packages/demo-app/nuxt.config.ts
index cd3c5a9a..b836c1ab 100644
--- a/packages/demo-app/nuxt.config.ts
+++ b/packages/demo-app/nuxt.config.ts
@@ -34,14 +34,4 @@ export default defineNuxtConfig({
       },
     },
   },
-
-  vite: {
-    css: {
-      preprocessorOptions: {
-        scss: {
-          api: "modern", // Fix warning: "The legacy JS API is deprecated and will be removed in Dart Sass 2.0.0"
-        },
-      },
-    },
-  },
 });
diff --git a/packages/demo-app/pages/index.vue b/packages/demo-app/pages/index.vue
index 220c74ba..fd58fb7e 100644
--- a/packages/demo-app/pages/index.vue
+++ b/packages/demo-app/pages/index.vue
@@ -140,6 +140,7 @@ const sendTokens = async () => {
     await sendTransaction(wagmiConfig, {
       to: testTransferTarget,
       value: parseEther("0.1"),
+      gas: 100_000_000n,
     });
 
     balance.value = await getBalance(wagmiConfig, {
diff --git a/packages/nft-quest/composables/useMintNft.ts b/packages/nft-quest/composables/useMintNft.ts
index bd630811..9848c642 100644
--- a/packages/nft-quest/composables/useMintNft.ts
+++ b/packages/nft-quest/composables/useMintNft.ts
@@ -1,5 +1,5 @@
-import { waitForTransactionReceipt, writeContract } from "@wagmi/core";
-import type { Address } from "viem";
+import { estimateGas, waitForTransactionReceipt, writeContract } from "@wagmi/core";
+import { type Address, encodeFunctionData } from "viem";
 import { getGeneralPaymasterInput } from "viem/zksync";
 
 export const useMintNft = async (_address: MaybeRef<Address>) => {
@@ -10,11 +10,24 @@ export const useMintNft = async (_address: MaybeRef<Address>) => {
     const { wagmiConfig } = storeToRefs(useConnectorStore());
 
     const mintingForAddress = address.value;
+    const data = encodeFunctionData({
+      abi: nftAbi,
+      functionName: "mint",
+      args: [address.value],
+    });
+
+    const estimatedGas = await estimateGas(wagmiConfig.value, {
+      to: runtimeConfig.public.contracts.nft as Address,
+      chainId: runtimeConfig.public.chain.id,
+      data,
+    });
+
     const transactionHash = await writeContract(wagmiConfig.value, {
       address: runtimeConfig.public.contracts.nft as Address,
       abi: nftAbi,
       functionName: "mint",
       args: [mintingForAddress],
+      gas: estimatedGas + (estimatedGas / 100n * 25n), // gas may be underestimated
       paymaster: runtimeConfig.public.contracts.paymaster as Address,
       paymasterInput: getGeneralPaymasterInput({ innerInput: "0x" }),
     });
diff --git a/packages/nft-quest/nuxt.config.ts b/packages/nft-quest/nuxt.config.ts
index 3715cbb5..0bf91795 100644
--- a/packages/nft-quest/nuxt.config.ts
+++ b/packages/nft-quest/nuxt.config.ts
@@ -90,14 +90,4 @@ export default defineNuxtConfig({
       },
     },
   },
-
-  vite: {
-    css: {
-      preprocessorOptions: {
-        scss: {
-          api: "modern", // Fix warning: "The legacy JS API is deprecated and will be removed in Dart Sass 2.0.0"
-        },
-      },
-    },
-  },
 });
diff --git a/packages/sdk/src/client/clients/session.ts b/packages/sdk/src/client/clients/session.ts
index c0f22ca8..a2e3dd7a 100644
--- a/packages/sdk/src/client/clients/session.ts
+++ b/packages/sdk/src/client/clients/session.ts
@@ -3,30 +3,10 @@ import { privateKeyToAccount } from "viem/accounts";
 
 import { encodeSession } from "../../utils/encoding.js";
 import type { SessionConfig } from "../../utils/session.js";
-import { publicActionsRewrite } from "../decorators/publicActionsRewrite.js";
 import { type ZksyncAccountSessionActions, zksyncAccountSessionActions } from "../decorators/session.js";
 import { type ZksyncAccountWalletActions, zksyncAccountWalletActions } from "../decorators/session_wallet.js";
 import { toSmartAccount } from "../smart-account.js";
 
-export const signSessionTransaction = (args: {
-  sessionKeySignedHash: Hash;
-  sessionContract: Address;
-  sessionConfig: SessionConfig;
-}) => {
-  return encodeAbiParameters(
-    [
-      { type: "bytes" },
-      { type: "address" },
-      { type: "bytes[]" },
-    ],
-    [
-      args.sessionKeySignedHash,
-      args.sessionContract,
-      [encodeSession(args.sessionConfig)], // FIXME: this is assuming there are no other hooks
-    ],
-  );
-};
-
 export function createZksyncSessionClient<
   transport extends Transport,
   chain extends Chain,
@@ -48,11 +28,18 @@ export function createZksyncSessionClient<
     sign: async ({ hash }) => {
       const sessionKeySigner = privateKeyToAccount(parameters.sessionKey);
       const hashSignature = await sessionKeySigner.sign({ hash });
-      return signSessionTransaction({
-        sessionKeySignedHash: hashSignature,
-        sessionContract: parameters.contracts.session,
-        sessionConfig: parameters.sessionConfig,
-      });
+      return encodeAbiParameters(
+        [
+          { type: "bytes" },
+          { type: "address" },
+          { type: "bytes[]" },
+        ],
+        [
+          hashSignature,
+          parameters.contracts.session,
+          [encodeSession(parameters.sessionConfig)], // FIXME: this is assuming there are no other hooks
+        ],
+      );
     },
   });
   const client = createClient<transport, chain, Account, rpcSchema>({
@@ -66,7 +53,6 @@ export function createZksyncSessionClient<
       contracts: parameters.contracts,
     }))
     .extend(publicActions)
-    .extend(publicActionsRewrite)
     .extend(zksyncAccountWalletActions)
     .extend(zksyncAccountSessionActions);
   return client;
diff --git a/packages/sdk/src/client/decorators/publicActionsRewrite.ts b/packages/sdk/src/client/decorators/publicActionsRewrite.ts
deleted file mode 100644
index 210b3587..00000000
--- a/packages/sdk/src/client/decorators/publicActionsRewrite.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import type { Account, Chain, Hex, PublicActions, Transport } from "viem";
-import { estimateContractGas, estimateGas } from "viem/actions";
-
-import { type ClientWithZksyncAccountSessionData, signSessionTransaction } from "../clients/session.js";
-
-const emptySignature = "0x" + "1b".padStart(65 * 2, "0") as Hex;
-
-export function publicActionsRewrite<
-  transport extends Transport,
-  chain extends Chain,
-  account extends Account,
->(
-  client: ClientWithZksyncAccountSessionData<transport, chain, account>,
-): Pick<PublicActions<transport, chain, account>, "estimateContractGas" | "estimateGas"> {
-  return {
-    estimateContractGas: (args) => {
-      if (!("customSignature" in args)) {
-        (args as any).customSignature = signSessionTransaction({
-          sessionKeySignedHash: emptySignature,
-          sessionContract: client.contracts.session,
-          sessionConfig: client.sessionConfig,
-        });
-      }
-      return estimateContractGas(client, args as any);
-    },
-    estimateGas: async (args) => {
-      if (!("customSignature" in args)) {
-        (args as any).customSignature = signSessionTransaction({
-          sessionKeySignedHash: emptySignature,
-          sessionContract: client.contracts.session,
-          sessionConfig: client.sessionConfig,
-        });
-      }
-      return await estimateGas(client, args);
-    },
-  };
-}
diff --git a/packages/sdk/src/client/smart-account.ts b/packages/sdk/src/client/smart-account.ts
index acb33ed1..c215a699 100644
--- a/packages/sdk/src/client/smart-account.ts
+++ b/packages/sdk/src/client/smart-account.ts
@@ -41,6 +41,7 @@ export function toSmartAccount(
         ...transaction,
         from: this.address!,
         type: "eip712",
+        gas: 100_000_000n, // TODO remove when gas estimation is fixed
       } as ZksyncTransactionSerializableEIP712;
 
       const eip712DomainAndMessage = getEip712Domain(signableTransaction);
diff --git a/packages/sdk/src/connector/index.ts b/packages/sdk/src/connector/index.ts
index 1f6e260a..43db4f70 100644
--- a/packages/sdk/src/connector/index.ts
+++ b/packages/sdk/src/connector/index.ts
@@ -10,7 +10,6 @@ import {
   UserRejectedRequestError,
 } from "viem";
 
-import { EthereumProviderError } from "../errors/errors.js";
 import { type AppMetadata, type ProviderInterface, type SessionPreferences, WalletProvider } from "../index.js";
 
 export type ZksyncAccountConnectorOptions = {
@@ -156,18 +155,17 @@ export const zksyncAccountConnector = (parameters: ZksyncAccountConnectorOptions
       }
     },
     onAccountsChanged(accounts) {
-      if (!accounts.length) return;
-      config.emitter.emit("change", {
+      if (accounts.length === 0) this.onDisconnect();
+      else config.emitter.emit("change", {
         accounts: accounts.map((x) => getAddress(x)),
       });
     },
     onChainChanged(chain) {
       config.emitter.emit("change", { chainId: Number(chain) });
     },
-    async onDisconnect(error) {
+    async onDisconnect(_error) {
+      console.error("onDisconnect", _error);
       config.emitter.emit("disconnect");
-      if (error instanceof EthereumProviderError && error.code === 4900) return; // User initiated
-      console.error("Account disconnected", error);
     },
   }));
 };
diff --git a/packages/sdk/src/errors/errors.ts b/packages/sdk/src/errors/errors.ts
index e94ba309..40af6ca7 100644
--- a/packages/sdk/src/errors/errors.ts
+++ b/packages/sdk/src/errors/errors.ts
@@ -149,7 +149,7 @@ class EthereumRpcError<T> extends Error {
   }
 }
 
-export class EthereumProviderError<T> extends EthereumRpcError<T> {
+class EthereumProviderError<T> extends EthereumRpcError<T> {
   /**
    * Create an Ethereum Provider JSON-RPC error.
    * `code` must be an integer in the 1000 <= 4999 range.

From 6e8aac52c8510dbcc615a42306d297248cc7026f Mon Sep 17 00:00:00 2001
From: Jack Hamer <jackhamer0990@gmail.com>
Date: Thu, 14 Nov 2024 12:05:53 +0200
Subject: [PATCH 34/42] Reapply "fix: pass custom signature during session
 transaction estimation"

This reverts commit 94faafc8ebd7038dc3ec939021aa478d25399e9a.
---
 packages/auth-server/nuxt.config.ts           | 10 +++++
 packages/bank-demo/nuxt.config.ts             | 12 +++++-
 packages/demo-app/nuxt.config.ts              | 10 +++++
 packages/demo-app/pages/index.vue             |  1 -
 packages/nft-quest/composables/useMintNft.ts  | 17 +--------
 packages/nft-quest/nuxt.config.ts             | 10 +++++
 packages/sdk/src/client/clients/session.ts    | 38 +++++++++++++------
 .../client/decorators/publicActionsRewrite.ts | 37 ++++++++++++++++++
 packages/sdk/src/client/smart-account.ts      |  1 -
 packages/sdk/src/connector/index.ts           | 10 +++--
 packages/sdk/src/errors/errors.ts             |  2 +-
 11 files changed, 113 insertions(+), 35 deletions(-)
 create mode 100644 packages/sdk/src/client/decorators/publicActionsRewrite.ts

diff --git a/packages/auth-server/nuxt.config.ts b/packages/auth-server/nuxt.config.ts
index e0a8f5a7..8119e227 100644
--- a/packages/auth-server/nuxt.config.ts
+++ b/packages/auth-server/nuxt.config.ts
@@ -46,4 +46,14 @@ export default defineNuxtConfig({
       chainId: parseInt(process.env.NUXT_PUBLIC_DEFAULT_CHAIN_ID || "") || zksyncInMemoryNode.id,
     },
   },
+
+  vite: {
+    css: {
+      preprocessorOptions: {
+        scss: {
+          api: "modern", // Fix warning: "The legacy JS API is deprecated and will be removed in Dart Sass 2.0.0"
+        },
+      },
+    },
+  },
 });
diff --git a/packages/bank-demo/nuxt.config.ts b/packages/bank-demo/nuxt.config.ts
index acc99afa..e6a86890 100644
--- a/packages/bank-demo/nuxt.config.ts
+++ b/packages/bank-demo/nuxt.config.ts
@@ -49,5 +49,15 @@ export default defineNuxtConfig({
         explorerUrl: "http://34.121.229.57:3010/",
       }
     }
-  }
+  },
+
+  vite: {
+    css: {
+      preprocessorOptions: {
+        scss: {
+          api: "modern", // Fix warning: "The legacy JS API is deprecated and will be removed in Dart Sass 2.0.0"
+        },
+      },
+    },
+  },
 });
diff --git a/packages/demo-app/nuxt.config.ts b/packages/demo-app/nuxt.config.ts
index b836c1ab..cd3c5a9a 100644
--- a/packages/demo-app/nuxt.config.ts
+++ b/packages/demo-app/nuxt.config.ts
@@ -34,4 +34,14 @@ export default defineNuxtConfig({
       },
     },
   },
+
+  vite: {
+    css: {
+      preprocessorOptions: {
+        scss: {
+          api: "modern", // Fix warning: "The legacy JS API is deprecated and will be removed in Dart Sass 2.0.0"
+        },
+      },
+    },
+  },
 });
diff --git a/packages/demo-app/pages/index.vue b/packages/demo-app/pages/index.vue
index fd58fb7e..220c74ba 100644
--- a/packages/demo-app/pages/index.vue
+++ b/packages/demo-app/pages/index.vue
@@ -140,7 +140,6 @@ const sendTokens = async () => {
     await sendTransaction(wagmiConfig, {
       to: testTransferTarget,
       value: parseEther("0.1"),
-      gas: 100_000_000n,
     });
 
     balance.value = await getBalance(wagmiConfig, {
diff --git a/packages/nft-quest/composables/useMintNft.ts b/packages/nft-quest/composables/useMintNft.ts
index 9848c642..bd630811 100644
--- a/packages/nft-quest/composables/useMintNft.ts
+++ b/packages/nft-quest/composables/useMintNft.ts
@@ -1,5 +1,5 @@
-import { estimateGas, waitForTransactionReceipt, writeContract } from "@wagmi/core";
-import { type Address, encodeFunctionData } from "viem";
+import { waitForTransactionReceipt, writeContract } from "@wagmi/core";
+import type { Address } from "viem";
 import { getGeneralPaymasterInput } from "viem/zksync";
 
 export const useMintNft = async (_address: MaybeRef<Address>) => {
@@ -10,24 +10,11 @@ export const useMintNft = async (_address: MaybeRef<Address>) => {
     const { wagmiConfig } = storeToRefs(useConnectorStore());
 
     const mintingForAddress = address.value;
-    const data = encodeFunctionData({
-      abi: nftAbi,
-      functionName: "mint",
-      args: [address.value],
-    });
-
-    const estimatedGas = await estimateGas(wagmiConfig.value, {
-      to: runtimeConfig.public.contracts.nft as Address,
-      chainId: runtimeConfig.public.chain.id,
-      data,
-    });
-
     const transactionHash = await writeContract(wagmiConfig.value, {
       address: runtimeConfig.public.contracts.nft as Address,
       abi: nftAbi,
       functionName: "mint",
       args: [mintingForAddress],
-      gas: estimatedGas + (estimatedGas / 100n * 25n), // gas may be underestimated
       paymaster: runtimeConfig.public.contracts.paymaster as Address,
       paymasterInput: getGeneralPaymasterInput({ innerInput: "0x" }),
     });
diff --git a/packages/nft-quest/nuxt.config.ts b/packages/nft-quest/nuxt.config.ts
index 0bf91795..3715cbb5 100644
--- a/packages/nft-quest/nuxt.config.ts
+++ b/packages/nft-quest/nuxt.config.ts
@@ -90,4 +90,14 @@ export default defineNuxtConfig({
       },
     },
   },
+
+  vite: {
+    css: {
+      preprocessorOptions: {
+        scss: {
+          api: "modern", // Fix warning: "The legacy JS API is deprecated and will be removed in Dart Sass 2.0.0"
+        },
+      },
+    },
+  },
 });
diff --git a/packages/sdk/src/client/clients/session.ts b/packages/sdk/src/client/clients/session.ts
index a2e3dd7a..c0f22ca8 100644
--- a/packages/sdk/src/client/clients/session.ts
+++ b/packages/sdk/src/client/clients/session.ts
@@ -3,10 +3,30 @@ import { privateKeyToAccount } from "viem/accounts";
 
 import { encodeSession } from "../../utils/encoding.js";
 import type { SessionConfig } from "../../utils/session.js";
+import { publicActionsRewrite } from "../decorators/publicActionsRewrite.js";
 import { type ZksyncAccountSessionActions, zksyncAccountSessionActions } from "../decorators/session.js";
 import { type ZksyncAccountWalletActions, zksyncAccountWalletActions } from "../decorators/session_wallet.js";
 import { toSmartAccount } from "../smart-account.js";
 
+export const signSessionTransaction = (args: {
+  sessionKeySignedHash: Hash;
+  sessionContract: Address;
+  sessionConfig: SessionConfig;
+}) => {
+  return encodeAbiParameters(
+    [
+      { type: "bytes" },
+      { type: "address" },
+      { type: "bytes[]" },
+    ],
+    [
+      args.sessionKeySignedHash,
+      args.sessionContract,
+      [encodeSession(args.sessionConfig)], // FIXME: this is assuming there are no other hooks
+    ],
+  );
+};
+
 export function createZksyncSessionClient<
   transport extends Transport,
   chain extends Chain,
@@ -28,18 +48,11 @@ export function createZksyncSessionClient<
     sign: async ({ hash }) => {
       const sessionKeySigner = privateKeyToAccount(parameters.sessionKey);
       const hashSignature = await sessionKeySigner.sign({ hash });
-      return encodeAbiParameters(
-        [
-          { type: "bytes" },
-          { type: "address" },
-          { type: "bytes[]" },
-        ],
-        [
-          hashSignature,
-          parameters.contracts.session,
-          [encodeSession(parameters.sessionConfig)], // FIXME: this is assuming there are no other hooks
-        ],
-      );
+      return signSessionTransaction({
+        sessionKeySignedHash: hashSignature,
+        sessionContract: parameters.contracts.session,
+        sessionConfig: parameters.sessionConfig,
+      });
     },
   });
   const client = createClient<transport, chain, Account, rpcSchema>({
@@ -53,6 +66,7 @@ export function createZksyncSessionClient<
       contracts: parameters.contracts,
     }))
     .extend(publicActions)
+    .extend(publicActionsRewrite)
     .extend(zksyncAccountWalletActions)
     .extend(zksyncAccountSessionActions);
   return client;
diff --git a/packages/sdk/src/client/decorators/publicActionsRewrite.ts b/packages/sdk/src/client/decorators/publicActionsRewrite.ts
new file mode 100644
index 00000000..210b3587
--- /dev/null
+++ b/packages/sdk/src/client/decorators/publicActionsRewrite.ts
@@ -0,0 +1,37 @@
+import type { Account, Chain, Hex, PublicActions, Transport } from "viem";
+import { estimateContractGas, estimateGas } from "viem/actions";
+
+import { type ClientWithZksyncAccountSessionData, signSessionTransaction } from "../clients/session.js";
+
+const emptySignature = "0x" + "1b".padStart(65 * 2, "0") as Hex;
+
+export function publicActionsRewrite<
+  transport extends Transport,
+  chain extends Chain,
+  account extends Account,
+>(
+  client: ClientWithZksyncAccountSessionData<transport, chain, account>,
+): Pick<PublicActions<transport, chain, account>, "estimateContractGas" | "estimateGas"> {
+  return {
+    estimateContractGas: (args) => {
+      if (!("customSignature" in args)) {
+        (args as any).customSignature = signSessionTransaction({
+          sessionKeySignedHash: emptySignature,
+          sessionContract: client.contracts.session,
+          sessionConfig: client.sessionConfig,
+        });
+      }
+      return estimateContractGas(client, args as any);
+    },
+    estimateGas: async (args) => {
+      if (!("customSignature" in args)) {
+        (args as any).customSignature = signSessionTransaction({
+          sessionKeySignedHash: emptySignature,
+          sessionContract: client.contracts.session,
+          sessionConfig: client.sessionConfig,
+        });
+      }
+      return await estimateGas(client, args);
+    },
+  };
+}
diff --git a/packages/sdk/src/client/smart-account.ts b/packages/sdk/src/client/smart-account.ts
index c215a699..acb33ed1 100644
--- a/packages/sdk/src/client/smart-account.ts
+++ b/packages/sdk/src/client/smart-account.ts
@@ -41,7 +41,6 @@ export function toSmartAccount(
         ...transaction,
         from: this.address!,
         type: "eip712",
-        gas: 100_000_000n, // TODO remove when gas estimation is fixed
       } as ZksyncTransactionSerializableEIP712;
 
       const eip712DomainAndMessage = getEip712Domain(signableTransaction);
diff --git a/packages/sdk/src/connector/index.ts b/packages/sdk/src/connector/index.ts
index 43db4f70..1f6e260a 100644
--- a/packages/sdk/src/connector/index.ts
+++ b/packages/sdk/src/connector/index.ts
@@ -10,6 +10,7 @@ import {
   UserRejectedRequestError,
 } from "viem";
 
+import { EthereumProviderError } from "../errors/errors.js";
 import { type AppMetadata, type ProviderInterface, type SessionPreferences, WalletProvider } from "../index.js";
 
 export type ZksyncAccountConnectorOptions = {
@@ -155,17 +156,18 @@ export const zksyncAccountConnector = (parameters: ZksyncAccountConnectorOptions
       }
     },
     onAccountsChanged(accounts) {
-      if (accounts.length === 0) this.onDisconnect();
-      else config.emitter.emit("change", {
+      if (!accounts.length) return;
+      config.emitter.emit("change", {
         accounts: accounts.map((x) => getAddress(x)),
       });
     },
     onChainChanged(chain) {
       config.emitter.emit("change", { chainId: Number(chain) });
     },
-    async onDisconnect(_error) {
-      console.error("onDisconnect", _error);
+    async onDisconnect(error) {
       config.emitter.emit("disconnect");
+      if (error instanceof EthereumProviderError && error.code === 4900) return; // User initiated
+      console.error("Account disconnected", error);
     },
   }));
 };
diff --git a/packages/sdk/src/errors/errors.ts b/packages/sdk/src/errors/errors.ts
index 40af6ca7..e94ba309 100644
--- a/packages/sdk/src/errors/errors.ts
+++ b/packages/sdk/src/errors/errors.ts
@@ -149,7 +149,7 @@ class EthereumRpcError<T> extends Error {
   }
 }
 
-class EthereumProviderError<T> extends EthereumRpcError<T> {
+export class EthereumProviderError<T> extends EthereumRpcError<T> {
   /**
    * Create an Ethereum Provider JSON-RPC error.
    * `code` must be an integer in the 1000 <= 4999 range.

From a5f5123c7962f72cbfedaaf5b137b1afda17e37a Mon Sep 17 00:00:00 2001
From: Jack Hamer <jackhamer0990@gmail.com>
Date: Thu, 14 Nov 2024 12:05:56 +0200
Subject: [PATCH 35/42] Reapply "fix: try fix estimation"

This reverts commit 4092f841cca150ea6ce25493b345fc8296c3af13.
---
 .../client/decorators/publicActionsRewrite.ts | 32 +++++++++++++++++--
 .../src/client/decorators/session_wallet.ts   | 13 +++++---
 2 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/packages/sdk/src/client/decorators/publicActionsRewrite.ts b/packages/sdk/src/client/decorators/publicActionsRewrite.ts
index 210b3587..18c120ae 100644
--- a/packages/sdk/src/client/decorators/publicActionsRewrite.ts
+++ b/packages/sdk/src/client/decorators/publicActionsRewrite.ts
@@ -1,5 +1,5 @@
 import type { Account, Chain, Hex, PublicActions, Transport } from "viem";
-import { estimateContractGas, estimateGas } from "viem/actions";
+import { estimateContractGas, estimateGas, getGasPrice, prepareTransactionRequest } from "viem/actions";
 
 import { type ClientWithZksyncAccountSessionData, signSessionTransaction } from "../clients/session.js";
 
@@ -11,9 +11,32 @@ export function publicActionsRewrite<
   account extends Account,
 >(
   client: ClientWithZksyncAccountSessionData<transport, chain, account>,
-): Pick<PublicActions<transport, chain, account>, "estimateContractGas" | "estimateGas"> {
+): Pick<PublicActions<transport, chain, account>, "estimateContractGas" | "estimateGas" | "prepareTransactionRequest"> {
   return {
+    prepareTransactionRequest: async (args) => {
+      console.log("123prepareTransactionRequest");
+      if (!("customSignature" in args)) {
+        (args as any).customSignature = signSessionTransaction({
+          sessionKeySignedHash: emptySignature,
+          sessionContract: client.contracts.session,
+          sessionConfig: client.sessionConfig,
+        });
+      }
+      console.log("Initial args", args);
+      const request = await prepareTransactionRequest(client as any, {
+        ...args,
+        type: "eip712",
+        typeHex: "0x71",
+        chainId: client.chain.id,
+        parameters: ["gas", "nonce"],
+        gasPrice: await getGasPrice(client),
+        gas: await estimateGas(client, args as any),
+      } as any) as any;
+      console.log("Request", request);
+      return request;
+    },
     estimateContractGas: (args) => {
+      console.log("123estimateContractGas");
       if (!("customSignature" in args)) {
         (args as any).customSignature = signSessionTransaction({
           sessionKeySignedHash: emptySignature,
@@ -24,6 +47,7 @@ export function publicActionsRewrite<
       return estimateContractGas(client, args as any);
     },
     estimateGas: async (args) => {
+      console.log("123estimateGas");
       if (!("customSignature" in args)) {
         (args as any).customSignature = signSessionTransaction({
           sessionKeySignedHash: emptySignature,
@@ -31,7 +55,9 @@ export function publicActionsRewrite<
           sessionConfig: client.sessionConfig,
         });
       }
-      return await estimateGas(client, args);
+      const estimated = await estimateGas(client, args);
+      console.log("Estimated", estimated);
+      return estimated;
     },
   };
 }
diff --git a/packages/sdk/src/client/decorators/session_wallet.ts b/packages/sdk/src/client/decorators/session_wallet.ts
index f993ebb9..af277406 100644
--- a/packages/sdk/src/client/decorators/session_wallet.ts
+++ b/packages/sdk/src/client/decorators/session_wallet.ts
@@ -1,6 +1,6 @@
 import { /* decodeFunctionData, erc20Abi, getAddress, */ type Account, type Chain, type Transport, type WalletActions } from "viem";
 import { deployContract, getAddresses, getChainId, prepareTransactionRequest, sendRawTransaction, signMessage, signTypedData, writeContract } from "viem/actions";
-import { getGeneralPaymasterInput, sendEip712Transaction, sendTransaction, signTransaction } from "viem/zksync";
+import { getGeneralPaymasterInput, sendEip712Transaction, signTransaction } from "viem/zksync";
 
 import type { ClientWithZksyncAccountSessionData } from "../clients/session.js";
 /* import { getTokenSpendLimit } from '../actions/session.js'; */
@@ -22,7 +22,11 @@ export function zksyncAccountWalletActions<
       prepareTransactionRequest(client, args),
     sendRawTransaction: (args) => sendRawTransaction(client, args),
     sendTransaction: async (args) => {
-      const tx = client.chain.formatters?.transaction?.format(args) || args;
+      const tx: any = {
+        ...(client.chain.formatters?.transaction?.format(args) || args),
+        type: "eip712",
+        account: client.account,
+      };
       /* await verifyTransactionData({
         value: tx.value,
         chain: tx.chain || undefined,
@@ -36,14 +40,15 @@ export function zksyncAccountWalletActions<
       if (tx.eip712Meta) {
         const transaction = {
           ...tx,
-          account: client.account,
           paymaster: tx.eip712Meta.paymasterParams.paymaster,
           // TODO: Find permanent fix as this only works for general paymasters with no input
           paymasterInput: getGeneralPaymasterInput({ innerInput: "0x" }),
         };
         return await sendEip712Transaction(client, transaction);
       }
-      return await sendTransaction(client, tx);
+
+      console.log("Sending transaction", tx);
+      return await sendEip712Transaction(client, tx);
     },
     signMessage: (args) => signMessage(client, args),
     // eslint-disable-next-line @typescript-eslint/no-explicit-any

From 59a4a02718020950fc5637083b94064cac7a8c27 Mon Sep 17 00:00:00 2001
From: Jack Hamer <jackhamer0990@gmail.com>
Date: Fri, 15 Nov 2024 13:34:21 +0200
Subject: [PATCH 36/42] fix: some more updates, getting closer to figure out
 the issue

---
 packages/demo-app/pages/index.vue              | 11 +++++++++--
 packages/sdk/src/client-auth-server/Signer.ts  |  2 ++
 packages/sdk/src/client/clients/session.ts     |  4 ++--
 .../client/decorators/publicActionsRewrite.ts  | 18 +++++++++---------
 .../src/client/decorators/session_wallet.ts    | 18 ++++++++++++------
 packages/sdk/src/client/smart-account.ts       |  2 ++
 6 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/packages/demo-app/pages/index.vue b/packages/demo-app/pages/index.vue
index 220c74ba..d8c226ce 100644
--- a/packages/demo-app/pages/index.vue
+++ b/packages/demo-app/pages/index.vue
@@ -40,7 +40,7 @@
 </template>
 
 <script lang="ts" setup>
-import { disconnect, getBalance, watchAccount, sendTransaction, createConfig, connect, reconnect, type GetBalanceReturnType } from "@wagmi/core";
+import { disconnect, getBalance, watchAccount, sendTransaction, createConfig, connect, reconnect, type GetBalanceReturnType, waitForTransactionReceipt } from "@wagmi/core";
 import { zksyncAccountConnector } from "zksync-sso/connector";
 import { zksyncInMemoryNode } from "@wagmi/core/chains";
 import { createWalletClient, http, parseEther, type Address } from "viem";
@@ -137,14 +137,21 @@ const sendTokens = async () => {
   errorMessage.value = "";
   isSendingEth.value = true;
   try {
-    await sendTransaction(wagmiConfig, {
+    const transactionHash = await sendTransaction(wagmiConfig, {
       to: testTransferTarget,
       value: parseEther("0.1"),
+      gas: 100_000_000n, // wagmi doesn't pass this field to the connector, why???
     });
 
     balance.value = await getBalance(wagmiConfig, {
       address: address.value,
     });
+
+    const receipt = await waitForTransactionReceipt(wagmiConfig, { hash: transactionHash });
+    if (receipt.status !== "success") {
+      console.log("Transaction failed", receipt);
+      errorMessage.value = "Transaction reverted";
+    }
   } catch (error) {
     // eslint-disable-next-line no-console
     console.error("Transaction failed:", error);
diff --git a/packages/sdk/src/client-auth-server/Signer.ts b/packages/sdk/src/client-auth-server/Signer.ts
index 0d1f1f5f..c3e6e6ec 100644
--- a/packages/sdk/src/client-auth-server/Signer.ts
+++ b/packages/sdk/src/client-auth-server/Signer.ts
@@ -199,6 +199,7 @@ export class Signer implements SignerInterface {
       case "eth_estimateGas": {
         if (!this.walletClient || !this.session) return undefined;
         const params = request.params as ExtractParams<"eth_estimateGas">;
+        console.log("eth_estimateGas", params);
         const res = await this.walletClient.request({ method: request.method, params: params });
         return res as ExtractReturnType<TMethod>;
       }
@@ -206,6 +207,7 @@ export class Signer implements SignerInterface {
         if (!this.walletClient || !this.session) return undefined;
         const params = request.params as ExtractParams<"eth_sendTransaction">;
         const transactionRequest = params[0];
+        console.log("eth_sendTransaction", transactionRequest);
         const res = await this.walletClient.sendTransaction(transactionRequest as unknown as SendTransactionParameters);
         return res as ExtractReturnType<TMethod>;
       }
diff --git a/packages/sdk/src/client/clients/session.ts b/packages/sdk/src/client/clients/session.ts
index c0f22ca8..033da27d 100644
--- a/packages/sdk/src/client/clients/session.ts
+++ b/packages/sdk/src/client/clients/session.ts
@@ -3,7 +3,7 @@ import { privateKeyToAccount } from "viem/accounts";
 
 import { encodeSession } from "../../utils/encoding.js";
 import type { SessionConfig } from "../../utils/session.js";
-import { publicActionsRewrite } from "../decorators/publicActionsRewrite.js";
+/* import { publicActionsRewrite } from "../decorators/publicActionsRewrite.js"; */
 import { type ZksyncAccountSessionActions, zksyncAccountSessionActions } from "../decorators/session.js";
 import { type ZksyncAccountWalletActions, zksyncAccountWalletActions } from "../decorators/session_wallet.js";
 import { toSmartAccount } from "../smart-account.js";
@@ -66,7 +66,7 @@ export function createZksyncSessionClient<
       contracts: parameters.contracts,
     }))
     .extend(publicActions)
-    .extend(publicActionsRewrite)
+    // .extend(publicActionsRewrite)
     .extend(zksyncAccountWalletActions)
     .extend(zksyncAccountSessionActions);
   return client;
diff --git a/packages/sdk/src/client/decorators/publicActionsRewrite.ts b/packages/sdk/src/client/decorators/publicActionsRewrite.ts
index 18c120ae..a68a9df2 100644
--- a/packages/sdk/src/client/decorators/publicActionsRewrite.ts
+++ b/packages/sdk/src/client/decorators/publicActionsRewrite.ts
@@ -1,5 +1,5 @@
 import type { Account, Chain, Hex, PublicActions, Transport } from "viem";
-import { estimateContractGas, estimateGas, getGasPrice, prepareTransactionRequest } from "viem/actions";
+import { estimateContractGas, estimateGas, prepareTransactionRequest } from "viem/actions";
 
 import { type ClientWithZksyncAccountSessionData, signSessionTransaction } from "../clients/session.js";
 
@@ -14,7 +14,7 @@ export function publicActionsRewrite<
 ): Pick<PublicActions<transport, chain, account>, "estimateContractGas" | "estimateGas" | "prepareTransactionRequest"> {
   return {
     prepareTransactionRequest: async (args) => {
-      console.log("123prepareTransactionRequest");
+      console.log("prepareTransactionRequest", args);
       if (!("customSignature" in args)) {
         (args as any).customSignature = signSessionTransaction({
           sessionKeySignedHash: emptySignature,
@@ -26,17 +26,17 @@ export function publicActionsRewrite<
       const request = await prepareTransactionRequest(client as any, {
         ...args,
         type: "eip712",
-        typeHex: "0x71",
+        // typeHex: "0x71",
         chainId: client.chain.id,
-        parameters: ["gas", "nonce"],
-        gasPrice: await getGasPrice(client),
-        gas: await estimateGas(client, args as any),
+        parameters: ["gas", "nonce", "fees"],
+        /* gasPrice: await getGasPrice(client),
+        gas: await estimateGas(client, args as any), */
       } as any) as any;
-      console.log("Request", request);
+      console.log("After prepare", request);
       return request;
     },
     estimateContractGas: (args) => {
-      console.log("123estimateContractGas");
+      console.log("estimateContractGas", args);
       if (!("customSignature" in args)) {
         (args as any).customSignature = signSessionTransaction({
           sessionKeySignedHash: emptySignature,
@@ -47,7 +47,7 @@ export function publicActionsRewrite<
       return estimateContractGas(client, args as any);
     },
     estimateGas: async (args) => {
-      console.log("123estimateGas");
+      console.log("estimateGas", args);
       if (!("customSignature" in args)) {
         (args as any).customSignature = signSessionTransaction({
           sessionKeySignedHash: emptySignature,
diff --git a/packages/sdk/src/client/decorators/session_wallet.ts b/packages/sdk/src/client/decorators/session_wallet.ts
index af277406..6752d801 100644
--- a/packages/sdk/src/client/decorators/session_wallet.ts
+++ b/packages/sdk/src/client/decorators/session_wallet.ts
@@ -1,8 +1,8 @@
-import { /* decodeFunctionData, erc20Abi, getAddress, */ type Account, type Chain, type Transport, type WalletActions } from "viem";
+import { /* decodeFunctionData, erc20Abi, getAddress, */ type Account, type Chain, type Hex, type Transport, type WalletActions } from "viem";
 import { deployContract, getAddresses, getChainId, prepareTransactionRequest, sendRawTransaction, signMessage, signTypedData, writeContract } from "viem/actions";
-import { getGeneralPaymasterInput, sendEip712Transaction, signTransaction } from "viem/zksync";
+import { getGeneralPaymasterInput, sendEip712Transaction, sendTransaction, /* sendTransaction, */ signTransaction } from "viem/zksync";
 
-import type { ClientWithZksyncAccountSessionData } from "../clients/session.js";
+import { type ClientWithZksyncAccountSessionData, signSessionTransaction } from "../clients/session.js";
 /* import { getTokenSpendLimit } from '../actions/session.js'; */
 
 export type ZksyncAccountWalletActions<chain extends Chain, account extends Account> = Omit<
@@ -22,10 +22,17 @@ export function zksyncAccountWalletActions<
       prepareTransactionRequest(client, args),
     sendRawTransaction: (args) => sendRawTransaction(client, args),
     sendTransaction: async (args) => {
+      console.log("sendTransaction", args);
+
       const tx: any = {
         ...(client.chain.formatters?.transaction?.format(args) || args),
-        type: "eip712",
         account: client.account,
+        type: "eip712",
+        customSignature: signSessionTransaction({
+          sessionKeySignedHash: "0x" + "1b".padStart(65 * 2, "0") as Hex,
+          sessionContract: client.contracts.session,
+          sessionConfig: client.sessionConfig,
+        }),
       };
       /* await verifyTransactionData({
         value: tx.value,
@@ -47,8 +54,7 @@ export function zksyncAccountWalletActions<
         return await sendEip712Transaction(client, transaction);
       }
 
-      console.log("Sending transaction", tx);
-      return await sendEip712Transaction(client, tx);
+      return await sendTransaction(client, tx);
     },
     signMessage: (args) => signMessage(client, args),
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/packages/sdk/src/client/smart-account.ts b/packages/sdk/src/client/smart-account.ts
index acb33ed1..164a610e 100644
--- a/packages/sdk/src/client/smart-account.ts
+++ b/packages/sdk/src/client/smart-account.ts
@@ -37,10 +37,12 @@ export function toSmartAccount(
       });
     },
     async signTransaction(transaction) {
+      console.log("signTransaction", transaction);
       const signableTransaction = {
         ...transaction,
         from: this.address!,
         type: "eip712",
+        gas: 375_534n,
       } as ZksyncTransactionSerializableEIP712;
 
       const eip712DomainAndMessage = getEip712Domain(signableTransaction);

From 540353186cf7657eaaf194683f1d148f6620024a Mon Sep 17 00:00:00 2001
From: Jack Hamer <jackhamer0990@gmail.com>
Date: Fri, 15 Nov 2024 14:40:02 +0200
Subject: [PATCH 37/42] fix: estimation

---
 packages/demo-app/pages/index.vue             |   3 +-
 .../client/actions/sendEip712Transaction.ts   | 166 ++++++++++++++++++
 packages/sdk/src/client/clients/session.ts    |   4 +-
 .../client/decorators/publicActionsRewrite.ts |  12 +-
 .../src/client/decorators/session_wallet.ts   |  31 +---
 packages/sdk/src/client/smart-account.ts      |   2 +-
 6 files changed, 183 insertions(+), 35 deletions(-)
 create mode 100644 packages/sdk/src/client/actions/sendEip712Transaction.ts

diff --git a/packages/demo-app/pages/index.vue b/packages/demo-app/pages/index.vue
index d8c226ce..f23352b2 100644
--- a/packages/demo-app/pages/index.vue
+++ b/packages/demo-app/pages/index.vue
@@ -40,7 +40,7 @@
 </template>
 
 <script lang="ts" setup>
-import { disconnect, getBalance, watchAccount, sendTransaction, createConfig, connect, reconnect, type GetBalanceReturnType, waitForTransactionReceipt } from "@wagmi/core";
+import { disconnect, getBalance, watchAccount, sendTransaction, createConfig, connect, reconnect, type GetBalanceReturnType, waitForTransactionReceipt, getGasPrice } from "@wagmi/core";
 import { zksyncAccountConnector } from "zksync-sso/connector";
 import { zksyncInMemoryNode } from "@wagmi/core/chains";
 import { createWalletClient, http, parseEther, type Address } from "viem";
@@ -140,6 +140,7 @@ const sendTokens = async () => {
     const transactionHash = await sendTransaction(wagmiConfig, {
       to: testTransferTarget,
       value: parseEther("0.1"),
+      gasPrice: await getGasPrice(wagmiConfig),
       gas: 100_000_000n, // wagmi doesn't pass this field to the connector, why???
     });
 
diff --git a/packages/sdk/src/client/actions/sendEip712Transaction.ts b/packages/sdk/src/client/actions/sendEip712Transaction.ts
new file mode 100644
index 00000000..cbf240ed
--- /dev/null
+++ b/packages/sdk/src/client/actions/sendEip712Transaction.ts
@@ -0,0 +1,166 @@
+import { type Account, assertRequest, type AssertRequestErrorType, type Chain, type Client, type ExactPartial, type Hash, type PublicActions, type RpcSchema, type SendTransactionRequest, type Transport, type WalletActions } from "viem";
+import { parseAccount } from "viem/accounts";
+import { prepareTransactionRequest, sendRawTransaction } from "viem/actions";
+import { type ChainEIP712, type SendEip712TransactionParameters, type SendEip712TransactionReturnType, type SendTransactionParameters, zksync } from "viem/zksync";
+
+import { InvalidEip712TransactionError, type InvalidEip712TransactionErrorType } from "../utils/assertEip712Transaction.js";
+import { isEIP712Transaction } from "../utils/isEip712Transaction.js";
+
+/**
+ * Creates, signs, and sends a new EIP712 transaction to the network.
+ *
+ * @param client - Client to use
+ * @param parameters - {@link SendEip712TransactionParameters}
+ * @returns The [Transaction](https://viem.sh/docs/glossary/terms#transaction) hash. {@link SendTransactionReturnType}
+ *
+ * @example
+ * import { createWalletClient, custom } from 'viem'
+ * import { zksync } from 'viem/chains'
+ * import { sendEip712Transaction } from 'viem/zksync'
+ *
+ * const client = createWalletClient({
+ *   chain: zksync,
+ *   transport: custom(window.ethereum),
+ * })
+ * const hash = await sendEip712Transaction(client, {
+ *   account: '0xA0Cf798816D4b9b9866b5330EEa46a18382f251e',
+ *   to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8',
+ *   value: 1000000000000000000n,
+ * })
+ *
+ * @example
+ * // Account Hoisting
+ * import { createWalletClient, http } from 'viem'
+ * import { privateKeyToAccount } from 'viem/accounts'
+ * import { zksync } from 'viem/chains'
+ * import { sendEip712Transaction } from 'viem/zksync'
+ *
+ * const client = createWalletClient({
+ *   account: privateKeyToAccount('0x…'),
+ *   chain: zksync,
+ *   transport: http(),
+ * })
+ *
+ * const hash = await sendEip712Transaction(client, {
+ *   to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8',
+ *   value: 1000000000000000000n,
+ * })
+ */
+const defaultParameters = [
+  "blobVersionedHashes",
+  "chainId",
+  /* "fees", */
+  "gas",
+  "nonce",
+  "type",
+] as const;
+
+export async function sendEip712Transaction<
+  chain extends ChainEIP712 | undefined,
+  account extends Account | undefined,
+  const request extends SendTransactionRequest<chain, chainOverride>,
+  chainOverride extends ChainEIP712 | undefined = undefined,
+>(
+  client: Client<Transport, chain, account>,
+  parameters: SendEip712TransactionParameters<
+    chain,
+    account,
+    chainOverride,
+    request
+  >,
+): Promise<SendEip712TransactionReturnType> {
+  const {
+    account: account_ = client.account,
+    chain = client.chain,
+    ...rest
+  } = parameters;
+
+  if (!account_)
+    throw new Error("Account not found.");
+  const account = parseAccount(account_);
+  console.log("sendEip712Transaction", parameters);
+
+  try {
+    assertEip712Request(parameters);
+
+    const request = await getAction(
+      client,
+      prepareTransactionRequest,
+      "prepareTransactionRequest",
+    )({
+      account,
+      chain,
+      nonceManager: account.nonceManager,
+      parameters: [...defaultParameters, "sidecars"],
+      ...rest,
+      gasPerPubdata: 50000n,
+      data: "0x",
+    } as any);
+
+    const serializer = chain?.serializers?.transaction;
+    const serializedTransaction = (await account.signTransaction!(request, {
+      serializer,
+    })) as Hash;
+
+    return await getAction(
+      client,
+      sendRawTransaction,
+      "sendRawTransaction",
+    )({
+      serializedTransaction,
+    });
+  } catch (err) {
+    console.error("sendeip712transaction error");
+    throw err;
+  }
+}
+
+/**
+ * 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 function 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,
+  // 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: keyof PublicActions | keyof WalletActions | (string & {}),
+): (parameters: parameters) => returnType {
+  const action_implicit = client[actionFn.name];
+  if (typeof action_implicit === "function")
+    return action_implicit as (params: parameters) => returnType;
+
+  const action_explicit = client[name];
+  if (typeof action_explicit === "function")
+    return action_explicit as (params: parameters) => returnType;
+
+  return (params) => actionFn(client, params);
+}
+
+type AssertEip712RequestParameters = ExactPartial<
+  SendTransactionParameters<typeof zksync>
+>;
+
+/** @internal */
+export type AssertEip712RequestErrorType =
+  | InvalidEip712TransactionErrorType
+  | AssertRequestErrorType;
+
+export function assertEip712Request(args: AssertEip712RequestParameters) {
+  if (!isEIP712Transaction(args as any))
+    throw new InvalidEip712TransactionError();
+  assertRequest(args as any);
+}
diff --git a/packages/sdk/src/client/clients/session.ts b/packages/sdk/src/client/clients/session.ts
index 033da27d..c0f22ca8 100644
--- a/packages/sdk/src/client/clients/session.ts
+++ b/packages/sdk/src/client/clients/session.ts
@@ -3,7 +3,7 @@ import { privateKeyToAccount } from "viem/accounts";
 
 import { encodeSession } from "../../utils/encoding.js";
 import type { SessionConfig } from "../../utils/session.js";
-/* import { publicActionsRewrite } from "../decorators/publicActionsRewrite.js"; */
+import { publicActionsRewrite } from "../decorators/publicActionsRewrite.js";
 import { type ZksyncAccountSessionActions, zksyncAccountSessionActions } from "../decorators/session.js";
 import { type ZksyncAccountWalletActions, zksyncAccountWalletActions } from "../decorators/session_wallet.js";
 import { toSmartAccount } from "../smart-account.js";
@@ -66,7 +66,7 @@ export function createZksyncSessionClient<
       contracts: parameters.contracts,
     }))
     .extend(publicActions)
-    // .extend(publicActionsRewrite)
+    .extend(publicActionsRewrite)
     .extend(zksyncAccountWalletActions)
     .extend(zksyncAccountSessionActions);
   return client;
diff --git a/packages/sdk/src/client/decorators/publicActionsRewrite.ts b/packages/sdk/src/client/decorators/publicActionsRewrite.ts
index a68a9df2..3f16a3ee 100644
--- a/packages/sdk/src/client/decorators/publicActionsRewrite.ts
+++ b/packages/sdk/src/client/decorators/publicActionsRewrite.ts
@@ -23,15 +23,13 @@ export function publicActionsRewrite<
         });
       }
       console.log("Initial args", args);
-      const request = await prepareTransactionRequest(client as any, {
-        ...args,
-        type: "eip712",
-        // typeHex: "0x71",
+      const request = await prepareTransactionRequest(client, args as any) as any;
+      /* const request = await prepareTransactionRequest(client, {
         chainId: client.chain.id,
         parameters: ["gas", "nonce", "fees"],
-        /* gasPrice: await getGasPrice(client),
-        gas: await estimateGas(client, args as any), */
-      } as any) as any;
+        ...args,
+        type: "eip712",
+      } as any) as any; */
       console.log("After prepare", request);
       return request;
     },
diff --git a/packages/sdk/src/client/decorators/session_wallet.ts b/packages/sdk/src/client/decorators/session_wallet.ts
index 6752d801..5c581585 100644
--- a/packages/sdk/src/client/decorators/session_wallet.ts
+++ b/packages/sdk/src/client/decorators/session_wallet.ts
@@ -1,12 +1,13 @@
-import { /* decodeFunctionData, erc20Abi, getAddress, */ type Account, type Chain, type Hex, type Transport, type WalletActions } from "viem";
-import { deployContract, getAddresses, getChainId, prepareTransactionRequest, sendRawTransaction, signMessage, signTypedData, writeContract } from "viem/actions";
-import { getGeneralPaymasterInput, sendEip712Transaction, sendTransaction, /* sendTransaction, */ signTransaction } from "viem/zksync";
+import { /* decodeFunctionData, erc20Abi, getAddress, */ type Account, type Chain, type Transport, type WalletActions } from "viem";
+import { deployContract, getAddresses, getChainId, sendRawTransaction, signMessage, signTypedData, writeContract } from "viem/actions";
+import { getGeneralPaymasterInput, signTransaction } from "viem/zksync";
 
-import { type ClientWithZksyncAccountSessionData, signSessionTransaction } from "../clients/session.js";
+import { sendEip712Transaction } from "../actions/sendEip712Transaction.js";
+import { type ClientWithZksyncAccountSessionData } from "../clients/session.js";
 /* import { getTokenSpendLimit } from '../actions/session.js'; */
 
 export type ZksyncAccountWalletActions<chain extends Chain, account extends Account> = Omit<
-  WalletActions<chain, account>, "addChain" | "getPermissions" | "requestAddresses" | "requestPermissions" | "switchChain" | "watchAsset"
+  WalletActions<chain, account>, "addChain" | "getPermissions" | "requestAddresses" | "requestPermissions" | "switchChain" | "watchAsset" | "prepareTransactionRequest"
 >;
 
 export function zksyncAccountWalletActions<
@@ -18,32 +19,14 @@ export function zksyncAccountWalletActions<
     deployContract: (args) => deployContract(client, args),
     getAddresses: () => getAddresses(client),
     getChainId: () => getChainId(client),
-    prepareTransactionRequest: (args) =>
-      prepareTransactionRequest(client, args),
     sendRawTransaction: (args) => sendRawTransaction(client, args),
     sendTransaction: async (args) => {
       console.log("sendTransaction", args);
 
       const tx: any = {
         ...(client.chain.formatters?.transaction?.format(args) || args),
-        account: client.account,
         type: "eip712",
-        customSignature: signSessionTransaction({
-          sessionKeySignedHash: "0x" + "1b".padStart(65 * 2, "0") as Hex,
-          sessionContract: client.contracts.session,
-          sessionConfig: client.sessionConfig,
-        }),
       };
-      /* await verifyTransactionData({
-        value: tx.value,
-        chain: tx.chain || undefined,
-        to: tx.to || undefined,
-        data: tx.data,
-        gas: tx.gas,
-        gasPrice: tx.gasPrice,
-        maxFeePerGas: tx.maxFeePerGas,
-        maxPriorityFeePerGas: tx.maxPriorityFeePerGas,
-      }, client); */
       if (tx.eip712Meta) {
         const transaction = {
           ...tx,
@@ -54,7 +37,7 @@ export function zksyncAccountWalletActions<
         return await sendEip712Transaction(client, transaction);
       }
 
-      return await sendTransaction(client, tx);
+      return await sendEip712Transaction(client, tx);
     },
     signMessage: (args) => signMessage(client, args),
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/packages/sdk/src/client/smart-account.ts b/packages/sdk/src/client/smart-account.ts
index 164a610e..ca300920 100644
--- a/packages/sdk/src/client/smart-account.ts
+++ b/packages/sdk/src/client/smart-account.ts
@@ -42,7 +42,7 @@ export function toSmartAccount(
         ...transaction,
         from: this.address!,
         type: "eip712",
-        gas: 375_534n,
+        // gas: 375_534n,
       } as ZksyncTransactionSerializableEIP712;
 
       const eip712DomainAndMessage = getEip712Domain(signableTransaction);

From bf99429ff48a3de5a0479e81ad096d633737454e Mon Sep 17 00:00:00 2001
From: Jack Hamer <jackhamer0990@gmail.com>
Date: Fri, 15 Nov 2024 14:47:03 +0200
Subject: [PATCH 38/42] fix: undo hardocde data and gasPerPubdata

---
 cspell-config/cspell-misc.txt                            | 2 +-
 packages/sdk/src/client/actions/sendEip712Transaction.ts | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/cspell-config/cspell-misc.txt b/cspell-config/cspell-misc.txt
index 851e0f7b..10158c61 100644
--- a/cspell-config/cspell-misc.txt
+++ b/cspell-config/cspell-misc.txt
@@ -10,6 +10,7 @@ nuxtjs
 testid
 verdaccio
 vueuse
+ethereum
 
 // packages/bank-demo
 ctap
@@ -26,4 +27,3 @@ usdc
 // packages/nft-quest
 Fren
 fren
-trxn
diff --git a/packages/sdk/src/client/actions/sendEip712Transaction.ts b/packages/sdk/src/client/actions/sendEip712Transaction.ts
index cbf240ed..5056af80 100644
--- a/packages/sdk/src/client/actions/sendEip712Transaction.ts
+++ b/packages/sdk/src/client/actions/sendEip712Transaction.ts
@@ -93,8 +93,8 @@ export async function sendEip712Transaction<
       nonceManager: account.nonceManager,
       parameters: [...defaultParameters, "sidecars"],
       ...rest,
-      gasPerPubdata: 50000n,
-      data: "0x",
+      // gasPerPubdata: 50000n,
+      // data: "0x",
     } as any);
 
     const serializer = chain?.serializers?.transaction;
@@ -134,6 +134,7 @@ export function getAction<
 >(
   client: client,
   actionFn: (_: any, parameters: parameters) => returnType,
+  // 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.

From 710edc363d5e2daed0bce77902dc9d15c3a85125 Mon Sep 17 00:00:00 2001
From: Jack Hamer <jackhamer0990@gmail.com>
Date: Fri, 15 Nov 2024 15:26:00 +0200
Subject: [PATCH 39/42] fix: undo using gas price

---
 packages/contracts/test/SessionKeyTest.ts                | 2 +-
 packages/demo-app/pages/index.vue                        | 4 ++--
 packages/sdk/src/client/actions/sendEip712Transaction.ts | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/contracts/test/SessionKeyTest.ts b/packages/contracts/test/SessionKeyTest.ts
index e03bc5fa..9290a852 100644
--- a/packages/contracts/test/SessionKeyTest.ts
+++ b/packages/contracts/test/SessionKeyTest.ts
@@ -311,7 +311,7 @@ describe("SessionKeyModule tests", function () {
       await tester.sendTxSuccess({
         to: sessionTarget,
         value: parseEther("0.01"),
-        gasLimit: 10_000_000n,
+        // gasLimit: 10_000_000n,
       });
       expect(await provider.getBalance(sessionTarget))
         .to.equal(parseEther("0.01"), "session target should have received the funds");
diff --git a/packages/demo-app/pages/index.vue b/packages/demo-app/pages/index.vue
index f23352b2..e2cdaf18 100644
--- a/packages/demo-app/pages/index.vue
+++ b/packages/demo-app/pages/index.vue
@@ -40,7 +40,7 @@
 </template>
 
 <script lang="ts" setup>
-import { disconnect, getBalance, watchAccount, sendTransaction, createConfig, connect, reconnect, type GetBalanceReturnType, waitForTransactionReceipt, getGasPrice } from "@wagmi/core";
+import { disconnect, getBalance, watchAccount, sendTransaction, createConfig, connect, reconnect, type GetBalanceReturnType, waitForTransactionReceipt } from "@wagmi/core";
 import { zksyncAccountConnector } from "zksync-sso/connector";
 import { zksyncInMemoryNode } from "@wagmi/core/chains";
 import { createWalletClient, http, parseEther, type Address } from "viem";
@@ -140,7 +140,7 @@ const sendTokens = async () => {
     const transactionHash = await sendTransaction(wagmiConfig, {
       to: testTransferTarget,
       value: parseEther("0.1"),
-      gasPrice: await getGasPrice(wagmiConfig),
+      // gasPrice: await getGasPrice(wagmiConfig),
       gas: 100_000_000n, // wagmi doesn't pass this field to the connector, why???
     });
 
diff --git a/packages/sdk/src/client/actions/sendEip712Transaction.ts b/packages/sdk/src/client/actions/sendEip712Transaction.ts
index 5056af80..24b36cf3 100644
--- a/packages/sdk/src/client/actions/sendEip712Transaction.ts
+++ b/packages/sdk/src/client/actions/sendEip712Transaction.ts
@@ -49,7 +49,7 @@ import { isEIP712Transaction } from "../utils/isEip712Transaction.js";
 const defaultParameters = [
   "blobVersionedHashes",
   "chainId",
-  /* "fees", */
+  "fees",
   "gas",
   "nonce",
   "type",

From 4ae87893fee7eca4f06db1d9ccb7b7ccac0de20b Mon Sep 17 00:00:00 2001
From: Jack Hamer <jackhamer0990@gmail.com>
Date: Wed, 20 Nov 2024 16:38:01 +0200
Subject: [PATCH 40/42] fix: sdk improvements

---
 examples/demo-app/pages/index.vue             |  2 -
 packages/contracts/test/PasskeyModule.ts      |  3 -
 packages/contracts/test/SessionKeyTest.ts     |  1 -
 packages/sdk/prepare-package.mjs              |  8 +--
 packages/sdk/src/client-auth-server/Signer.ts | 12 +++-
 .../src/client-auth-server/WalletProvider.ts  |  4 ++
 .../sdk/src/client-auth-server/interface.ts   |  2 +
 .../client/actions/sendEip712Transaction.ts   | 62 +++++++------------
 .../client/decorators/publicActionsRewrite.ts | 13 +---
 .../src/client/decorators/session_wallet.ts   | 34 +++++-----
 packages/sdk/src/client/smart-account.ts      |  2 -
 packages/sdk/src/connector/index.ts           |  4 ++
 12 files changed, 65 insertions(+), 82 deletions(-)

diff --git a/examples/demo-app/pages/index.vue b/examples/demo-app/pages/index.vue
index c4b5ad9f..751c8488 100644
--- a/examples/demo-app/pages/index.vue
+++ b/examples/demo-app/pages/index.vue
@@ -140,8 +140,6 @@ const sendTokens = async () => {
     const transactionHash = await sendTransaction(wagmiConfig, {
       to: testTransferTarget,
       value: parseEther("0.1"),
-      // gasPrice: await getGasPrice(wagmiConfig),
-      gas: 100_000_000n, // wagmi doesn't pass this field to the connector, why???
     });
 
     balance.value = await getBalance(wagmiConfig, {
diff --git a/packages/contracts/test/PasskeyModule.ts b/packages/contracts/test/PasskeyModule.ts
index bb877c27..a7a45fae 100644
--- a/packages/contracts/test/PasskeyModule.ts
+++ b/packages/contracts/test/PasskeyModule.ts
@@ -220,9 +220,6 @@ async function rawVerify(
   const hashedData = await toHash(concat([authDataBuffer, clientDataHash]));
   const rs = unwrapEC2Signature(toBuffer(b64SignedChallange));
   const publicKeys = await getPublicKey(publicKeyEs256Bytes);
-  /* console.log("externalSignature", ethers.hexlify(hashedData));
-  console.log("rs", ethers.hexlify(rs[0]), ethers.hexlify(rs[1]));
-  console.log("pubkey xy", publicKeys); */
   return await passkeyValidator.rawVerify(hashedData, rs, publicKeys);
 }
 
diff --git a/packages/contracts/test/SessionKeyTest.ts b/packages/contracts/test/SessionKeyTest.ts
index 9290a852..9463744d 100644
--- a/packages/contracts/test/SessionKeyTest.ts
+++ b/packages/contracts/test/SessionKeyTest.ts
@@ -311,7 +311,6 @@ describe("SessionKeyModule tests", function () {
       await tester.sendTxSuccess({
         to: sessionTarget,
         value: parseEther("0.01"),
-        // gasLimit: 10_000_000n,
       });
       expect(await provider.getBalance(sessionTarget))
         .to.equal(parseEther("0.01"), "session target should have received the funds");
diff --git a/packages/sdk/prepare-package.mjs b/packages/sdk/prepare-package.mjs
index e42bb9ce..9afa3e29 100644
--- a/packages/sdk/prepare-package.mjs
+++ b/packages/sdk/prepare-package.mjs
@@ -1,20 +1,16 @@
 import { promises as fs } from "fs";
 import path from "path";
 
-// Define the path to the package.json
-const packageJsonPath = path.resolve("./package.json");
-console.log(packageJsonPath);
-
-// Get the version from environment variables
 const version = process.env.INPUT_VERSION;
 if (!version) {
   console.error("Error: INPUT_VERSION is required.");
   process.exit(1);
 }
 
+const packageJsonPath = path.resolve("./package.json");
+
 async function preparePackageJson() {
   try {
-    // Read the existing package.json
     const packageJsonData = await fs.readFile(packageJsonPath, "utf8");
     const packageJson = JSON.parse(packageJsonData);
 
diff --git a/packages/sdk/src/client-auth-server/Signer.ts b/packages/sdk/src/client-auth-server/Signer.ts
index 2cff6f43..d0cd9e23 100644
--- a/packages/sdk/src/client-auth-server/Signer.ts
+++ b/packages/sdk/src/client-auth-server/Signer.ts
@@ -20,6 +20,7 @@ type Account = {
 interface SignerInterface {
   accounts: Address[];
   chain: Chain;
+  getClient(parameters?: { chainId?: number }): ZksyncSsoSessionClient;
   handshake(): Promise<Address[]>;
   request<TMethod extends Method>(request: RequestArguments<TMethod>): Promise<ExtractReturnType<TMethod>>;
   disconnect: () => Promise<void>;
@@ -83,6 +84,15 @@ export class Signer implements SignerInterface {
     }
   }
 
+  getClient(parameters?: { chainId?: number }) {
+    const chainId = parameters?.chainId || this.chain.id;
+    const chain = this.chains.find((e) => e.id === chainId);
+    if (!chain) throw new Error(`Chain with id ${chainId} is not supported`);
+
+    if (!this.walletClient) throw new Error("Wallet client is not created");
+    return this.walletClient;
+  }
+
   private get account(): Account | null {
     const account = this._account.get();
     if (!account) return null;
@@ -199,7 +209,6 @@ export class Signer implements SignerInterface {
       case "eth_estimateGas": {
         if (!this.walletClient || !this.session) return undefined;
         const params = request.params as ExtractParams<"eth_estimateGas">;
-        console.log("eth_estimateGas", params);
         const res = await this.walletClient.request({ method: request.method, params: params });
         return res as ExtractReturnType<TMethod>;
       }
@@ -207,7 +216,6 @@ export class Signer implements SignerInterface {
         if (!this.walletClient || !this.session) return undefined;
         const params = request.params as ExtractParams<"eth_sendTransaction">;
         const transactionRequest = params[0];
-        console.log("eth_sendTransaction", transactionRequest);
         const res = await this.walletClient.sendTransaction(transactionRequest as unknown as SendTransactionParameters);
         return res as ExtractReturnType<TMethod>;
       }
diff --git a/packages/sdk/src/client-auth-server/WalletProvider.ts b/packages/sdk/src/client-auth-server/WalletProvider.ts
index a4214e45..3af560ee 100644
--- a/packages/sdk/src/client-auth-server/WalletProvider.ts
+++ b/packages/sdk/src/client-auth-server/WalletProvider.ts
@@ -52,6 +52,10 @@ export class WalletProvider extends EventEmitter implements ProviderInterface {
     return this.signer.accounts.length > 0;
   }
 
+  public getClient(parameters?: { chainId?: number }) {
+    return this.signer.getClient(parameters);
+  }
+
   public async request<M extends Method>(request: RequestArguments<M>): Promise<ExtractReturnType<M>> {
     try {
       switch (request.method) {
diff --git a/packages/sdk/src/client-auth-server/interface.ts b/packages/sdk/src/client-auth-server/interface.ts
index 3b3c95fe..b96973f5 100644
--- a/packages/sdk/src/client-auth-server/interface.ts
+++ b/packages/sdk/src/client-auth-server/interface.ts
@@ -1,6 +1,7 @@
 import { EventEmitter } from "eventemitter3";
 import type { RpcSchema as RpcSchemaGeneric } from "viem";
 
+import type { ZksyncSsoSessionClient } from "../client/index.js";
 import type { ExtractParams, ExtractReturnType, Method, RpcSchema } from "./rpc.js";
 
 export interface RequestArguments<M extends Method<TSchema>, TSchema extends RpcSchemaGeneric = RpcSchema> {
@@ -26,6 +27,7 @@ interface ProviderConnectInfo {
 export interface ProviderInterface extends EventEmitter {
   request<M extends Method>(args: RequestArguments<M>): Promise<ExtractReturnType<M>>;
   disconnect(): Promise<void>;
+  getClient(parameters?: { chainId?: number }): Promise<ZksyncSsoSessionClient> | ZksyncSsoSessionClient;
   on(event: "connect", listener: (info: ProviderConnectInfo) => void): this;
   on(event: "disconnect", listener: (error: ProviderRpcError) => void): this;
   on(event: "chainChanged", listener: (chainId: string) => void): this;
diff --git a/packages/sdk/src/client/actions/sendEip712Transaction.ts b/packages/sdk/src/client/actions/sendEip712Transaction.ts
index 24b36cf3..cc9422ae 100644
--- a/packages/sdk/src/client/actions/sendEip712Transaction.ts
+++ b/packages/sdk/src/client/actions/sendEip712Transaction.ts
@@ -46,15 +46,6 @@ import { isEIP712Transaction } from "../utils/isEip712Transaction.js";
  *   value: 1000000000000000000n,
  * })
  */
-const defaultParameters = [
-  "blobVersionedHashes",
-  "chainId",
-  "fees",
-  "gas",
-  "nonce",
-  "type",
-] as const;
-
 export async function sendEip712Transaction<
   chain extends ChainEIP712 | undefined,
   account extends Account | undefined,
@@ -78,41 +69,32 @@ export async function sendEip712Transaction<
   if (!account_)
     throw new Error("Account not found.");
   const account = parseAccount(account_);
-  console.log("sendEip712Transaction", parameters);
 
-  try {
-    assertEip712Request(parameters);
+  assertEip712Request(parameters);
 
-    const request = await getAction(
-      client,
-      prepareTransactionRequest,
-      "prepareTransactionRequest",
-    )({
-      account,
-      chain,
-      nonceManager: account.nonceManager,
-      parameters: [...defaultParameters, "sidecars"],
-      ...rest,
-      // gasPerPubdata: 50000n,
-      // data: "0x",
-    } as any);
+  const request = await getAction(
+    client,
+    prepareTransactionRequest,
+    "prepareTransactionRequest",
+  )({
+    account,
+    chain,
+    nonceManager: account.nonceManager,
+    ...rest,
+  } as any);
 
-    const serializer = chain?.serializers?.transaction;
-    const serializedTransaction = (await account.signTransaction!(request, {
-      serializer,
-    })) as Hash;
+  const serializer = chain?.serializers?.transaction;
+  const serializedTransaction = (await account.signTransaction!(request, {
+    serializer,
+  })) as Hash;
 
-    return await getAction(
-      client,
-      sendRawTransaction,
-      "sendRawTransaction",
-    )({
-      serializedTransaction,
-    });
-  } catch (err) {
-    console.error("sendeip712transaction error");
-    throw err;
-  }
+  return await getAction(
+    client,
+    sendRawTransaction,
+    "sendRawTransaction",
+  )({
+    serializedTransaction,
+  });
 }
 
 /**
diff --git a/packages/sdk/src/client/decorators/publicActionsRewrite.ts b/packages/sdk/src/client/decorators/publicActionsRewrite.ts
index 6751b694..fd842727 100644
--- a/packages/sdk/src/client/decorators/publicActionsRewrite.ts
+++ b/packages/sdk/src/client/decorators/publicActionsRewrite.ts
@@ -14,7 +14,6 @@ export function publicActionsRewrite<
 ): Pick<PublicActions<transport, chain, account>, "estimateContractGas" | "estimateGas" | "prepareTransactionRequest"> {
   return {
     prepareTransactionRequest: async (args) => {
-      console.log("prepareTransactionRequest", args);
       if (!("customSignature" in args)) {
         (args as any).customSignature = signSessionTransaction({
           sessionKeySignedHash: emptySignature,
@@ -22,19 +21,13 @@ export function publicActionsRewrite<
           sessionConfig: client.sessionConfig,
         });
       }
-      console.log("Initial args", args);
-      const request = await prepareTransactionRequest(client, args as any) as any;
-      /* const request = await prepareTransactionRequest(client, {
-        chainId: client.chain.id,
-        parameters: ["gas", "nonce", "fees"],
+      const request = await prepareTransactionRequest(client, {
         ...args,
         type: "eip712",
-      } as any) as any; */
-      console.log("After prepare", request);
+      } as any) as any;
       return request;
     },
     estimateContractGas: (args) => {
-      console.log("estimateContractGas", args);
       if (!("customSignature" in args)) {
         (args as any).customSignature = signSessionTransaction({
           sessionKeySignedHash: emptySignature,
@@ -45,7 +38,6 @@ export function publicActionsRewrite<
       return estimateContractGas(client, args as any);
     },
     estimateGas: async (args) => {
-      console.log("estimateGas", args);
       if (!("customSignature" in args)) {
         (args as any).customSignature = signSessionTransaction({
           sessionKeySignedHash: emptySignature,
@@ -54,7 +46,6 @@ export function publicActionsRewrite<
         });
       }
       const estimated = await estimateGas(client, args);
-      console.log("Estimated", estimated);
       return estimated;
     },
   };
diff --git a/packages/sdk/src/client/decorators/session_wallet.ts b/packages/sdk/src/client/decorators/session_wallet.ts
index 503c0e7f..5758d0b1 100644
--- a/packages/sdk/src/client/decorators/session_wallet.ts
+++ b/packages/sdk/src/client/decorators/session_wallet.ts
@@ -1,10 +1,9 @@
-import { /* decodeFunctionData, erc20Abi, getAddress, */ type Account, type Chain, type Transport, type WalletActions } from "viem";
+import { type Account, bytesToHex, type Chain, formatTransaction, type Transport, type WalletActions } from "viem";
 import { deployContract, getAddresses, getChainId, sendRawTransaction, signMessage, signTypedData, writeContract } from "viem/actions";
-import { getGeneralPaymasterInput, signTransaction } from "viem/zksync";
+import { signTransaction, type ZksyncEip712Meta } from "viem/zksync";
 
 import { sendEip712Transaction } from "../actions/sendEip712Transaction.js";
 import type { ClientWithZksyncSsoSessionData } from "../clients/session.js";
-/* import { getTokenSpendLimit } from '../actions/session.js'; */
 
 export type ZksyncSsoWalletActions<chain extends Chain, account extends Account> = Omit<
   WalletActions<chain, account>, "addChain" | "getPermissions" | "requestAddresses" | "requestPermissions" | "switchChain" | "watchAsset" | "prepareTransactionRequest"
@@ -21,21 +20,26 @@ export function zksyncSsoWalletActions<
     getChainId: () => getChainId(client),
     sendRawTransaction: (args) => sendRawTransaction(client, args),
     sendTransaction: async (args) => {
-      console.log("sendTransaction", args);
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const unformattedTx: any = Object.assign({}, args);
+
+      if ("eip712Meta" in unformattedTx) {
+        const eip712Meta = unformattedTx.eip712Meta as ZksyncEip712Meta;
+        unformattedTx.gasPerPubdata = eip712Meta.gasPerPubdata ? BigInt(eip712Meta.gasPerPubdata) : undefined;
+        unformattedTx.factoryDeps = eip712Meta.factoryDeps;
+        unformattedTx.customSignature = eip712Meta.customSignature;
+        unformattedTx.paymaster = eip712Meta.paymasterParams?.paymaster;
+        unformattedTx.paymasterInput = eip712Meta.paymasterParams?.paymasterInput ? bytesToHex(new Uint8Array(eip712Meta.paymasterParams?.paymasterInput)) : undefined;
+        delete unformattedTx.eip712Meta;
+      }
+
+      const formatters = client.chain?.formatters;
+      const format = formatters?.transaction?.format || formatTransaction;
 
-      const tx: any = {
-        ...(client.chain.formatters?.transaction?.format(args) || args),
+      const tx = {
+        ...format(unformattedTx),
         type: "eip712",
       };
-      if (tx.eip712Meta) {
-        const transaction = {
-          ...tx,
-          paymaster: tx.eip712Meta.paymasterParams.paymaster,
-          // TODO: Find permanent fix as this only works for general paymasters with no input
-          paymasterInput: getGeneralPaymasterInput({ innerInput: "0x" }),
-        };
-        return await sendEip712Transaction(client, transaction);
-      }
 
       return await sendEip712Transaction(client, tx);
     },
diff --git a/packages/sdk/src/client/smart-account.ts b/packages/sdk/src/client/smart-account.ts
index ca300920..acb33ed1 100644
--- a/packages/sdk/src/client/smart-account.ts
+++ b/packages/sdk/src/client/smart-account.ts
@@ -37,12 +37,10 @@ export function toSmartAccount(
       });
     },
     async signTransaction(transaction) {
-      console.log("signTransaction", transaction);
       const signableTransaction = {
         ...transaction,
         from: this.address!,
         type: "eip712",
-        // gas: 375_534n,
       } as ZksyncTransactionSerializableEIP712;
 
       const eip712DomainAndMessage = getEip712Domain(signableTransaction);
diff --git a/packages/sdk/src/connector/index.ts b/packages/sdk/src/connector/index.ts
index f3b29c30..450d618d 100644
--- a/packages/sdk/src/connector/index.ts
+++ b/packages/sdk/src/connector/index.ts
@@ -117,6 +117,10 @@ export const zksyncSsoConnector = (parameters: ZksyncSsoConnectorOptions) => {
       if (!chainId) return config.chains[0].id;
       return Number(chainId);
     },
+    async getClient(parameters) {
+      if (!walletProvider) throw new Error("Wallet provider not initialized");
+      return walletProvider.getClient(parameters);
+    },
     async getProvider() {
       if (!walletProvider) {
         walletProvider = new WalletProvider({

From cece0c85fa7f8b22a1b7022f11701a55f2941fbb Mon Sep 17 00:00:00 2001
From: Jack Hamer <jackhamer0990@gmail.com>
Date: Wed, 20 Nov 2024 17:08:12 +0200
Subject: [PATCH 41/42] fix: copy readme from root during deployment

---
 packages/sdk/.gitignore          |  3 ++-
 packages/sdk/prepare-package.mjs | 11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/sdk/.gitignore b/packages/sdk/.gitignore
index aa66385e..523ba8ed 100644
--- a/packages/sdk/.gitignore
+++ b/packages/sdk/.gitignore
@@ -2,4 +2,5 @@ dist
 
 node_modules
 tsconfig*.tsbuildinfo
-.DS_Store
\ No newline at end of file
+.DS_Store
+README.md
\ No newline at end of file
diff --git a/packages/sdk/prepare-package.mjs b/packages/sdk/prepare-package.mjs
index 9afa3e29..7e65f632 100644
--- a/packages/sdk/prepare-package.mjs
+++ b/packages/sdk/prepare-package.mjs
@@ -8,6 +8,7 @@ if (!version) {
 }
 
 const packageJsonPath = path.resolve("./package.json");
+const readmePath = path.resolve("../../README.md"); // copy readme into current path
 
 async function preparePackageJson() {
   try {
@@ -32,4 +33,14 @@ async function preparePackageJson() {
   }
 }
 
+async function copyReadme() {
+  try {
+    await fs.copyFile(readmePath, path.resolve("./README.md"));
+  } catch (error) {
+    console.error("Error copying README.md:", error);
+    process.exit(1);
+  }
+}
+
 preparePackageJson();
+copyReadme();

From ae1a19d02757011d2a15ad6904e4ae4cbb601b04 Mon Sep 17 00:00:00 2001
From: Jack Hamer <jackhamer0990@gmail.com>
Date: Wed, 20 Nov 2024 17:39:09 +0200
Subject: [PATCH 42/42] fix: add separate readme for sdk

---
 packages/sdk/.gitignore          |   3 +-
 packages/sdk/README.md           | 108 ++++++++++++++++++++++++++++++-
 packages/sdk/prepare-package.mjs |  11 ----
 3 files changed, 107 insertions(+), 15 deletions(-)

diff --git a/packages/sdk/.gitignore b/packages/sdk/.gitignore
index 523ba8ed..aa66385e 100644
--- a/packages/sdk/.gitignore
+++ b/packages/sdk/.gitignore
@@ -2,5 +2,4 @@ dist
 
 node_modules
 tsconfig*.tsbuildinfo
-.DS_Store
-README.md
\ No newline at end of file
+.DS_Store
\ No newline at end of file
diff --git a/packages/sdk/README.md b/packages/sdk/README.md
index 247dada2..a9b8b174 100644
--- a/packages/sdk/README.md
+++ b/packages/sdk/README.md
@@ -1,3 +1,107 @@
-# zksync-sso
+# zksync-sso SDK
 
-ZKsync SSO SDK
+[![License](https://img.shields.io/badge/license-MIT-blue)](LICENSE-MIT)
+[![CI](https://github.com/matter-labs/zksync-account-sdk/actions/workflows/ci.yml/badge.svg)](https://github.com/matter-labs/zksync-account-sdk/actions/workflows/ci.yml)
+
+A user & developer friendly modular smart account implementation on ZKsync;
+simplifying user authentication, session management, and transaction processing.
+
+## Features and Goals
+
+<!-- prettier-ignore -->
+> [!CAUTION]
+> ZKsync SSO is under active development and is not yet feature
+> complete. Use it to improve your development applications and tooling. Please
+> do not use it in production environments.
+
+- 🧩 Modular smart accounts based on
+  [ERC-7579](https://eips.ethereum.org/EIPS/eip-7579#modules)
+- 🔑 Passkey authentication (no seed phrases)
+- ⏰ Sessions w/ easy configuration and management
+- 💰 Integrated paymaster support
+- ❤️‍🩹 Account recovery _(Coming Soon)_
+- 💻 Simple SDKs : JavaScript, iOS/Android _(Coming Soon)_
+- 🤝 Open-source authentication server
+- 🎓 Examples to get started quickly
+
+## Getting started
+
+Install the ZKsync SSO SDK package:
+
+```sh
+npm i zksync-sso
+```
+
+Add ZKsync SSO connector to your app (using `wagmi`):
+
+```ts
+import { zksyncSepoliaTestnet } from "viem/chains";
+import { createConfig, connect } from "@wagmi/core";
+import { zksyncSsoConnector } from "zksync-sso/connector";
+
+const ssoConnector = zksyncSsoConnector({
+  // Optional session configuration,
+  // if omitted user will have to sign every transaction via Auth Server
+  session: {
+    // Allow up to 0.1 ETH to be spend in gas fees
+    feeLimit: parseEther("0.1"),
+
+    transfers: [
+      // Allow ETH transfers of up to 0.1 ETH to specific address
+      {
+        to: "0x188bd99cd7D4d78d4E605Aeea12C17B32CC3135A",
+        valueLimit: parseEther("0.1"),
+      },
+
+      // Allow ETH transfers to specific address with a limit of 0.1 ETH per hour
+      // until the session expires
+      {
+        to: "0x188bd99cd7D4d78d4E605Aeea12C17B32CC3135A",
+        valueLimit: {
+            limit: parseEther("0.1"),
+            period: BigInt(60 * 60), // 1 hour in seconds
+        },
+      },
+    ],
+
+    // Allow calling specific smart contracts (e.g. ERC20 transfer):
+    contractCalls: [
+      {
+        address: "0xa1cf087DB965Ab02Fb3CFaCe1f5c63935815f044",
+        function: "transfer(address,uint256)",
+
+        // Optional call constraints (unconstrained otherwise):
+        constraints: [
+
+          // Only allow transfers to this address
+          {
+            index: 0,
+            condition: "Equal",
+            refValue: pad("0x6cC8cf7f6b488C58AA909B77E6e65c631c204784"),
+          },
+
+          // Transfer up to 0.2 tokens
+          {
+            index: 1,
+            limit: parseUnits("0.2", TOKEN.decimals), // Unlimited if omitted
+          },
+        ],
+      },
+    ],
+  },
+});
+
+const wagmiConfig = createConfig({
+   connectors: [ssoConnector],
+   ..., // your wagmi config https://wagmi.sh/core/api/createConfig
+});
+
+const connectWithSSO = () => {
+   connect(wagmiConfig, {
+      connector: ssoConnector,
+      chainId: zksyncSepoliaTestnet.id, // or another chain id that has SSO support
+   });
+};
+```
+
+[Find more information here in our docs.](https://docs.zksync.io/build/zksync-sso)
diff --git a/packages/sdk/prepare-package.mjs b/packages/sdk/prepare-package.mjs
index 7e65f632..9afa3e29 100644
--- a/packages/sdk/prepare-package.mjs
+++ b/packages/sdk/prepare-package.mjs
@@ -8,7 +8,6 @@ if (!version) {
 }
 
 const packageJsonPath = path.resolve("./package.json");
-const readmePath = path.resolve("../../README.md"); // copy readme into current path
 
 async function preparePackageJson() {
   try {
@@ -33,14 +32,4 @@ async function preparePackageJson() {
   }
 }
 
-async function copyReadme() {
-  try {
-    await fs.copyFile(readmePath, path.resolve("./README.md"));
-  } catch (error) {
-    console.error("Error copying README.md:", error);
-    process.exit(1);
-  }
-}
-
 preparePackageJson();
-copyReadme();