fix: cleanup tests

Author: cpb8010

.github/workflows/ci.yml

@@ -190,7 +190,6 @@ jobs:
 
       # Deploy MSA Factory and infrastructure (nft-quest will read from contracts-anvil.json)
       - name: Deploy Demo-App ERC-4337 contracts
-        continue-on-error: true
         run: pnpm nx deploy-msa-factory demo-app
 
       # Start Alto bundler with CORS proxy

examples/nft-quest/public/contracts.json

@@ -3,12 +3,12 @@
   "chainId": 1337,
   "entryPoint": "0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108",
   "bundlerUrl": "http://localhost:4337",
-  "factory": "0x0356cA3d0350858BCac4De0FC1dEa3Bc6e7c3e3a",
-  "eoaValidator": "0xDd72e46653662b0118A2743574467FAA582D633e",
-  "sessionValidator": "0xCaec08bfd740F1Ae4300b3ab62B757F99222244b",
-  "webauthnValidator": "0xd71301c72D03b483F74BA569ff1132af81079858",
-  "guardianExecutor": "0xD4c76bC6306657FE415Ee6B09Ea61cFA50573848",
-  "testPaymaster": "0x206C056fE7Bddb5cC54CcB0331bcf2058b2D5BA6",
-  "mockPaymaster": "0x206C056fE7Bddb5cC54CcB0331bcf2058b2D5BA6",
-  "nftContract": "0xFF06F4b2ef9F9D9B96238397Db82d5C445B5244f"
+  "factory": "0xa7146dB81e9E0f3919DA7fbeC4e23b019d2cfc4f",
+  "eoaValidator": "0x2E4d936CEf58a55E0C3aB5C51113188912AF35D7",
+  "sessionValidator": "0x8F40F91A9b129de806589161afAD0632992383E7",
+  "webauthnValidator": "0x8590D0dfFBc86BC19D059474385618bEd01E36C0",
+  "guardianExecutor": "0xaEb7C09a35f1FD63F510Dce81BffAF9FEEAcd507",
+  "testPaymaster": "0xD4ad8929d0976E8469C069ef9798BE7E5C1d53F5",
+  "mockPaymaster": "0xD4ad8929d0976E8469C069ef9798BE7E5C1d53F5",
+  "nftContract": "0xeB7a64e12c1811f0D3DBB0730c76d2708e179ae0"
 }

examples/nft-quest/tests/main.spec.ts

@@ -89,7 +89,11 @@ test("Create account, session key, and mint NFT", async ({ page }) => {
     newCredential = credentialAdded.credential;
   });
 
-  // Add session
+  // Step 1: Create account
+  await expect(popup.getByText("Account Creation")).toBeVisible();
+  await popup.getByTestId("connect").click();
+
+  // Step 2: Authorize session (second passkey approval)
   await expect(popup.getByText("Authorize ZK NFT Quest")).toBeVisible();
   await expect(popup.getByText("Permissions")).toBeVisible();
   await popup.getByTestId("connect").click();

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

@@ -47,9 +47,43 @@
       class="mt-1"
     />
 
-    <!-- For new accounts, show a simple message -->
+    <!-- For new accounts creating session in two steps -->
     <div
-      v-if="!isLoggedIn"
+      v-if="accountCreated && hasSessionParams"
+      class="space-y-2 mt-2"
+    >
+      <div class="bg-neutral-975 rounded-[28px]">
+        <div class="px-5 py-2 text-neutral-400">
+          Permissions
+        </div>
+        <CommonLine class="text-neutral-100">
+          <div class="divide-y divide-neutral-800">
+            <div class="flex items-center gap-2 py-3 px-3">
+              <IconsFingerprint class="w-7 h-7" />
+              <div>Act on your behalf</div>
+            </div>
+            <div class="flex items-center gap-2 py-3 px-3">
+              <IconsClock class="w-7 h-7" />
+              <div>{{ sessionExpiry }}</div>
+            </div>
+          </div>
+        </CommonLine>
+      </div>
+    </div>
+    <SessionTokens
+      v-if="accountCreated && hasSessionParams"
+      :onchain-actions-count="onchainActionsCount"
+      :fetch-tokens-error="fetchTokensError"
+      :tokens-loading="tokensLoading"
+      :spend-limit-tokens="spendLimitTokens"
+      :has-unlimited-spend="hasUnlimitedSpend"
+      :total-usd="totalUsd"
+      class="mt-1"
+    />
+
+    <!-- For new accounts without session yet, show a simple message -->
+    <div
+      v-if="!isLoggedIn && !accountCreated"
       class="space-y-2 mt-2"
     >
       <div class="bg-neutral-975 rounded-[28px]">
@@ -59,7 +93,9 @@
         <CommonLine class="text-neutral-100">
           <div class="py-3 px-3">
             <p class="text-sm text-neutral-300">
-              A new smart account will be created for you. You can add spending permissions later when needed.
+              A new smart account will be created for you.
+              <span v-if="hasSessionParams">After that, you'll set up spending permissions.</span>
+              <span v-else>You can add spending permissions later when needed.</span>
             </p>
           </div>
         </CommonLine>
@@ -168,12 +204,18 @@ const props = defineProps({
 const { appMeta, appOrigin } = useAppMeta();
 const { login } = useAccountStore();
 const { isLoggedIn } = storeToRefs(useAccountStore());
-const { responseInProgress, requestChainId } = storeToRefs(useRequestsStore());
-const { createAccount } = useAccountCreate(requestChainId);
+const { responseInProgress, requestChainId, requestPaymaster } = storeToRefs(useRequestsStore());
+const { createAccount, registerInProgress: accountCreationInProgress } = useAccountCreate(requestChainId);
 const { respond, deny } = useRequestsStore();
 const { getClient } = useClientStore();
 const runtimeConfig = useRuntimeConfig();
 
+// Track if we just created an account and need to create session
+const accountCreated = ref(false);
+const hasSessionParams = computed(() => {
+  return props.sessionPreferences.contractCalls && props.sessionPreferences.contractCalls.length > 0;
+});
+
 const defaults = {
   expiresAt: BigInt(Math.floor(Date.now() / 1000) + 60 * 60 * 24), // 24 hours
   feeLimit: {
@@ -284,7 +326,7 @@ const scrollDown = () => {
     behavior: "smooth",
   });
 };
-const isButtonLoading = computed(() => !appMeta.value || responseInProgress.value || tokensLoading.value);
+const isButtonLoading = computed(() => !appMeta.value || responseInProgress.value || tokensLoading.value || accountCreationInProgress.value);
 const confirmButtonAvailable = computed(() => arrivedAtBottom.value);
 const transitionName = ref("slide-up");
 const previousConfirmAvailable = ref(confirmButtonAvailable.value);
@@ -294,36 +336,53 @@ watch(confirmButtonAvailable, (newVal, oldVal) => {
     previousConfirmAvailable.value = newVal;
   }
 });
-const mainButtonText = computed(() => isLoggedIn.value ? "Connect" : "Create");
+const mainButtonText = computed(() => {
+  if (isLoggedIn.value) return "Connect";
+  if (accountCreated.value) return "Authorize";
+  return "Create";
+});
 
 const confirmConnection = async () => {
   let response: RPCResponseMessage<ExtractReturnType<Method>>["content"];
   sessionError.value = "";
 
   try {
-    if (!isLoggedIn.value) {
-      // Just create the account - session will be created by the dapp separately
+    if (!isLoggedIn.value && !accountCreated.value) {
+      // Step 1: Create the account
       const accountData = await createAccount();
       if (!accountData) return;
+
       // Login with the new account
       login({
         address: accountData.address,
         credentialId: accountData.credentialId,
       });
 
-      // Return account info without session - dapp will create session separately
+      // If session params were provided, show session creation UI
+      if (hasSessionParams.value) {
+        accountCreated.value = true;
+        // Force a UI update before returning
+        await nextTick();
+        return; // Don't respond yet, wait for session creation
+      }
+
+      // No session params, return account info only
       response = {
         result: constructReturn({
           address: accountData.address,
           chainId: accountData.chainId,
-          // No session in response - dapp needs to create it separately
           prividiumMode: runtimeConfig.public.prividiumMode,
           prividiumProxyUrl: runtimeConfig.public.prividium?.rpcUrl || "",
         }),
       };
-    } else {
+    } else if (accountCreated.value || isLoggedIn.value) {
       // create a new session for the existing account
-      const client = getClient({ chainId: requestChainId.value });
+      // Use paymaster if provided (needed for newly created accounts with no ETH)
+      const client = getClient({
+        chainId: requestChainId.value,
+        usePaymaster: !!requestPaymaster.value,
+        paymasterAddress: requestPaymaster.value,
+      });
       const sessionKey = generatePrivateKey();
       const session = {
         sessionKey,

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

@@ -2,15 +2,15 @@
   "rpcUrl": "http://localhost:8545",
   "chainId": 1337,
   "deployer": "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720",
-  "eoaValidator": "0xDd72e46653662b0118A2743574467FAA582D633e",
-  "sessionValidator": "0xCaec08bfd740F1Ae4300b3ab62B757F99222244b",
-  "webauthnValidator": "0xd71301c72D03b483F74BA569ff1132af81079858",
-  "guardianExecutor": "0xD4c76bC6306657FE415Ee6B09Ea61cFA50573848",
-  "accountImplementation": "0xB69ae22EE1F1141Cb8Fd6d465CC0f8eB5813C615",
-  "beacon": "0x809eBD30a2357012E6cBaB8776682318568556c1",
-  "factory": "0x0356cA3d0350858BCac4De0FC1dEa3Bc6e7c3e3a",
-  "testPaymaster": "0x206C056fE7Bddb5cC54CcB0331bcf2058b2D5BA6",
-  "mockPaymaster": "0x206C056fE7Bddb5cC54CcB0331bcf2058b2D5BA6",
+  "eoaValidator": "0x2E4d936CEf58a55E0C3aB5C51113188912AF35D7",
+  "sessionValidator": "0x8F40F91A9b129de806589161afAD0632992383E7",
+  "webauthnValidator": "0x8590D0dfFBc86BC19D059474385618bEd01E36C0",
+  "guardianExecutor": "0xaEb7C09a35f1FD63F510Dce81BffAF9FEEAcd507",
+  "accountImplementation": "0x3465ee19A11F3Bbf4eB341DB943cbbF1A77Cc145",
+  "beacon": "0x7f052D5a131E90147D33573D01f406A8181A0F4d",
+  "factory": "0xa7146dB81e9E0f3919DA7fbeC4e23b019d2cfc4f",
+  "testPaymaster": "0xD4ad8929d0976E8469C069ef9798BE7E5C1d53F5",
+  "mockPaymaster": "0xD4ad8929d0976E8469C069ef9798BE7E5C1d53F5",
   "entryPoint": "0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108",
   "bundlerUrl": "http://localhost:4337"
 }

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

@@ -101,6 +101,28 @@ export function passkeyClientActions<
       const smartAccount = await toPasskeySmartAccount(config.passkeyAccount);
       const sessionSpecJSON = sessionSpecToJSON(params.sessionSpec);
       const callData = encode_create_session_call_data(sessionSpecJSON, params.proof) as unknown as `0x${string}`;
+      // Normalize paymaster config (same logic as smartAccountClientActions)
+      const normalizedPaymaster = config.paymaster
+        ? typeof config.paymaster === "string"
+          ? {
+              address: config.paymaster as Address,
+              verificationGasLimit: 500_000n,
+              postOpGasLimit: 1_000_000n,
+              data: "0x" as `0x${string}`,
+            }
+          : config.paymaster
+        : undefined;
+
+      // For v0.8 EntryPoint, pass separate paymaster fields (not packed paymasterAndData)
+      const paymasterParams = normalizedPaymaster
+        ? {
+            paymaster: normalizedPaymaster.address,
+            paymasterData: normalizedPaymaster.data ?? ("0x" as Hex),
+            paymasterVerificationGasLimit: normalizedPaymaster.verificationGasLimit ?? 500_000n,
+            paymasterPostOpGasLimit: normalizedPaymaster.postOpGasLimit ?? 1_000_000n,
+          }
+        : {};
+
       const userOpHash = await config.bundler.sendUserOperation({
         account: smartAccount,
         calls: [
@@ -110,6 +132,7 @@ export function passkeyClientActions<
             value: 0n,
           },
         ],
+        ...paymasterParams,
       });
       return userOpHash;
     },