fix: address code comments

Author: cpb8010

examples/demo-app/pages/index.vue

@@ -168,8 +168,10 @@ const sessionConfig = {
 const buildConnector = (mode: "regular" | "session" | "paymaster" | "session-paymaster") => {
   const baseConfig: Parameters<typeof zksyncSsoConnector>[0] = {
     authServerUrl: "http://localhost:3002/confirm",
+    // Add unique timestamp to ensure each connector is truly fresh
+    // This prevents Wagmi from reusing cached connector instances
     connectorMetadata: {
-      id: `zksync-sso-${mode}`,
+      id: `zksync-sso-${mode}-${Date.now()}`,
       name: "ZKsync",
       icon: "https://zksync.io/favicon.ico",
       type: "zksync-sso",
@@ -193,12 +195,7 @@ const publicClient = createPublicClient({
 });
 const wagmiConfig = createConfig({
   chains: [chain],
-  connectors: [
-    buildConnector("regular"),
-    buildConnector("session"),
-    buildConnector("paymaster"),
-    buildConnector("session-paymaster"),
-  ],
+  connectors: [buildConnector("regular")],
   transports: {
     [chain.id]: http(),
   },
@@ -283,21 +280,13 @@ watch(address, async () => {
 const connectWallet = async (mode: "regular" | "session" | "paymaster" | "session-paymaster") => {
   try {
     errorMessage.value = "";
+    const connector = buildConnector(mode);
 
     if ((mode === "paymaster" || mode === "session-paymaster") && !testPaymasterAddress) {
       errorMessage.value = "Paymaster address is not configured.";
       return;
     }
 
-    // Find the pre-configured connector for this mode by ID
-    const connectorId = `zksync-sso-${mode}`;
-    const connector = wagmiConfig.connectors.find((c) => c.id === connectorId);
-
-    if (!connector) {
-      errorMessage.value = `Connector for mode "${mode}" not found.`;
-      return;
-    }
-
     // Track which mode was used for connection
     connectionMode.value = mode;
 

examples/demo-app/tests/create-account.spec.ts

@@ -52,9 +52,6 @@ test.beforeEach(async ({ page }) => {
   await expect(page.getByText("ZKsync SSO Demo")).toBeVisible();
 });
 
-// Session transactions with eth_sendTransaction don't work on Anvil (standard EVM)
-// because smart accounts need ERC-4337 bundler, but sessions use native tx signing
-// This works fine on ZKsync Era but not on the Anvil testnet used in CI
 test.skip("Create account with session and send ETH", async ({ page }) => {
   // Step 1: regular connect to create account with passkey
   await page.getByRole("button", { name: "Connect", exact: true }).click();
@@ -253,12 +250,7 @@ test("Create passkey account and send ETH", async ({ page }) => {
     .toBeGreaterThan(endBalance + 0.1);
 });
 
-// TODO: Paymaster for non-session transactions requires additional implementation
-// Currently, paymaster only works for session transactions because they use the bundler.
-// Non-session transactions use auth-server popup flow which doesn't convert to UserOperations.
-// To fix: Either convert non-session transactions to UserOperations, or implement paymaster
-// support in the auth-server transaction flow.
-test.skip("Create passkey account and send ETH with paymaster", async ({ page }) => {
+test("Create passkey account and send ETH with paymaster", async ({ page }) => {
   // Create account with paymaster connect (paymaster sponsors all gas)
   await page.getByRole("button", { name: "Connect (Paymaster)", exact: true }).click();
 
@@ -338,20 +330,9 @@ test.skip("Create passkey account and send ETH with paymaster", async ({ page })
 
   // CRITICAL: Verify that fees are shown as sponsored (paymaster covers them)
   await expect(popup.getByText("Fees")).toBeVisible();
-
-  // Check if sponsored text is visible (give it some time to appear)
   const sponsoredText = popup.getByText("0 ETH (Sponsored)");
-  const hasSponsoredText = await sponsoredText.isVisible().catch(() => false);
-
-  if (!hasSponsoredText) {
-    // Debug: log what fee text is actually showing
-    const feeSection = await popup.locator("text=Fees").locator("..").textContent();
-    console.log("Fee section content:", feeSection);
-    console.log("⚠️ Warning: Expected '0 ETH (Sponsored)' but not found. Continuing test...");
-    // For now, don't fail the test - just warn. The transaction should still work.
-  } else {
-    console.log("✓ Auth server shows fees are sponsored by paymaster");
-  }
+  await expect(sponsoredText, "Paymaster should cover fees - expecting '0 ETH (Sponsored)' to be shown").toBeVisible();
+  console.log("✓ Auth server shows fees are sponsored by paymaster");
 
   // Confirm the transfer
   await popup.getByTestId("confirm").click();

packages/auth-server/components/views/confirmation/Send.vue

@@ -254,21 +254,15 @@ const confirmTransaction = async () => {
       throw new Error("Transaction parameters are not available");
     }
     const usePaymasterFlag = !!requestPaymaster.value;
-    console.log("[Send.vue] requestPaymaster.value:", requestPaymaster.value);
-    console.log("[Send.vue] usePaymaster flag:", usePaymasterFlag);
-    // Extract address - handle both string and PaymasterConfig object
     const paymasterAddr = typeof requestPaymaster.value === "string"
       ? requestPaymaster.value
       : requestPaymaster.value?.address;
-    console.log("[Send.vue] passing paymasterAddress:", paymasterAddr);
     const client = getClient({
       chainId: requestChain.value!.id,
       usePaymaster: usePaymasterFlag,
       paymasterAddress: paymasterAddr,
     });
-    console.log("[Send.vue] client created, sending transaction...");
     const transactionHash = await client.sendTransaction(transactionParams.value);
-    console.log("[Send.vue] transaction hash:", transactionHash);
     return {
       result: transactionHash,
     };

packages/auth-server/stores/client.ts

@@ -140,12 +140,7 @@ export const useClientStore = defineStore("client", () => {
     const contracts = contractsByChain[chainId];
     const bundlerClient = getBundlerClient({ chainId });
 
-    console.log("[client.ts getClient] usePaymaster:", usePaymaster);
-    console.log("[client.ts getClient] passed paymasterAddress:", paymasterAddress);
-    console.log("[client.ts getClient] contracts.testPaymaster:", contracts.testPaymaster);
-    // Use passed address, fallback to contracts.testPaymaster if usePaymaster is true
     const finalPaymasterAddress = paymasterAddress ?? (usePaymaster ? contracts.testPaymaster : undefined);
-    console.log("[client.ts getClient] final paymaster address being passed:", finalPaymasterAddress);
 
     const client = createPasskeyClient({
       account: {

packages/auth-server/stores/local-node.json

@@ -2,15 +2,15 @@
   "rpcUrl": "http://localhost:8545",
   "chainId": 1337,
   "deployer": "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720",
-  "eoaValidator": "0x403CFc9A133a54B9CDC2E070BB811b8a68ff1250",
-  "sessionValidator": "0x9bbaCAB8739Fa0041A6906b51FE46E90756dA455",
-  "webauthnValidator": "0xC025Ea0F10dcE91d14a3473fc60ff1F23BCe8c19",
-  "guardianExecutor": "0x1a317D3c55D729a83D7d8F1E18690AD12A655515",
-  "accountImplementation": "0x37faAe901e81d7ae49fc914E66cCD8dfA6543C4A",
-  "beacon": "0x9AE4d06a96cac1Fd90119ef4126E69eE8cdBBc6e",
-  "factory": "0x5DeeB04262d1f402a5b1D50eC537b3657ea2b18D",
-  "testPaymaster": "0x6cFA08b105a8674B3249CaA3B4405783A0D8a58B",
-  "mockPaymaster": "0x6cFA08b105a8674B3249CaA3B4405783A0D8a58B",
+  "eoaValidator": "0x7079ade5d4C71aE7868E6AC8553148FfC3D8d660",
+  "sessionValidator": "0xE619369f26285FEd402bd0c3526aEb1faf2BE2C0",
+  "webauthnValidator": "0x85ed36BD17265a4eb2f6d87FAd3E6277066986f0",
+  "guardianExecutor": "0xb3b3496CC339d80b2182a3985FeF5EBE60bc896C",
+  "accountImplementation": "0xddfa09697bCe57712B5365ff573c3e6b3C8FFDDb",
+  "beacon": "0x197072f17a5e1A35C1909999e6f3cFEDe5A42BB8",
+  "factory": "0xF9e4C9Cfec57860d82e6B41Cd50DEF2b3826D5CF",
+  "testPaymaster": "0xf8C803b1378C96557381f43F86f77D72D79BeE95",
+  "mockPaymaster": "0xf8C803b1378C96557381f43F86f77D72D79BeE95",
   "entryPoint": "0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108",
   "bundlerUrl": "http://localhost:4337"
 }

packages/sdk-4337/src/client/common/smart-account-client-actions.ts

@@ -188,8 +188,6 @@ export function smartAccountClientActions<
             }
           : {};
 
-      console.log("[smart-account-client-actions.ts sendTransaction] About to call bundler.sendUserOperation with paymaster params:", paymasterParams);
-
       // Send user operation through bundler
       const userOpHash = await config.bundler.sendUserOperation({
         account,

packages/sdk-4337/src/client/passkey/account.ts

@@ -146,15 +146,6 @@ export async function toPasskeySmartAccount<
       const paymasterVerificationGasLimit = (params as any).paymasterVerificationGasLimit as bigint | undefined;
       const paymasterPostOpGasLimit = (params as any).paymasterPostOpGasLimit as bigint | undefined;
 
-      console.log("[passkey/account.ts] signUserOperation called with:", {
-        hasPaymaster,
-        paymaster,
-        paymasterData,
-        paymasterVerificationGasLimit: paymasterVerificationGasLimit?.toString(),
-        paymasterPostOpGasLimit: paymasterPostOpGasLimit?.toString(),
-        nonce: params.nonce?.toString(),
-      });
-
       // Compute user operation hash for v0.8
       // IMPORTANT: For v0.8, DO NOT use paymasterAndData - use the separate fields directly
       const userOp: any = {
@@ -170,7 +161,6 @@ export async function toPasskeySmartAccount<
         signature: "0x",
       };
 
-      // Add paymaster fields if present (v0.8 uses separate fields, not paymasterAndData)
       if (hasPaymaster && paymaster) {
         userOp.paymaster = paymaster;
         userOp.paymasterVerificationGasLimit = paymasterVerificationGasLimit;
@@ -185,9 +175,6 @@ export async function toPasskeySmartAccount<
         userOperation: userOp,
       } as any) as Hex;
 
-      console.log("[passkey/account.ts] Computed UserOp hash:", userOpHash);
-      console.log("[passkey/account.ts] Hash includes paymaster fields:", hasPaymaster);
-
       // Sign with WebAuthn (browser API) and get complete signature
       // signWithPasskey handles:
       // 1. Converting hash to WebAuthn challenge
@@ -203,9 +190,6 @@ export async function toPasskeySmartAccount<
         origin,
       });
 
-      console.log("[passkey/account.ts] Generated signature:", signature);
-      console.log("[passkey/account.ts] Signature includes paymaster:", hasPaymaster);
-
       return signature;
     },
   });

packages/sdk-4337/src/connector/index.ts

@@ -276,7 +276,6 @@ export const getConnectedSsoSessionClient = async<
   config: config,
   parameters: GetConnectorClientParameters<config, chainId> = {},
 ): Promise<GetConnectedSsoClientReturnType<config, chainId>> => {
-  // Get the current connection
   const connections = getConnections(config);
   const connection = connections.find((c) => c.accounts.length > 0);
 
@@ -289,7 +288,6 @@ export const getConnectedSsoSessionClient = async<
     throw new Error("Connector does not support getClient method. Make sure you're using the ZKsync SSO connector.");
   }
 
-  // Use the custom _getClient method to get our custom client
   const client = await (connection.connector as any)._getClient(parameters);
 
   if (!isSsoSessionClient(client)) {