enhancement: contract based binary search for call gas limit estimate

etherspot · Jul 7, 2024 · b645781 · b645781
1 parent 44f7ef7
commit b645781
Show file tree

Hide file tree

Showing 10 changed files with 668 additions and 23 deletions.
diff --git a/packages/executor/src/interfaces.ts b/packages/executor/src/interfaces.ts
@@ -253,3 +253,8 @@ export interface KnownEntities {
   accounts: string[];
   otherEntities: string[];
 }
+
+export interface ExecutionResultAndCallGasLimit {
+  returnInfo: ExecutionResult;
+  callGasLimit: BigNumber;
+}
diff --git a/packages/executor/src/modules/eth.ts b/packages/executor/src/modules/eth.ts
@@ -177,7 +177,7 @@ export class Eth {
       userOp.signature = ECDSA_DUMMY_SIGNATURE;
     }
 
-    const returnInfo = await this.userOpValidationService.validateForEstimation(
+    let {returnInfo, callGasLimit} = await this.userOpValidationService.validateForEstimation(
       userOp,
       entryPoint
     );
@@ -194,12 +194,12 @@ export class Eth {
 
     // calculate callGasLimit based on paid fee
     const { cglMarkup } = this.config;
-    const totalGas: BigNumber = BigNumber.from(paid).div(userOp.maxFeePerGas);
-    let callGasLimit = totalGas
-      .sub(preOpGas)
-      .mul(10000 + this.config.cglMarkupPercent)
-      .div(10000) // % markup
-      .add(cglMarkup || 0);
+    // const totalGas: BigNumber = BigNumber.from(paid).div(userOp.maxFeePerGas);
+    // let callGasLimit = totalGas
+    //   .sub(preOpGas)
+    //   .mul(10000 + this.config.cglMarkupPercent)
+    //   .div(10000) // % markup
+    //   .add(cglMarkup || 0);
 
     if (callGasLimit.lt(cglMarkup)) {
       callGasLimit = BigNumber.from(cglMarkup);

diff --git a/packages/executor/src/services/EntryPointService/constants.ts b/packages/executor/src/services/EntryPointService/constants.ts
@@ -7,3 +7,5 @@ export const DefaultGasOverheads = {
   bundleSize: 1,
   sigSize: 65,
 };
+
+export const IMPLEMENTATION_ADDRESS_MARKER = "0xA13dB4eCfbce0586E57D1AeE224FbE64706E8cd3";
diff --git a/packages/executor/src/services/EntryPointService/utils/decodeRevertReason.ts b/packages/executor/src/services/EntryPointService/utils/decodeRevertReason.ts
@@ -63,6 +63,23 @@ export function decodeRevertReason(
   }
 }
 
+export function decodeTargetData(data: string) {
+  try {
+    const methodSig = data.slice(0, 10);
+    const dataParams = "0x" + data.slice(10);
+    if(methodSig === "0x8c83589a") {
+      const res = ethers.utils.defaultAbiCoder.decode(
+        ["uint256", "uint256"],
+        dataParams
+      );
+      return res;
+    }
+    throw Error("Error decoding target data");
+  } catch (error) {
+    throw error;
+  }
+}
+
 // not sure why ethers fail to decode revert reasons, not even "Error()" (and obviously, not custom errors)
 export function rethrowWithRevertReason(e: Error): never {
   throw new Error(decodeRevertReason(e, false) as any);

diff --git a/packages/executor/src/services/EntryPointService/versions/0.0.7.ts b/packages/executor/src/services/EntryPointService/versions/0.0.7.ts
@@ -35,13 +35,21 @@ import {
   StakeInfo,
   UserOpValidationResult,
 } from "../../../interfaces";
-import { DefaultGasOverheads } from "../constants";
+import { DefaultGasOverheads, IMPLEMENTATION_ADDRESS_MARKER } from "../constants";
 import { StateOverrides } from "../interfaces";
-import { decodeRevertReason } from "../utils/decodeRevertReason";
+import { decodeRevertReason, decodeTargetData } from "../utils/decodeRevertReason";
 import { getUserOpGasLimit } from "../../BundlingService/utils";
 import { IEntryPointService } from "./base";
+import {
+  CallGasEstimationProxy__factory,
+  _deployedBytecode as _callGasEstimationProxyDeployedBytecode
+} from "@skandha/types/lib/contracts/EPv7/factories/core/CallGasEstimationProxy__factory";
+import {
+  CallGasEstimationProxy
+} from "@skandha/types/lib/contracts/EPv7/core/CallGasEstimationProxy";
 
 const entryPointSimulations = IEntryPointSimulations__factory.createInterface();
+const callGasEstimateProxy = CallGasEstimationProxy__factory.createInterface();
 
 export class EntryPointV7Service implements IEntryPointService {
   contract: EntryPoint;
@@ -70,11 +78,22 @@ export class EntryPointV7Service implements IEntryPointService {
           this.networkConfig.estimationGasLimit
         )
       : undefined;
+
+    const estimateCallGasArgs: CallGasEstimationProxy.EstimateCallGasArgsStruct = {
+      userOp: packUserOp(userOp),
+      isContinuation: true,
+      maxGas: "100000",
+      minGas: "21000",
+      rounding: "2"
+    }
 
-    const [data, stateOverrides] = this.encodeSimulateHandleOp(
+    const [data] = this.encodeSimulateHandleOp(
       userOp,
-      AddressZero,
-      BytesZero
+      this.address,
+      callGasEstimateProxy.encodeFunctionData(
+        "estimateCallGas",
+        [estimateCallGasArgs]
+      )
     );
 
     const tx: providers.TransactionRequest = {
@@ -83,6 +102,15 @@ export class EntryPointV7Service implements IEntryPointService {
       gasLimit,
     };
 
+    const stateOverrides: StateOverrides = {
+      [this.address]: {
+        code: _callGasEstimationProxyDeployedBytecode
+      },
+      [IMPLEMENTATION_ADDRESS_MARKER]: {
+        code: _deployedBytecode
+      }
+    }
+
     try {
       const simulationResult = await this.provider.send("eth_call", [
         tx,
@@ -93,7 +121,8 @@ export class EntryPointV7Service implements IEntryPointService {
         "simulateHandleOp",
         simulationResult
       );
-      return res[0];
+      const [callGasLimit] = decodeTargetData(res[0].targetResult);
+      return {returnInfo: res[0], callGasLimit: callGasLimit};
     } catch (error: any) {
       console.log(error);
       const err = decodeRevertReason(error);

diff --git a/packages/executor/src/services/UserOpValidation/service.ts b/packages/executor/src/services/UserOpValidation/service.ts
@@ -6,6 +6,7 @@ import { UserOperation } from "@skandha/types/lib/contracts/UserOperation";
 import { Config } from "../../config";
 import {
   ExecutionResult,
+  ExecutionResultAndCallGasLimit,
   NetworkConfig,
   UserOpValidationResult,
 } from "../../interfaces";
@@ -62,7 +63,7 @@ export class UserOpValidationService {
   async validateForEstimation(
     userOp: UserOperation,
     entryPoint: string
-  ): Promise<ExecutionResult> {
+  ): Promise<ExecutionResultAndCallGasLimit> {
     return await this.estimationService.estimateUserOp(userOp, entryPoint);
   }
 

diff --git a/packages/executor/src/services/UserOpValidation/validators/estimation.ts b/packages/executor/src/services/UserOpValidation/validators/estimation.ts
@@ -1,7 +1,7 @@
 import { providers } from "ethers";
 import { Logger } from "@skandha/types/lib";
 import { UserOperation } from "@skandha/types/lib/contracts/UserOperation";
-import { ExecutionResult } from "../../../interfaces";
+import { ExecutionResultAndCallGasLimit } from "../../../interfaces";
 import { EntryPointService } from "../../EntryPointService";
 import { mergeValidationDataValues } from "../../EntryPointService/utils";
 
@@ -15,8 +15,8 @@ export class EstimationService {
   async estimateUserOp(
     userOp: UserOperation,
     entryPoint: string
-  ): Promise<ExecutionResult> {
-    const returnInfo = await this.entryPointService.simulateHandleOp(
+  ): Promise<ExecutionResultAndCallGasLimit> {
+    const { returnInfo, callGasLimit } = await this.entryPointService.simulateHandleOp(
       entryPoint,
       userOp
     );
@@ -25,12 +25,15 @@ export class EstimationService {
       returnInfo.paymasterValidationData
     );
     return {
-      preOpGas: returnInfo.preOpGas,
-      paid: returnInfo.paid,
-      validAfter: validAfter,
-      validUntil: validUntil,
-      targetSuccess: returnInfo.targetSuccess,
-      targetResult: returnInfo.targetResult,
+      returnInfo: {
+        preOpGas: returnInfo.preOpGas,
+        paid: returnInfo.paid,
+        validAfter: validAfter,
+        validUntil: validUntil,
+        targetSuccess: returnInfo.targetSuccess,
+        targetResult: returnInfo.targetResult,
+      },
+      callGasLimit
     };
   }
 }