Merge pull request #734 from bcnmy/feature/override-pvg-validation

feat(validation): enable overriding PVG validation
bcnmy · Oct 27, 2024 · cd36c32 · cd36c32
2 parents 90aa1a4 + 428929a
commit cd36c32
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 18 deletions.
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,4 +1,2 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
-
-yarn run format
diff --git a/src/common/simulation/BundlerSimulationService.ts b/src/common/simulation/BundlerSimulationService.ts
@@ -583,24 +583,27 @@ export class BundlerSimulationService {
       );
     }
 
-    const { preVerificationGas: networkPreVerificationGas } =
-      await this.gasEstimator.calculatePreVerificationGas({
-        userOperation: userOp,
-        baseFeePerGas,
-      });
-    log.info(`networkPreVerificationGas: ${networkPreVerificationGas}`);
+    if (!config.disableFeeValidation.includes(this.networkService.chainId)) {
+      const { preVerificationGas: networkPreVerificationGas } =
+        await this.gasEstimator.calculatePreVerificationGas({
+          userOperation: userOp,
+          baseFeePerGas,
+        });
+      log.info(`networkPreVerificationGas: ${networkPreVerificationGas}`);
 
-    const minimumAcceptablePreVerificationGas =
-      Number(networkPreVerificationGas) * preVerificationGasThresholdPercentage;
+      const minimumAcceptablePreVerificationGas =
+        Number(networkPreVerificationGas) *
+        preVerificationGasThresholdPercentage;
 
-    if (minimumAcceptablePreVerificationGas > Number(preVerificationGas)) {
-      log.info(
-        `preVerificationGas in userOp: ${preVerificationGas} is lower than minimumAcceptablePreVerificationGas: ${minimumAcceptablePreVerificationGas}`,
-      );
-      throw new RpcError(
-        `preVerificationGas in userOp: ${preVerificationGas} is lower than minimumAcceptablePreVerificationGas: ${minimumAcceptablePreVerificationGas}`,
-        BUNDLER_ERROR_CODES.PRE_VERIFICATION_GAS_TOO_LOW,
-      );
+      if (minimumAcceptablePreVerificationGas > Number(preVerificationGas)) {
+        log.info(
+          `preVerificationGas in userOp: ${preVerificationGas} is lower than minimumAcceptablePreVerificationGas: ${minimumAcceptablePreVerificationGas}`,
+        );
+        throw new RpcError(
+          `preVerificationGas in userOp: ${preVerificationGas} is lower than minimumAcceptablePreVerificationGas: ${minimumAcceptablePreVerificationGas}`,
+          BUNDLER_ERROR_CODES.PRE_VERIFICATION_GAS_TOO_LOW,
+        );
+      }
     }
 
     log.info(