bifrost fix (#153)

lerna.json

@@ -4,7 +4,7 @@
   ],
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "1.0.37-alpha",
+  "version": "1.0.38-alpha",
   "stream": "true",
   "command": {
     "version": {

package.json

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

packages/api/package.json

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

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cli",
-  "version": "1.0.37-alpha",
+  "version": "1.0.38-alpha",
   "description": "> TODO: description",
   "author": "zincoshine <[email protected]>",
   "homepage": "https://https://github.com/etherspot/skandha#readme",
@@ -38,15 +38,15 @@
     "@libp2p/peer-id-factory": "2.0.1",
     "@libp2p/prometheus-metrics": "1.1.3",
     "@multiformats/multiaddr": "12.1.3",
-    "api": "^1.0.37-alpha",
-    "db": "^1.0.37-alpha",
-    "executor": "^1.0.37-alpha",
+    "api": "^1.0.38-alpha",
+    "db": "^1.0.38-alpha",
+    "executor": "^1.0.38-alpha",
     "find-up": "5.0.0",
     "got": "12.5.3",
     "js-yaml": "4.1.0",
-    "monitoring": "^1.0.37-alpha",
-    "node": "^1.0.37-alpha",
-    "types": "^1.0.37-alpha",
+    "monitoring": "^1.0.38-alpha",
+    "node": "^1.0.38-alpha",
+    "types": "^1.0.38-alpha",
     "yargs": "17.6.2"
   },
   "devDependencies": {

packages/db/package.json

@@ -1,6 +1,6 @@
 {
   "name": "db",
-  "version": "1.0.37-alpha",
+  "version": "1.0.38-alpha",
   "description": "The DB module of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://github.com/etherspot/etherspot-bundler#readme",
@@ -33,7 +33,7 @@
   "dependencies": {
     "@chainsafe/ssz": "0.10.1",
     "@farcaster/rocksdb": "5.5.0",
-    "types": "^1.0.37-alpha"
+    "types": "^1.0.38-alpha"
   },
   "devDependencies": {
     "@types/rocksdb": "3.0.1",

packages/executor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "executor",
-  "version": "1.0.37-alpha",
+  "version": "1.0.38-alpha",
   "description": "The Relayer module of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://https://github.com/etherspot/skandha#readme",
@@ -34,8 +34,8 @@
     "@flashbots/ethers-provider-bundle": "0.6.2",
     "async-mutex": "0.4.0",
     "ethers": "5.7.2",
-    "monitoring": "^1.0.37-alpha",
-    "params": "^1.0.37-alpha",
-    "types": "^1.0.37-alpha"
+    "monitoring": "^1.0.38-alpha",
+    "params": "^1.0.38-alpha",
+    "types": "^1.0.38-alpha"
   }
 }

packages/executor/src/config.ts

@@ -333,6 +333,14 @@ export class Config {
       )
     );
 
+    conf.skipBundleValidation = Boolean(
+      fromEnvVar(
+        network,
+        "SKIP_BUNDLE_VALIDATION",
+        conf.skipBundleValidation || bundlerDefaultConfigs.skipBundleValidation
+      )
+    );
+
     // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
     if (!conf.whitelistedEntities) {
       conf.whitelistedEntities = bundlerDefaultConfigs.whitelistedEntities;
@@ -391,6 +399,7 @@ const bundlerDefaultConfigs: BundlerConfig = {
   relayingMode: "classic",
   pvgMarkup: 0,
   gasFeeInSimulation: false,
+  skipBundleValidation: false,
 };
 
 const NETWORKS_ENV = (): string[] | undefined => {

packages/executor/src/interfaces.ts

@@ -148,6 +148,8 @@ export interface NetworkConfig {
   pvgMarkup: number;
   // add gas fee in simulated transactions (may be required for some rpc providers)
   gasFeeInSimulation: boolean;
+  // skips bundle validation
+  skipBundleValidation: boolean;
 }
 
 export type BundlerConfig = Omit<

packages/executor/src/modules/skandha.ts

@@ -126,6 +126,7 @@ export class Skandha {
       bundleSize: this.networkConfig.bundleSize,
       minUnstakeDelay: this.networkConfig.minUnstakeDelay,
       pvgMarkup: this.networkConfig.pvgMarkup,
+      skipBundleValidation: this.networkConfig.skipBundleValidation,
     };
   }
 

packages/executor/src/services/BundlingService/relayers/classic.ts

@@ -115,16 +115,19 @@ export class ClassicRelayer extends BaseRelayer {
       // geth-dev's jsonRpcSigner doesn't support signTransaction
       if (!this.config.testingMode) {
         // check for execution revert
-        try {
-          // eslint-disable-next-line @typescript-eslint/no-unused-vars
-          const { gasLimit, ...txWithoutGasLimit } = transactionRequest;
-          // some chains, like Bifrost, don't allow setting gasLimit in estimateGas
-          await relayer.estimateGas(txWithoutGasLimit);
-        } catch (err) {
-          this.logger.error(err);
-          await this.mempoolService.removeAll(entries);
-          this.reportFailedBundle();
-          return;
+
+        if (!this.networkConfig.skipBundleValidation) {
+          try {
+            // eslint-disable-next-line @typescript-eslint/no-unused-vars
+            const { gasLimit, ...txWithoutGasLimit } = transactionRequest;
+            // some chains, like Bifrost, don't allow setting gasLimit in estimateGas
+            await relayer.estimateGas(txWithoutGasLimit);
+          } catch (err) {
+            this.logger.error(err);
+            await this.mempoolService.removeAll(entries);
+            this.reportFailedBundle();
+            return;
+          }
         }
 
         this.logger.debug(

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

@@ -341,7 +341,7 @@ export class BundlingService {
         if (!entries.length) {
           this.logger.debug("No new entries");
           return;
-        };
+        }
         // remove entries from mempool if submitAttempts are greater than maxAttemps
         const invalidEntries = entries.filter(
           (entry) => entry.submitAttempts >= this.maxSubmitAttempts
@@ -358,7 +358,7 @@ export class BundlingService {
         if (!entries.length) {
           this.logger.debug("No entries left");
           return;
-        };
+        }
         const gasFee = await getGasFee(
           this.chainId,
           this.provider,

packages/monitoring/package.json

@@ -1,6 +1,6 @@
 {
   "name": "monitoring",
-  "version": "1.0.37-alpha",
+  "version": "1.0.38-alpha",
   "description": "The Monitoring module of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://github.com/etherspot/etherspot-bundler#readme",
@@ -32,6 +32,6 @@
   },
   "dependencies": {
     "prom-client": "15.1.0",
-    "types": "^1.0.37-alpha"
+    "types": "^1.0.38-alpha"
   }
 }

packages/node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node",
-  "version": "1.0.37-alpha",
+  "version": "1.0.38-alpha",
   "description": "The bundler node module of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://https://github.com/etherspot/skandha#readme",
@@ -56,25 +56,25 @@
     "@libp2p/tcp": "6.1.0",
     "@multiformats/multiaddr": "11.4.0",
     "abstract-leveldown": "7.2.0",
-    "api": "^1.0.37-alpha",
+    "api": "^1.0.38-alpha",
     "datastore-core": "8.0.1",
-    "db": "^1.0.37-alpha",
+    "db": "^1.0.38-alpha",
     "ethers": "5.7.2",
-    "executor": "^1.0.37-alpha",
+    "executor": "^1.0.38-alpha",
     "it-filter": "1.0.2",
     "it-map": "1.0.5",
     "it-sort": "1.0.0",
     "it-take": "1.0.1",
     "libp2p": "0.42.2",
-    "monitoring": "^1.0.37-alpha",
-    "params": "^1.0.37-alpha",
+    "monitoring": "^1.0.38-alpha",
+    "params": "^1.0.38-alpha",
     "prettier": "2.8.4",
     "snappy": "7.2.2",
     "snappyjs": "0.7.0",
     "stream-to-it": "0.2.4",
     "strict-event-emitter-types": "2.0.0",
-    "types": "^1.0.37-alpha",
-    "utils": "^1.0.37-alpha",
+    "types": "^1.0.38-alpha",
+    "utils": "^1.0.38-alpha",
     "varint": "6.0.0",
     "xxhash-wasm": "1.0.2"
   },

packages/params/package.json

@@ -1,6 +1,6 @@
 {
   "name": "params",
-  "version": "1.0.37-alpha",
+  "version": "1.0.38-alpha",
   "description": "Various bundler parameters",
   "author": "Etherspot",
   "homepage": "https://github.com/etherspot/skandha#readme",
@@ -26,8 +26,8 @@
     "@eth-optimism/sdk": "3.0.0",
     "@mantleio/sdk": "0.2.1",
     "ethers": "5.7.2",
-    "types": "^1.0.37-alpha",
-    "utils": "^1.0.37-alpha"
+    "types": "^1.0.38-alpha",
+    "utils": "^1.0.38-alpha"
   },
   "scripts": {
     "clean": "rm -rf lib && rm -f *.tsbuildinfo",

packages/types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "types",
-  "version": "1.0.37-alpha",
+  "version": "1.0.38-alpha",
   "description": "The types of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://https://github.com/etherspot/skandha#readme",

packages/types/src/api/interfaces.ts

@@ -77,6 +77,7 @@ export type GetConfigResponse = {
   bundleSize: number;
   minUnstakeDelay: number;
   pvgMarkup: number;
+  skipBundleValidation: boolean;
 };
 
 export type SupportedEntryPoints = string[];

packages/utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "utils",
-  "version": "1.0.37-alpha",
+  "version": "1.0.38-alpha",
   "description": "utils of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://https://github.com/etherspot/skandha#readme",
@@ -37,6 +37,6 @@
     "case": "^1.6.3",
     "pino": "8.11.0",
     "pino-pretty": "10.0.0",
-    "types": "^1.0.37-alpha"
+    "types": "^1.0.38-alpha"
   }
 }