feat: some debugging tools

packages/api/src/app.ts

@@ -84,11 +84,20 @@ export class ApiApp {
     const redirectApi = new RedirectAPI(executor.networkName, this.config);
     const skandhaApi = new SkandhaAPI(executor.eth, executor.skandha);
 
-    const handleRpc = async (ip: string, request: any): Promise<any> => {
+    const handleRpc = async (
+      ip: string,
+      request: any,
+      auth: string | undefined
+    ): Promise<any> => {
       let result: any;
       const { method, params, jsonrpc, id } = request;
       // ADMIN METHODS
-      if (this.testingMode || ip === "localhost" || ip === "127.0.0.1") {
+      if (
+        this.testingMode ||
+        ip === "localhost" ||
+        ip === "127.0.0.1" ||
+        (process.env.ADMIN_KEY && auth === process.env.ADMIN_KEY)
+      ) {
         switch (method) {
           case BundlerRPCMethods.debug_bundler_setBundlingMode:
             result = await debugApi.setBundlingMode(params[0]);
@@ -107,6 +116,9 @@ export class ApiApp {
           case BundlerRPCMethods.debug_bundler_dumpMempool:
             result = await debugApi.dumpMempool(/* params[0] */);
             break;
+          case BundlerRPCMethods.debug_bundler_dumpMempoolRaw:
+            result = await debugApi.dumpMempoolRaw(/* params[0] */);
+            break;
           case BundlerRPCMethods.debug_bundler_setReputation:
             result = await debugApi.setReputation({
               reputations: params[0],
@@ -219,10 +231,12 @@ export class ApiApp {
       if (Array.isArray(req.body)) {
         response = [];
         for (const request of req.body) {
-          response.push(await handleRpc(req.ip, request));
+          response.push(
+            await handleRpc(req.ip, request, req.headers.authorization)
+          );
         }
       } else {
-        response = await handleRpc(req.ip, req.body);
+        response = await handleRpc(req.ip, req.body, req.headers.authorization);
       }
       return res.status(HttpStatus.OK).send(response);
     };

packages/api/src/constants.ts

@@ -15,6 +15,7 @@ export const BundlerRPCMethods = {
   web3_clientVersion: "web3_clientVersion",
   debug_bundler_clearState: "debug_bundler_clearState",
   debug_bundler_dumpMempool: "debug_bundler_dumpMempool",
+  debug_bundler_dumpMempoolRaw: "debug_bundler_dumpMempoolRaw",
   debug_bundler_setReputation: "debug_bundler_setReputation",
   debug_bundler_dumpReputation: "debug_bundler_dumpReputation",
   debug_bundler_setBundlingMode: "debug_bundler_setBundlingMode",

packages/api/src/modules/debug.ts

@@ -3,6 +3,7 @@ import { Debug } from "executor/lib/modules";
 import { IsEthereumAddress } from "class-validator";
 import { BundlingMode } from "types/lib/api/interfaces";
 import { GetStakeStatus } from "executor/lib/interfaces";
+import { MempoolEntrySerialized } from "executor/src/entities/interfaces";
 import { RpcMethodValidator } from "../utils/RpcMethodValidator";
 import {
   SetReputationArgs,
@@ -53,6 +54,10 @@ export class DebugAPI {
     return await this.debugModule.dumpMempool();
   }
 
+  async dumpMempoolRaw(): Promise<MempoolEntrySerialized[]> {
+    return await this.debugModule.dumpMempoolRaw();
+  }
+
   /**
    * Forces the bundler to build and execute a bundle from the mempool as handleOps() transaction
    */

packages/executor/src/modules/debug.ts

@@ -13,7 +13,10 @@ import {
   ReputationService,
 } from "../services";
 import { BundlingMode, GetStakeStatus, NetworkConfig } from "../interfaces";
-import { ReputationEntryDump } from "../entities/interfaces";
+import {
+  MempoolEntrySerialized,
+  ReputationEntryDump,
+} from "../entities/interfaces";
 import { getAddr } from "../utils";
 import { SetReputationArgs, SetMempoolArgs } from "./interfaces";
 /*
@@ -71,6 +74,15 @@ export class Debug {
       .map((entry) => entry.userOp);
   }
 
+  /**
+   * Dumps the current UserOperations mempool
+   * array - Array of UserOperations currently in the mempool
+   */
+  async dumpMempoolRaw(): Promise<MempoolEntrySerialized[]> {
+    const entries = await this.mempoolService.dump();
+    return entries.map((entry) => entry);
+  }
+
   /**
    * Forces the bundler to build and execute a bundle from the mempool as handleOps() transaction
    */

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

@@ -327,6 +327,14 @@ export class BundlingService {
   async sendNextBundle(): Promise<void> {
     await this.mutex.runExclusive(async () => {
       let relayersCount = this.relayer.getAvailableRelayersCount();
+      if (relayersCount == 0) {
+        if (
+          (await this.mempoolService.getNewEntriesSorted(this.maxBundleSize))
+            .length > 0
+        ) {
+          this.logger.debug("All relayers are busy");
+        }
+      }
       while (relayersCount-- > 0) {
         let entries = await this.mempoolService.getNewEntriesSorted(
           this.maxBundleSize