fix(mock-paymaster): sign sponsoredUserOp rather than input userOp

Author: mouseless0x

docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   anvil:
-    image: ghcr.io/foundry-rs/foundry:nightly-776897b169e17117be345bf4a226e093ca768c17
+    image: ghcr.io/foundry-rs/foundry
     ports: [ "8545:8545" ]
     entrypoint: [ "anvil", "--host", "0.0.0.0", "--block-time", "0.1", "--silent", "--hardfork", "prague"]
     # Uncomment this if you want to use a fork
@@ -29,7 +29,7 @@ services:
         condition: service_completed_successfully
 
   alto:
-    build: https://github.com/pimlicolabs/alto.git
+    image: ghcr.io/pimlicolabs/alto:latest
     ports: [ "4337:4337" ]
     environment:
       - ANVIL_RPC=http://anvil:8545

mock-verifying-paymaster/src/relay.ts

@@ -69,34 +69,38 @@ const handlePmSponsor = async ({
 }) => {
 	const is06 = entryPoint === entryPoint06Address;
 
-	let op = {
+	let sponsoredUserOp = {
 		...userOperation,
 		...getDummyPaymasterData({ is06, paymaster, paymasterMode }),
 	} as UserOperation;
 
+	// User provided gasLimits
 	const callGasLimit = userOperation.callGasLimit;
 	const verificationGasLimit = userOperation.verificationGasLimit;
 	const preVerificationGas = userOperation.preVerificationGas;
 
 	if (estimateGas) {
 		try {
 			const gasEstimates = await bundler.estimateUserOperationGas({
-				...op,
+				...sponsoredUserOp,
 				entryPointAddress: entryPoint,
 			});
 
-			op = {
-				...op,
+			sponsoredUserOp = {
+				...sponsoredUserOp,
 				...gasEstimates,
 			} as UserOperation;
 
-			op.callGasLimit = maxBigInt(op.callGasLimit, callGasLimit);
-			op.preVerificationGas = maxBigInt(
-				op.preVerificationGas,
+			sponsoredUserOp.callGasLimit = maxBigInt(
+				gasEstimates.callGasLimit,
+				callGasLimit,
+			);
+			sponsoredUserOp.preVerificationGas = maxBigInt(
+				gasEstimates.preVerificationGas,
 				preVerificationGas,
 			);
-			op.verificationGasLimit = maxBigInt(
-				op.verificationGasLimit,
+			sponsoredUserOp.verificationGasLimit = maxBigInt(
+				gasEstimates.verificationGasLimit,
 				verificationGasLimit,
 			);
 		} catch (e: unknown) {
@@ -116,15 +120,19 @@ const handlePmSponsor = async ({
 	}
 
 	const result = {
-		preVerificationGas: toHex(op.preVerificationGas),
-		callGasLimit: toHex(op.callGasLimit),
-		paymasterVerificationGasLimit: toHex(op.paymasterVerificationGasLimit || 0),
-		paymasterPostOpGasLimit: toHex(op.paymasterPostOpGasLimit || 0),
-		verificationGasLimit: toHex(op.verificationGasLimit || 0),
+		preVerificationGas: toHex(sponsoredUserOp.preVerificationGas),
+		callGasLimit: toHex(sponsoredUserOp.callGasLimit),
+		paymasterVerificationGasLimit: toHex(
+			sponsoredUserOp.paymasterVerificationGasLimit || 0,
+		),
+		paymasterPostOpGasLimit: toHex(
+			sponsoredUserOp.paymasterPostOpGasLimit || 0,
+		),
+		verificationGasLimit: toHex(sponsoredUserOp.verificationGasLimit || 0),
 		...(await getSignedPaymasterData({
 			publicClient,
 			signer: paymasterSigner,
-			userOp: userOperation,
+			userOp: sponsoredUserOp,
 			paymaster,
 			paymasterMode,
 		})),