fix: update for tests

cpb8010 · cpb8010 · commit ad06bc7e42f1 · 2025-12-05T08:18:35.000-08:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -144,10 +144,10 @@ jobs:
       - name: Install foundry
         uses: foundry-rs/foundry-toolchain@v1.5.0
 
-      # Start Anvil on port 8545 (chain-id 31337)
+      # Start Anvil on port 8545 (chain-id 1337 to match erc4337-contracts)
       - name: Start Anvil
         run: |
-          anvil --host 0.0.0.0 &
+          anvil --host 0.0.0.0 --chain-id 1337 &
           echo "Waiting for Anvil to be ready..."
           timeout 30 bash -c 'until cast client --rpc-url http://localhost:8545 > /dev/null 2>&1; do sleep 1; done'
           echo "Anvil is ready!"
@@ -173,10 +173,26 @@ jobs:
       - name: Build sdk-4337
         run: pnpm nx build sdk-4337
 
+      # Deploy ERC-4337 contracts (MSAFactory, validators, etc.) to Anvil
+      # This also generates contracts-anvil.json with the deployed addresses
+      - name: Deploy ERC-4337 contracts
+        run: pnpm nx deploy-msa-factory nft-quest
+
       # Deploy NFT contract to Anvil
       - name: Deploy NFT contract
         run: pnpm nx deploy:anvil nft-quest-contracts
 
+      # Start Alto bundler with CORS proxy for account abstraction
+      - name: Start Alto bundler with CORS proxy
+        run: |
+          pnpm run bundler:with-proxy &
+          BUNDLER_PID=$!
+          echo "BUNDLER_PID=$BUNDLER_PID" >> $GITHUB_ENV
+          echo "Waiting for bundler to be ready on port 4337..."
+          timeout 60 bash -c 'until curl -s http://localhost:4337 > /dev/null 2>&1; do sleep 1; done'
+          echo "Bundler is ready!"
+        working-directory: packages/erc4337-contracts
+
       # Run E2E tests
       - name: Install Playwright Chromium Browser
         run: pnpm exec playwright install chromium
diff --git a/examples/nft-quest/contracts-anvil.json b/examples/nft-quest/contracts-anvil.json
@@ -1,7 +1,7 @@
 {
-  "eoaValidator": "0x5FbDB2315678afecb367f032d93F642f64180aa3",
-  "webauthnValidator": "0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512",
-  "sessionValidator": "0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0",
-  "factory": "0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9",
+  "eoaValidator": "0xde612c1b1C06982551157FB53E61a123c6045DFC",
+  "webauthnValidator": "0xE854be130245223cBDD20c85f4F126996669Cf08",
+  "sessionValidator": "0x41b6892Bf7aFB4feeACDd96AAf34205124380A47",
+  "factory": "0x099961116Ba4371a2516034233177Ee3eFcdaf39",
   "bundlerUrl": "http://localhost:4337"
 }
diff --git a/examples/nft-quest/playwright.config.ts b/examples/nft-quest/playwright.config.ts
@@ -22,7 +22,7 @@ export default defineConfig({
   /* Opt out of parallel tests on CI. */
   workers: process.env.CI ? 1 : undefined,
   /* Reporter to use. See https://playwright.dev/docs/test-reporters */
-  reporter: "html",
+  reporter: [["html", { open: "never" }]],
   /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
   use: {
     /* Base URL to use in actions like `await page.goto('/')`. */
diff --git a/examples/nft-quest/project.json b/examples/nft-quest/project.json
@@ -88,6 +88,21 @@
         "command": "pnpm exec playwright install chromium"
       }
     },
+    "deploy-msa-factory": {
+      "executor": "nx:run-commands",
+      "options": {
+        "cwd": "examples/nft-quest",
+        "command": "./scripts/deploy-msa-anvil.sh"
+      },
+      "dependsOn": ["build-erc4337-contracts"]
+    },
+    "build-erc4337-contracts": {
+      "executor": "nx:run-commands",
+      "options": {
+        "cwd": "packages/erc4337-contracts",
+        "command": "forge build"
+      }
+    },
     "e2e": {
       "executor": "nx:run-commands",
       "options": {
diff --git a/examples/nft-quest/scripts/deploy-msa-anvil.sh b/examples/nft-quest/scripts/deploy-msa-anvil.sh
@@ -0,0 +1,86 @@
+#!/bin/bash
+set -ex
+
+# Get the directory where this script is located
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+# Navigate to the workspace root (3 levels up from scripts/)
+WORKSPACE_ROOT="$(cd "$SCRIPT_DIR/../../.." && pwd)"
+
+# Configuration
+DEPLOYER_ADDRESS="0xa0Ee7A142d267C1f36714E4a8F75612F20a79720"  # Anvil account #9
+RPC_URL="http://localhost:8545"
+CHAIN_ID=1337
+CONTRACTS_DIR="$WORKSPACE_ROOT/packages/erc4337-contracts"
+
+echo "🚀 Deploying MSA Factory and modules to Anvil (standard EVM)..."
+echo ""
+echo "📍 Deployer: $DEPLOYER_ADDRESS"
+echo "🌐 RPC URL: $RPC_URL"
+echo ""
+
+cd "$CONTRACTS_DIR"
+
+# Build contracts first to ensure everything is compiled
+echo "🔨 Building contracts..."
+forge build
+
+# Use pnpm deploy-test to deploy all contracts
+echo ""
+echo "📦 Deploying contracts using pnpm deploy-test..."
+DEPLOY_OUTPUT=$(pnpm deploy-test 2>&1)
+
+echo "$DEPLOY_OUTPUT"
+
+# Extract addresses from the deployment output
+EOA_VALIDATOR=$(echo "$DEPLOY_OUTPUT" | grep "EOAKeyValidator:" | awk '{print $2}')
+SESSION_VALIDATOR=$(echo "$DEPLOY_OUTPUT" | grep "SessionKeyValidator:" | awk '{print $2}')
+WEBAUTHN_VALIDATOR=$(echo "$DEPLOY_OUTPUT" | grep "WebAuthnValidator:" | awk '{print $2}')
+GUARDIAN_EXECUTOR=$(echo "$DEPLOY_OUTPUT" | grep "GuardianExecutor:" | awk '{print $2}')
+ACCOUNT_IMPL=$(echo "$DEPLOY_OUTPUT" | grep "ModularSmartAccount implementation:" | awk '{print $3}')
+BEACON=$(echo "$DEPLOY_OUTPUT" | grep "UpgradeableBeacon:" | awk '{print $2}')
+FACTORY=$(echo "$DEPLOY_OUTPUT" | grep "MSAFactory:" | awk '{print $2}')
+
+# Verify all addresses were extracted
+if [ -z "$EOA_VALIDATOR" ] || [ -z "$SESSION_VALIDATOR" ] || [ -z "$WEBAUTHN_VALIDATOR" ] || \
+   [ -z "$GUARDIAN_EXECUTOR" ] || [ -z "$ACCOUNT_IMPL" ] || [ -z "$BEACON" ] || [ -z "$FACTORY" ]; then
+  echo "❌ Failed to extract all contract addresses from deployment output"
+  echo "Please check the deployment logs above"
+  exit 1
+fi
+
+echo ""
+echo "✅ Deployment complete!"
+echo "  EOAKeyValidator: $EOA_VALIDATOR"
+echo "  SessionKeyValidator: $SESSION_VALIDATOR"
+echo "  WebAuthnValidator: $WEBAUTHN_VALIDATOR"
+echo "  GuardianExecutor: $GUARDIAN_EXECUTOR"
+echo "  ModularSmartAccount impl: $ACCOUNT_IMPL"
+echo "  UpgradeableBeacon: $BEACON"
+echo "  MSAFactory: $FACTORY"
+
+# Create contracts-anvil.json
+echo ""
+echo "💾 Creating contracts-anvil.json..."
+cd "$WORKSPACE_ROOT/examples/nft-quest"
+
+cat > contracts-anvil.json << EOF
+{
+  "eoaValidator": "$EOA_VALIDATOR",
+  "webauthnValidator": "$WEBAUTHN_VALIDATOR",
+  "sessionValidator": "$SESSION_VALIDATOR",
+  "factory": "$FACTORY",
+  "bundlerUrl": "http://localhost:4337"
+}
+EOF
+
+echo "✅ Created contracts-anvil.json"
+
+# Copy to public directory for the Nuxt app
+cp contracts-anvil.json public/contracts.json
+echo "✅ Copied to public/contracts.json"
+
+echo ""
+echo "🎉 Deployment complete!"
+echo ""
+echo "📝 Contract Addresses (Anvil/Alto):"
+cat contracts-anvil.json
diff --git a/examples/nft-quest/stores/client.ts b/examples/nft-quest/stores/client.ts
@@ -2,12 +2,13 @@ import type { Address, Hex } from "viem";
 import { createPublicClient, http } from "viem";
 import { createBundlerClient } from "viem/account-abstraction";
 import type { Chain } from "viem/chains";
-import { getGeneralPaymasterInput } from "viem/zksync";
 import { createPasskeyClient } from "zksync-sso-4337/client";
 
-// Anvil chain configuration (chain ID 31337)
+import contractsConfig from "../contracts-anvil.json";
+
+// Anvil chain configuration (chain ID 1337 to match erc4337-contracts setup)
 const anvilChain: Chain = {
-  id: 31337,
+  id: 1337,
   name: "Anvil",
   nativeCurrency: { name: "Ether", symbol: "ETH", decimals: 18 },
   rpcUrls: {
@@ -29,26 +30,13 @@ export const useClientStore = defineStore("client", () => {
 
   const getBundlerClient = () => {
     const publicClient = getPublicClient();
-    const runtimeConfig = useRuntimeConfig();
-    const paymasterAddress = runtimeConfig.public.contracts.paymaster as Address;
-    const bundlerUrl = runtimeConfig.public.bundlerUrl as string;
+    const bundlerUrl = contractsConfig.bundlerUrl;
 
     return createBundlerClient({
       client: publicClient,
       chain,
       transport: http(bundlerUrl),
-      paymaster: {
-        async getPaymasterData() {
-          return {
-            paymasterAndData: `${paymasterAddress}${getGeneralPaymasterInput({ innerInput: "0x" }).substring(2)}` as Hex,
-          };
-        },
-        async getPaymasterStubData() {
-          return {
-            paymasterAndData: `${paymasterAddress}${getGeneralPaymasterInput({ innerInput: "0x" }).substring(2)}` as Hex,
-          };
-        },
-      },
+      // EntryPoint 0.8 - no paymaster for now to simplify testing
       userOperation: {
         async estimateFeesPerGas() {
           const feesPerGas = await publicClient.estimateFeesPerGas();
@@ -67,13 +55,12 @@ export const useClientStore = defineStore("client", () => {
     if (!address.value) throw new Error("Address is not set");
     if (!credentialId.value) throw new Error("Credential ID is not set");
 
-    const runtimeConfig = useRuntimeConfig();
     const bundlerClient = getBundlerClient();
 
     const client = createPasskeyClient({
       account: {
         address: address.value,
-        validatorAddress: runtimeConfig.public.contracts.webauthnValidator as Address,
+        validatorAddress: contractsConfig.webauthnValidator as Address,
         credentialId: credentialId.value,
         rpId: window.location.hostname,
         origin: window.location.origin,
@@ -93,13 +80,12 @@ export const useClientStore = defineStore("client", () => {
     address: Address;
     credentialId: Hex;
   }) => {
-    const runtimeConfig = useRuntimeConfig();
     const bundlerClient = getBundlerClient();
 
     return createPasskeyClient({
       account: {
         address: addr,
-        validatorAddress: runtimeConfig.public.contracts.webauthnValidator as Address,
+        validatorAddress: contractsConfig.webauthnValidator as Address,
         credentialId: credId,
         rpId: window.location.hostname,
         origin: window.location.origin,
diff --git a/examples/nft-quest/stores/connector.ts b/examples/nft-quest/stores/connector.ts
@@ -1,13 +1,27 @@
 import { startRegistration } from "@simplewebauthn/browser";
 import type { Address, Hex } from "viem";
-import { concat, decodeErrorResult, encodeFunctionData } from "viem";
-import { entryPoint07Address } from "viem/account-abstraction";
-import { prepareDeploySmartAccount } from "zksync-sso-4337/client";
+import { createWalletClient, http, parseEther } from "viem";
+import { privateKeyToAccount } from "viem/accounts";
+import type { Chain } from "viem/chains";
+import { getAccountAddressFromLogs, prepareDeploySmartAccount } from "zksync-sso-4337/client";
 
 import contractsConfig from "../contracts-anvil.json";
 import { useAccountStore } from "./account";
 import { useClientStore } from "./client";
 
+// Anvil's default funded account (first account)
+const DEPLOYER_PRIVATE_KEY = "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80" as Hex;
+
+// Anvil chain configuration (chain ID 1337 to match erc4337-contracts setup)
+const anvilChain: Chain = {
+  id: 1337,
+  name: "Anvil",
+  nativeCurrency: { name: "Ether", symbol: "ETH", decimals: 18 },
+  rpcUrls: {
+    default: { http: ["http://127.0.0.1:8545"] },
+  },
+};
+
 export const useConnectorStore = defineStore("connector", () => {
   const accountStore = useAccountStore();
   const { address, isConnected } = storeToRefs(accountStore);
@@ -135,41 +149,49 @@ export const useConnectorStore = defineStore("connector", () => {
         }],
       });
 
-      const initCode = concat([transaction.to, transaction.data]);
-      const entryPoint = entryPoint07Address;
-
-      let senderAddress: Address;
-      try {
-        await publicClient.call({
-          to: entryPoint,
-          data: encodeFunctionData({
-            abi: [{
-              name: "getSenderAddress",
-              type: "function",
-              stateMutability: "view",
-              inputs: [{ name: "initCode", type: "bytes" }],
-              outputs: [],
-            }],
-            functionName: "getSenderAddress",
-            args: [initCode],
-          }),
-        });
-        throw new Error("getSenderAddress did not revert");
-      } catch (e) {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const data = (e as any).data || (e as any).cause?.data || (e as any).cause?.cause?.data;
-        if (!data) throw e;
-
-        const error = decodeErrorResult({
-          abi: [{
-            name: "SenderAddressResult",
-            type: "error",
-            inputs: [{ name: "sender", type: "address" }],
-          }],
-          data,
-        });
-        senderAddress = error.args[0];
-      }
+      // eslint-disable-next-line no-console
+      console.log("Prepared deployment transaction to factory:", transaction.to);
+
+      // Deploy the account using a funded deployer wallet
+      const deployerAccount = privateKeyToAccount(DEPLOYER_PRIVATE_KEY);
+      const walletClient = createWalletClient({
+        account: deployerAccount,
+        chain: anvilChain,
+        transport: http(),
+      });
+
+      // Send the deployment transaction
+      // eslint-disable-next-line no-console
+      console.log("Deploying account...");
+      const deployTxHash = await walletClient.sendTransaction({
+        to: transaction.to,
+        data: transaction.data,
+      });
+
+      // eslint-disable-next-line no-console
+      console.log("Deploy tx hash:", deployTxHash);
+
+      // Wait for deployment to complete and get the receipt with logs
+      const receipt = await publicClient.waitForTransactionReceipt({ hash: deployTxHash });
+
+      // eslint-disable-next-line no-console
+      console.log("Deployment receipt received, logs count:", receipt.logs.length);
+
+      // Get the deployed account address from the AccountCreated event
+      const senderAddress = getAccountAddressFromLogs(receipt.logs);
+
+      // eslint-disable-next-line no-console
+      console.log("Account deployed at:", senderAddress);
+
+      // Fund the smart account with some ETH for gas
+      const fundTxHash = await walletClient.sendTransaction({
+        to: senderAddress,
+        value: parseEther("1"),
+      });
+      await publicClient.waitForTransactionReceipt({ hash: fundTxHash });
+
+      // eslint-disable-next-line no-console
+      console.log("Account funded!");
 
       accountStore.setAccount(senderAddress, credIdHex);
       return { address: senderAddress, credentialId: credIdHex };
diff --git a/packages/sdk-4337/src/client/actions/deploy.ts b/packages/sdk-4337/src/client/actions/deploy.ts
@@ -164,8 +164,8 @@ export function prepareDeploySmartAccount(
 
   const encodedCallData = encode_deploy_account_call_data(
     accountId,
-    eoaSigners || [],
-    contracts.eoaValidator || null,
+    hasEoaSigners ? eoaSigners : null,
+    hasEoaSigners ? contracts.eoaValidator : null,
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     passkeyPayload as any,
     contracts.webauthnValidator || null,

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`		`- "eoaValidator": "0x5FbDB2315678afecb367f032d93F642f64180aa3",`
`3`		`- "webauthnValidator": "0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512",`
`4`		`- "sessionValidator": "0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0",`
`5`		`- "factory": "0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9",`
	`2`	`+ "eoaValidator": "0xde612c1b1C06982551157FB53E61a123c6045DFC",`
	`3`	`+ "webauthnValidator": "0xE854be130245223cBDD20c85f4F126996669Cf08",`
	`4`	`+ "sessionValidator": "0x41b6892Bf7aFB4feeACDd96AAf34205124380A47",`
	`5`	`+ "factory": "0x099961116Ba4371a2516034233177Ee3eFcdaf39",`
`6`	`6`	`"bundlerUrl": "http://localhost:4337"`
`7`	`7`	`}`