Configurable markup on bundle's gas limit

README.md

@@ -99,7 +99,8 @@ Or follow the steps below:
         "factory": [],
         "paymaster": [],
         "account": []
-      }
+      },
+      "bundleGasLimitMarkup": 25000 # adds some amount of additional gas to a bundle tx
     }
   }
 }

lerna.json

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

package.json

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

packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api",
-  "version": "1.0.23-alpha",
+  "version": "1.0.24-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.23-alpha",
+    "executor": "^1.0.24-alpha",
     "fastify": "4.14.1",
-    "monitoring": "^1.0.23-alpha",
+    "monitoring": "^1.0.24-alpha",
     "pino": "8.11.0",
     "pino-pretty": "10.0.0",
     "reflect-metadata": "0.1.13",
-    "types": "^1.0.23-alpha"
+    "types": "^1.0.24-alpha"
   },
   "devDependencies": {
     "@types/connect": "3.4.35"

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cli",
-  "version": "1.0.23-alpha",
+  "version": "1.0.24-alpha",
   "description": "> TODO: description",
   "author": "zincoshine <psramanuj@gmail.com>",
   "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.23-alpha",
-    "db": "^1.0.23-alpha",
-    "executor": "^1.0.23-alpha",
+    "api": "^1.0.24-alpha",
+    "db": "^1.0.24-alpha",
+    "executor": "^1.0.24-alpha",
     "find-up": "5.0.0",
     "got": "12.5.3",
     "js-yaml": "4.1.0",
-    "monitoring": "^1.0.23-alpha",
-    "node": "^1.0.23-alpha",
-    "types": "^1.0.23-alpha",
+    "monitoring": "^1.0.24-alpha",
+    "node": "^1.0.24-alpha",
+    "types": "^1.0.24-alpha",
     "yargs": "17.6.2"
   },
   "devDependencies": {

packages/db/package.json

@@ -1,6 +1,6 @@
 {
   "name": "db",
-  "version": "1.0.23-alpha",
+  "version": "1.0.24-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.23-alpha"
+    "types": "^1.0.24-alpha"
   },
   "devDependencies": {
     "@types/rocksdb": "3.0.1",

packages/executor/package.json

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

packages/executor/src/config.ts

@@ -239,22 +239,27 @@ export class Config {
           bundlerDefaultConfigs.estimationStaticBuffer
       )
     );
-
     conf.minStake = BigNumber.from(
       fromEnvVar(
         network,
         "MIN_STAKE",
         conf.minStake ?? bundlerDefaultConfigs.minStake
       )
     );
-
     conf.minUnstakeDelay = Number(
       fromEnvVar(
         network,
         "MIN_UNSTAKE_DELAY",
         conf.minUnstakeDelay || bundlerDefaultConfigs.minUnstakeDelay
       )
     );
+    conf.bundleGasLimitMarkup = Number(
+      fromEnvVar(
+        network,
+        "BUNDLE_GAS_LIMIT_MARKUP",
+        conf.bundleGasLimitMarkup || bundlerDefaultConfigs.bundleGasLimitMarkup
+      )
+    );
 
     // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
     if (!conf.whitelistedEntities) {
@@ -307,6 +312,7 @@ const bundlerDefaultConfigs: BundlerConfig = {
   eip2930: false,
   useropsTTL: 300, // 5 minutes
   whitelistedEntities: { paymaster: [], account: [], factory: [] },
+  bundleGasLimitMarkup: 25000,
 };
 
 const NETWORKS_ENV = (): string[] | undefined => {

packages/executor/src/interfaces.ts

@@ -129,6 +129,8 @@ export interface NetworkConfig {
   // Entities that bypass stake and opcode validation
   // https://eips.ethereum.org/EIPS/eip-4337#alternative-mempools
   whitelistedEntities: IWhitelistedEntities;
+  // adds some amount of gas to a estimated bundle
+  bundleGasLimitMarkup: number;
 }
 
 export type BundlerConfig = Omit<

packages/executor/src/services/BundlingService.ts

@@ -546,7 +546,7 @@ export class BundlingService {
   }
 
   private async estimateBundleGas(bundle: MempoolEntry[]): Promise<BigNumber> {
-    let gasLimit = BigNumber.from(0);
+    let gasLimit = BigNumber.from(this.networkConfig.bundleGasLimitMarkup);
     for (const { userOp } of bundle) {
       gasLimit = BigNumber.from(userOp.verificationGasLimit)
         .mul(3)

packages/monitoring/package.json

@@ -1,6 +1,6 @@
 {
   "name": "monitoring",
-  "version": "1.0.23-alpha",
+  "version": "1.0.24-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": "^14.2.0",
-    "types": "^1.0.23-alpha"
+    "types": "^1.0.24-alpha"
   }
 }

packages/node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node",
-  "version": "1.0.23-alpha",
+  "version": "1.0.24-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.23-alpha",
+    "api": "^1.0.24-alpha",
     "datastore-core": "8.0.1",
-    "db": "^1.0.23-alpha",
+    "db": "^1.0.24-alpha",
     "ethers": "5.7.2",
-    "executor": "^1.0.23-alpha",
+    "executor": "^1.0.24-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.23-alpha",
-    "params": "^1.0.23-alpha",
+    "monitoring": "^1.0.24-alpha",
+    "params": "^1.0.24-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.23-alpha",
-    "utils": "^1.0.23-alpha",
+    "types": "^1.0.24-alpha",
+    "utils": "^1.0.24-alpha",
     "varint": "6.0.0",
     "xxhash-wasm": "1.0.2"
   },

packages/params/package.json

@@ -1,6 +1,6 @@
 {
   "name": "params",
-  "version": "1.0.23-alpha",
+  "version": "1.0.24-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.23-alpha",
-    "utils": "^1.0.23-alpha"
+    "types": "^1.0.24-alpha",
+    "utils": "^1.0.24-alpha"
   },
   "scripts": {
     "clean": "rm -rf lib && rm -f *.tsbuildinfo",

packages/types/package.json

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

packages/utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "utils",
-  "version": "1.0.23-alpha",
+  "version": "1.0.24-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.23-alpha"
+    "types": "^1.0.24-alpha"
   }
 }