fix

etherspot · Aug 13, 2024 · 03b99c5 · 03b99c5
1 parent dd43840
commit 03b99c5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/packages/executor/src/modules/eth.ts b/packages/executor/src/modules/eth.ts
@@ -28,6 +28,7 @@ import {
 import { GetNodeAPI, NetworkConfig } from "../interfaces";
 import { EntryPointVersion } from "../services/EntryPointService/interfaces";
 import { getUserOpGasLimit } from "../services/BundlingService/utils";
+import { maxBn, minBn } from "../utils/bignumber";
 import {
   EstimateUserOperationGasArgs,
   SendUserOperationGasArgs,
@@ -223,17 +224,17 @@ export class Eth {
       });
     //>
 
-    let callGasLimit = binarySearchCGL;
+    let callGasLimit = minBn(binarySearchCGL, paidFeeCGL);
     if (userOp.factoryData !== undefined && userOp.factoryData.length > 2) {
       await this.provider
         .estimateGas({
           from: entryPoint,
           to: userOp.sender,
           data: userOp.callData,
-          gasLimit: binarySearchCGL,
+          gasLimit: callGasLimit,
         })
         .catch((_) => {
-          callGasLimit = paidFeeCGL;
+          callGasLimit = maxBn(binarySearchCGL, paidFeeCGL);
         });
     }
     this.logger.debug(

diff --git a/packages/executor/src/utils/bignumber.ts b/packages/executor/src/utils/bignumber.ts
@@ -0,0 +1,9 @@
+import { BigNumber } from "ethers";
+
+export function minBn(lhs: BigNumber, rhs: BigNumber): BigNumber {
+  return lhs.gt(rhs) ? rhs : lhs;
+}
+
+export function maxBn(lhs: BigNumber, rhs: BigNumber): BigNumber {
+  return lhs.lt(rhs) ? rhs : lhs;
+}