binary search gas limits (#84)

* binary search gas limits

* adjust to new test cases

* chore(release): v0.0.42

lerna.json

@@ -4,7 +4,7 @@
   ],
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "0.0.41",
+  "version": "0.0.42",
   "stream": "true",
   "command": {
     "version": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "root",
   "private": true,
-  "version": "0.0.41",
+  "version": "0.0.42",
   "engines": {
     "node": ">=18.0.0"
   },

packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api",
-  "version": "0.0.41",
+  "version": "0.0.42",
   "description": "The API module of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://https://github.com/etherspot/skandha#readme",
@@ -35,12 +35,12 @@
     "class-transformer": "0.5.1",
     "class-validator": "0.14.0",
     "ethers": "5.7.2",
-    "executor": "^0.0.41",
+    "executor": "^0.0.42",
     "fastify": "4.14.1",
     "pino": "8.11.0",
     "pino-pretty": "10.0.0",
     "reflect-metadata": "0.1.13",
-    "types": "^0.0.41"
+    "types": "^0.0.42"
   },
   "devDependencies": {
     "@types/connect": "3.4.35"

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cli",
-  "version": "0.0.41",
+  "version": "0.0.42",
   "description": "> TODO: description",
   "author": "zincoshine <[email protected]>",
   "homepage": "https://https://github.com/etherspot/skandha#readme",
@@ -31,13 +31,13 @@
     "url": "https://https://github.com/etherspot/skandha/issues"
   },
   "dependencies": {
-    "api": "^0.0.41",
-    "db": "^0.0.41",
-    "executor": "^0.0.41",
+    "api": "^0.0.42",
+    "db": "^0.0.42",
+    "executor": "^0.0.42",
     "find-up": "5.0.0",
     "got": "12.5.3",
     "js-yaml": "4.1.0",
-    "types": "^0.0.41",
+    "types": "^0.0.42",
     "yargs": "17.6.2"
   },
   "devDependencies": {

packages/db/package.json

@@ -1,6 +1,6 @@
 {
   "name": "db",
-  "version": "0.0.41",
+  "version": "0.0.42",
   "description": "The DB module of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://github.com/etherspot/etherspot-bundler#readme",
@@ -37,6 +37,6 @@
   "devDependencies": {
     "@types/rocksdb": "3.0.1",
     "prettier": "^2.8.4",
-    "types": "^0.0.41"
+    "types": "^0.0.42"
   }
 }

packages/executor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "executor",
-  "version": "0.0.41",
+  "version": "0.0.42",
   "description": "The Relayer module of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://https://github.com/etherspot/skandha#readme",
@@ -33,7 +33,7 @@
   "dependencies": {
     "async-mutex": "0.4.0",
     "ethers": "5.7.2",
-    "params": "^0.0.41",
-    "types": "^0.0.41"
+    "params": "^0.0.42",
+    "types": "^0.0.42"
   }
 }

packages/executor/src/modules/eth.ts

@@ -159,12 +159,23 @@ export class Eth {
       });
     //>
 
-    const userOpToEstimate: UserOperationStruct = {
+    // Binary search gas limits
+    let userOpToEstimate: UserOperationStruct = {
       ...userOpComplemented,
       preVerificationGas,
       verificationGasLimit,
       callGasLimit,
     };
+
+    // binary search vgl and cgl
+    try {
+      userOpToEstimate = await this.userOpValidationService.binarySearchVGL(
+        userOpToEstimate,
+        entryPoint
+      );
+      // eslint-disable-next-line no-empty
+    } catch (err) {}
+
     const gasFee = await getGasFee(
       this.networkName,
       this.provider,
@@ -177,11 +188,11 @@ export class Eth {
 
     return {
       preVerificationGas,
-      verificationGasLimit,
-      verificationGas: verificationGasLimit,
+      verificationGasLimit: userOpToEstimate.verificationGasLimit,
+      verificationGas: userOpToEstimate.verificationGasLimit,
       validAfter: BigNumber.from(validAfter),
       validUntil: BigNumber.from(validUntil),
-      callGasLimit,
+      callGasLimit: userOpToEstimate.callGasLimit,
       maxFeePerGas: gasFee.maxFeePerGas,
       maxPriorityFeePerGas: gasFee.maxPriorityFeePerGas,
     };

packages/executor/src/services/BundlingService.ts

@@ -52,6 +52,10 @@ export class BundlingService {
 
   async sendNextBundle(): Promise<SendBundleReturn | null> {
     return await this.mutex.runExclusive(async () => {
+      const entries = await this.mempoolService.getSortedOps();
+      if (!entries.length) {
+        return null;
+      }
       this.logger.debug("sendNextBundle");
       const gasFee = await getGasFee(
         this.network,

packages/executor/src/services/UserOpValidation/service.ts

@@ -111,4 +111,24 @@ export class UserOpValidationService {
 
     return true;
   }
+
+  async binarySearchVGL(
+    userOp: UserOperationStruct,
+    entryPoint: string
+  ): Promise<UserOperationStruct> {
+    if (this.config.unsafeMode) {
+      return this.estimationService.binarySearchVGL(userOp, entryPoint);
+    }
+    return this.estimationService.binarySearchVGLSafe(userOp, entryPoint);
+  }
+
+  async binarySearchCGL(
+    userOp: UserOperationStruct,
+    entryPoint: string
+  ): Promise<UserOperationStruct> {
+    if (this.config.unsafeMode) {
+      return userOp; // CGL search not supported in unsafeMode
+    }
+    return this.estimationService.binarySearchCGLSafe(userOp, entryPoint);
+  }
 }

packages/executor/src/services/UserOpValidation/utils.ts

@@ -23,7 +23,7 @@ export function nethermindErrorHandler(
 ): any {
   try {
     let { error } = errorResult;
-    if (error.error) {
+    if (error && error.error) {
       error = error.error;
     }
     if (error && error.code == -32015 && error.data.startsWith("Reverted ")) {
@@ -311,3 +311,21 @@ export function isSlotAssociatedWith(
   }
   return false;
 }
+
+export function parseValidationResult(
+  entryPointContract: IEntryPoint,
+  userOp: UserOperationStruct,
+  data: string
+): UserOpValidationResult {
+  const { name: errorName, args: errorArgs } =
+    entryPointContract.interface.parseError(data);
+  const errFullName = `${errorName}(${errorArgs.toString()})`;
+  const errResult = parseErrorResult(userOp, {
+    errorName,
+    errorArgs,
+  });
+  if (!errorName.includes("Result")) {
+    throw new Error(errFullName);
+  }
+  return errResult;
+}