fix: adding waitForConfirmationInterval, minor fix for polling for ep8 (#375)

Author: nikhilkumar1612

lerna.json

@@ -3,7 +3,7 @@
     "packages/*"
   ],
   "npmClient": "yarn",
-  "version": "3.1.3",
+  "version": "3.2.1",
   "stream": "true",
   "command": {
     "version": {

package.json

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

packages/api/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "3.2.0",
+  "version": "3.2.1",
   "description": "The API module of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://github.com/etherspot/skandha#readme",
@@ -34,10 +34,10 @@
   "dependencies": {
     "@fastify/cors": "9.0.1",
     "@fastify/websocket": "10.0.1",
-    "@skandha/executor": "^3.2.0",
-    "@skandha/monitoring": "^3.2.0",
-    "@skandha/types": "^3.2.0",
-    "@skandha/utils": "^3.2.0",
+    "@skandha/executor": "^3.2.1",
+    "@skandha/monitoring": "^3.2.1",
+    "@skandha/types": "^3.2.1",
+    "@skandha/utils": "^3.2.1",
     "class-transformer": "0.5.1",
     "class-validator": "0.14.1",
     "dotenv": "17.2.2",

packages/cli/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "3.2.0",
+  "version": "3.2.1",
   "description": "> TODO: description",
   "author": "zincoshine <psramanuj@gmail.com>",
   "homepage": "https://github.com/etherspot/skandha#readme",
@@ -40,12 +40,12 @@
     "@libp2p/peer-id-factory": "2.0.1",
     "@libp2p/prometheus-metrics": "1.1.3",
     "@multiformats/multiaddr": "12.1.3",
-    "@skandha/api": "^3.2.0",
-    "@skandha/db": "^3.2.0",
-    "@skandha/executor": "^3.2.0",
-    "@skandha/monitoring": "^3.2.0",
-    "@skandha/node": "^3.2.0",
-    "@skandha/types": "^3.2.0",
+    "@skandha/api": "^3.2.1",
+    "@skandha/db": "^3.2.1",
+    "@skandha/executor": "^3.2.1",
+    "@skandha/monitoring": "^3.2.1",
+    "@skandha/node": "^3.2.1",
+    "@skandha/types": "^3.2.1",
     "find-up": "5.0.0",
     "got": "12.5.3",
     "js-yaml": "4.1.0",

packages/db/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "3.2.0",
+  "version": "3.2.1",
   "description": "The DB module of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://github.com/etherspot/etherspot-bundler#readme",
@@ -34,7 +34,7 @@
   "dependencies": {
     "@chainsafe/ssz": "0.10.1",
     "@farcaster/rocksdb": "5.5.0",
-    "@skandha/types": "^3.2.0"
+    "@skandha/types": "^3.2.1"
   },
   "devDependencies": {
     "@types/rocksdb": "3.0.1",

packages/executor/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "3.2.0",
+  "version": "3.2.1",
   "description": "The Relayer module of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://github.com/etherspot/skandha#readme",
@@ -35,10 +35,10 @@
   },
   "dependencies": {
     "@flashbots/ethers-provider-bundle": "0.6.2",
-    "@skandha/monitoring": "^3.2.0",
-    "@skandha/params": "^3.2.0",
-    "@skandha/types": "^3.2.0",
-    "@skandha/utils": "^3.2.0",
+    "@skandha/monitoring": "^3.2.1",
+    "@skandha/params": "^3.2.1",
+    "@skandha/types": "^3.2.1",
+    "@skandha/utils": "^3.2.1",
     "async-mutex": "0.4.0",
     "axios": "^1.9.0",
     "ethers": "5.7.2",

packages/executor/src/config.ts

@@ -246,6 +246,13 @@ export class Config {
       )
     );
 
+    config.waitForConfirmationInterval = Number(
+      fromEnvVar(
+        "WAIT_FOR_CONFIRMATION_INTERVAL",
+        config.waitForConfirmationInterval || bundlerDefaultConfigs.waitForConfirmationInterval
+      )
+    );
+
     config.bundleSize = Number(
       fromEnvVar(
         "BUNDLE_SIZE",
@@ -624,6 +631,7 @@ const bundlerDefaultConfigs: BundlerConfig = {
   },
   bundleGasLimitMarkup: 25000,
   bundleInterval: 10000, // 10 seconds
+  waitForConfirmationInterval: 1000, // 1 second
   bundleSize: 4, // max size of bundle (in terms of user ops)
   relayingMode: "classic",
   canonicalMempoolId: "",
@@ -657,7 +665,7 @@ const bundlerDefaultConfigs: BundlerConfig = {
   tenderlySave: true,
   rpcTimeout: "10s",
   eip7702: false,
-  pollingInterval: 4000,
+  pollingInterval: 3000,
   disableWatchContract: false,
   epSimulationsContract: "",
   pimlicoSimulationsContract: "",

packages/executor/src/interfaces.ts

@@ -144,6 +144,8 @@ export interface NetworkConfig {
   // Interval of bundling
   // default is 10 seconds
   bundleInterval: number;
+  // Interval to wait of entries after submission
+  waitForConfirmationInterval: number;
   // max bundle size in terms of user ops
   // default is 4
   bundleSize: number;

packages/executor/src/modules/skandha.ts

@@ -123,6 +123,8 @@ export class Skandha {
       bundleGasLimitMarkup: this.networkConfig.bundleGasLimitMarkup,
       relayingMode: this.networkConfig.relayingMode,
       bundleInterval: this.networkConfig.bundleInterval,
+      pollingInterval: this.networkConfig.pollingInterval,
+      waitForConfirmationInterval: this.networkConfig.waitForConfirmationInterval,
       bundleSize: this.networkConfig.bundleSize,
       canonicalMempoolId: this.networkConfig.canonicalMempoolId,
       canonicalEntryPoint: this.networkConfig.canonicalEntryPoint,

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

@@ -21,7 +21,7 @@ import { ExecutorEventBus } from "../../SubscriptionService.js";
 import { EntryPointService } from "../../EntryPointService/index.js";
 import { getViemChainDef } from "../utils/chains.js";
 
-const WAIT_FOR_TX_MAX_RETRIES = 3; // 3 blocks
+const WAIT_FOR_TX_MAX_RETRIES = 120; // 3 blocks
 
 export abstract class BaseRelayer implements IRelayingMode {
   protected relayers: Relayer[];
@@ -86,7 +86,7 @@ export abstract class BaseRelayer implements IRelayingMode {
         }
         clearInterval(interval);
         resolve();
-      }, this.networkConfig.bundleInterval);
+      }, this.networkConfig.waitForConfirmationInterval);
     });
   }