feat: more paymaster support

Author: cpb8010

examples/demo-app/scripts/deploy-msa-anvil.sh

@@ -58,6 +58,30 @@ echo "  ModularSmartAccount impl: $ACCOUNT_IMPL"
 echo "  UpgradeableBeacon: $BEACON"
 echo "  MSAFactory: $FACTORY"
 
+# Deploy MockPaymaster for gas sponsorship
+echo ""
+echo "📦 Deploying MockPaymaster..."
+PAYMASTER_OUTPUT=$(forge create test/mocks/MockPaymaster.sol:MockPaymaster \
+  --rpc-url $RPC_URL \
+  --private-key 0x2a871d0798f97d79848a013d4936a73bf4cc922c825d33c1cf7073dff6d409c6 \
+  --json 2>&1 | tail -1)
+
+PAYMASTER=$(echo "$PAYMASTER_OUTPUT" | jq -r '.deployedTo // empty')
+if [ -z "$PAYMASTER" ]; then
+  echo "⚠️ Failed to deploy MockPaymaster, continuing without it"
+  PAYMASTER=""
+else
+  echo "✅ MockPaymaster deployed to: $PAYMASTER"
+  
+  # Fund the paymaster by calling deposit() with ETH
+  echo "💰 Funding paymaster via deposit()..."
+  cast send $PAYMASTER "deposit()" \
+    --rpc-url $RPC_URL \
+    --private-key 0x2a871d0798f97d79848a013d4936a73bf4cc922c825d33c1cf7073dff6d409c6 \
+    --value 10ether
+  echo "✅ Paymaster funded with 10 ETH"
+fi
+
 # Create contracts-anvil.json
 echo ""
 echo "💾 Creating contracts-anvil.json..."
@@ -75,6 +99,7 @@ cat > contracts-anvil.json << EOF
   "accountImplementation": "$ACCOUNT_IMPL",
   "beacon": "$BEACON",
   "factory": "$FACTORY",
+  "paymaster": "$PAYMASTER",
   "entryPoint": "0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108",
   "bundlerUrl": "http://localhost:4337"
 }
@@ -90,6 +115,10 @@ echo "✅ Updated contracts.json to use Anvil addresses"
 cp contracts-anvil.json public/contracts.json
 echo "✅ Copied to public/contracts.json"
 
+# Copy to auth-server-api for local development
+cp contracts-anvil.json "$WORKSPACE_ROOT/packages/auth-server-api/src/contracts.json"
+echo "✅ Copied to packages/auth-server-api/src/contracts.json"
+
 echo ""
 echo "🎉 Deployment complete!"
 echo ""

examples/nft-quest/stores/connector.ts

@@ -1,5 +1,5 @@
 import { connect, createConfig, type CreateConnectorFn, disconnect, getAccount, http, reconnect, watchAccount } from "@wagmi/core";
-import type { Address, Hash } from "viem";
+import { type Address, type Hash, parseEther } from "viem";
 import type { Chain } from "viem/chains";
 import { zksyncSsoConnector } from "zksync-sso-4337/connector";
 
@@ -36,7 +36,7 @@ export const useConnectorStore = defineStore("connector", () => {
     },
     authServerUrl,
     session: {
-      feeLimit: 0n,
+      feeLimit: parseEther("0.1"), // Allow up to 0.1 ETH for gas fees
       contractCalls: [
         {
           address: contracts.nft as Hash,
@@ -67,10 +67,12 @@ export const useConnectorStore = defineStore("connector", () => {
   });
 
   const connectAccount = async () => {
-    return await connect(wagmiConfig, {
+    const result = await connect(wagmiConfig, {
       connector,
       chainId: chain.id,
     });
+
+    return result;
   };
 
   const disconnectAccount = () => {

packages/auth-server/composables/useAccountCreate.ts

@@ -57,7 +57,8 @@ export const useAccountCreate = (_chainId: MaybeRef<SupportedChainId>, prividium
         credentialId,
         credentialPublicKey,
         originDomain: window.location.origin,
-        session: sessionData ? sessionSpecToJSON(sessionData) : undefined,
+        // sessionSpecToJSON returns a JSON string, so parse it to get an object
+        session: sessionData ? JSON.parse(sessionSpecToJSON(sessionData)) : undefined,
         userId: credentialId, // Use credential ID as unique user ID
         eoaSigners: [ownerAddress],
       }),

packages/auth-server/stores/client.ts

@@ -49,6 +49,7 @@ type ChainContracts = {
   factory: Address;
   bundlerUrl?: string;
   beacon?: Address; // Optional, for deployment
+  paymaster?: Address; // Optional, for gas sponsorship
 };
 
 export const contractsByChain: Record<SupportedChainId, ChainContracts> = {

packages/auth-server/utils/constructReturn.ts

@@ -12,7 +12,7 @@ export const constructReturn = (address: `0x${string}`, chainId: number, session
       id: chain.id,
       capabilities: {
         paymasterService: {
-          supported: true,
+          supported: !!contractsByChain[chain.id].paymaster,
         },
         atomicBatch: {
           supported: true,
@@ -23,6 +23,7 @@ export const constructReturn = (address: `0x${string}`, chainId: number, session
       },
       contracts: contractsByChain[chain.id],
       bundlerUrl: contractsByChain[chain.id].bundlerUrl,
+      paymaster: contractsByChain[chain.id].paymaster,
     })),
   };
 };

packages/sdk-4337/src/client-auth-server/Signer.ts

@@ -155,10 +155,36 @@ export class Signer implements SignerInterface {
       transport: this.transports[chain.id] || http(),
     });
 
+    // Build paymaster configuration if paymaster address is available
+    const paymasterAddress = chainInfo.paymaster;
+    const paymasterConfig = paymasterAddress
+      ? {
+          async getPaymasterData() {
+            // For a simple verifying paymaster, we just need to specify the paymaster address
+            // The MockPaymaster doesn't require any additional data
+            return {
+              paymaster: paymasterAddress,
+              paymasterData: "0x" as `0x${string}`,
+              paymasterVerificationGasLimit: 500_000n,
+              paymasterPostOpGasLimit: 100_000n,
+            };
+          },
+          async getPaymasterStubData() {
+            return {
+              paymaster: paymasterAddress,
+              paymasterData: "0x" as `0x${string}`,
+              paymasterVerificationGasLimit: 500_000n,
+              paymasterPostOpGasLimit: 100_000n,
+            };
+          },
+        }
+      : undefined;
+
     this.bundlerClients[chain.id] = createBundlerClient({
       client: publicClient,
       chain,
       transport: http(chainInfo.bundlerUrl),
+      paymaster: paymasterConfig,
       userOperation: {
         // Use fixed gas values matching old Rust SDK implementation
         // (old SDK used: 2M callGas, 2M verificationGas, 1M preVerificationGas)

packages/sdk-4337/src/client-auth-server/rpc.ts

@@ -28,6 +28,7 @@ export type AuthServerRpcSchema = [
         capabilities: Record<string, unknown>;
         contracts: SessionRequiredContracts;
         bundlerUrl?: string;
+        paymaster?: Address;
       }[];
     };
   },