SimpleAccount Preset: accept PM gas values rather then own estimates (#11)

Author: hazim-j

package.json

@@ -1,6 +1,6 @@
 {
   "name": "userop",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "A simple JS library for building ERC-4337 UserOperations.",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",

src/preset/builder/simpleAccount.ts

@@ -89,12 +89,11 @@ export class SimpleAccount extends UserOperationBuilder {
         ),
       })
       .useMiddleware(instance.resolveAccount)
-      .useMiddleware(getGasPrice(instance.provider))
-      .useMiddleware(estimateUserOperationGas(instance.provider));
+      .useMiddleware(getGasPrice(instance.provider));
 
     const withPM = paymasterMiddleware
       ? base.useMiddleware(paymasterMiddleware)
-      : base;
+      : base.useMiddleware(estimateUserOperationGas(instance.provider));
 
     return withPM.useMiddleware(EOASignature(instance.signer));
   }

src/preset/middleware/paymaster.ts

@@ -6,12 +6,17 @@ interface VerifyingPaymasterResult {
   paymasterAndData: string;
   preVerificationGas: string;
   verificationGasLimit: string;
+  callGasLimit: string;
 }
 
 // Assumes the paymaster interface in https://hackmd.io/@stackup/H1oIvV-qi
 export const verifyingPaymaster =
   (paymasterRpc: string, context: any): UserOperationMiddlewareFn =>
   async (ctx) => {
+    ctx.op.verificationGasLimit = ethers.BigNumber.from(
+      ctx.op.verificationGasLimit
+    ).mul(3);
+
     const provider = new ethers.providers.JsonRpcProvider(paymasterRpc);
     const pm = (await provider.send("pm_sponsorUserOperation", [
       OpToJSON(ctx.op),
@@ -23,4 +28,5 @@ export const verifyingPaymaster =
     ctx.op.paymasterAndData = pm.paymasterAndData;
     ctx.op.preVerificationGas = pm.preVerificationGas;
     ctx.op.verificationGasLimit = pm.verificationGasLimit;
+    ctx.op.callGasLimit = pm.callGasLimit;
   };