feat: EntryPoint v7 support

README.md

@@ -61,6 +61,9 @@ Or follow the steps below:
 - `--unsafeMode` - enables unsafeMode
 - `--redirectRpc` - enables redirecting eth rpc calls
 - `--executor.bundlingMode manual|auto` - sets bundling mode to `manual` or `auto` on start. Default value is `auto`
+- `--metrics.enable false|true` - enable Prometheus metrics (default - `false`)
+- `--metrics.host` - metrics host (default - `127.0.0.1`)
+- `--metrics.port` - metrics port (default - `8008`)
 
 ## 🔑 Relayer Configuration
 

packages/api/src/dto/EstimateUserOperation.dto.ts

@@ -2,24 +2,24 @@ import {
   IsDefined,
   IsEthereumAddress,
   IsObject,
+  IsOptional,
   IsString,
   ValidateNested,
 } from "class-validator";
 import { BigNumberish, BytesLike } from "ethers";
 import { Type } from "class-transformer";
 import { IsBigNumber } from "../utils/is-bignumber";
-import { IsCallData } from "../utils/IsCallCode";
 
-export class EstimateUserOperationStruct {
+export class EstimateUserOperation {
+  /**
+   * Common Properties
+   */
   @IsEthereumAddress()
   sender!: string;
   @IsBigNumber()
   nonce!: BigNumberish;
-  @IsString()
-  @IsCallData()
-  initCode!: BytesLike;
-  @IsString()
-  callData!: BytesLike;
+  @IsBigNumber()
+  callGasLimit?: BigNumberish;
   @IsBigNumber()
   verificationGasLimit?: BigNumberish;
   @IsBigNumber()
@@ -29,20 +29,44 @@ export class EstimateUserOperationStruct {
   @IsBigNumber()
   maxPriorityFeePerGas?: BigNumberish;
   @IsString()
-  @IsCallData()
-  paymasterAndData?: BytesLike;
+  callData!: BytesLike;
   @IsString()
   signature!: BytesLike;
+
+  /**
+   * EntryPoint v7 Properties
+   */
+  @IsEthereumAddress()
+  @IsOptional()
+  factory?: string;
+
+  @IsString()
+  @IsOptional()
+  factoryData?: BytesLike;
+
+  @IsEthereumAddress()
+  @IsOptional()
+  paymaster?: string;
+
   @IsBigNumber()
-  callGasLimit!: BigNumberish;
+  @IsOptional()
+  paymasterVerificationGasLimit?: BigNumberish;
+
+  @IsBigNumber()
+  @IsOptional()
+  paymasterPostOpGasLimit?: BigNumberish;
+
+  @IsString()
+  @IsOptional()
+  paymasterData?: BytesLike;
 }
 
 export class EstimateUserOperationGasArgs {
   @IsDefined()
   @IsObject()
   @ValidateNested()
-  @Type(() => EstimateUserOperationStruct)
-  userOp!: EstimateUserOperationStruct;
+  @Type(() => EstimateUserOperation)
+  userOp!: EstimateUserOperation;
 
   @IsEthereumAddress()
   entryPoint!: string;

packages/api/src/dto/SendUserOperation.dto.ts

@@ -2,24 +2,24 @@ import {
   IsDefined,
   IsEthereumAddress,
   IsObject,
+  IsOptional,
   IsString,
   ValidateNested,
 } from "class-validator";
 import { BigNumberish, BytesLike } from "ethers";
 import { Type } from "class-transformer";
 import { IsBigNumber } from "../utils/is-bignumber";
-import { IsCallData } from "../utils/IsCallCode";
 
-export class SendUserOperationStruct {
+export class SendUserOperation {
+  /**
+   * Common Properties
+   */
   @IsEthereumAddress()
   sender!: string;
   @IsBigNumber()
   nonce!: BigNumberish;
-  @IsString()
-  @IsCallData()
-  initCode!: BytesLike;
-  @IsString()
-  callData!: BytesLike;
+  @IsBigNumber()
+  callGasLimit!: BigNumberish;
   @IsBigNumber()
   verificationGasLimit!: BigNumberish;
   @IsBigNumber()
@@ -29,20 +29,44 @@ export class SendUserOperationStruct {
   @IsBigNumber()
   maxPriorityFeePerGas!: BigNumberish;
   @IsString()
-  @IsCallData()
-  paymasterAndData!: BytesLike;
+  callData!: BytesLike;
   @IsString()
   signature!: BytesLike;
+
+  /**
+   * EntryPoint v7 Properties
+   */
+  @IsEthereumAddress()
+  @IsOptional()
+  factory?: string;
+
+  @IsString()
+  @IsOptional()
+  factoryData?: BytesLike;
+
+  @IsEthereumAddress()
+  @IsOptional()
+  paymaster?: string;
+
   @IsBigNumber()
-  callGasLimit!: BigNumberish;
+  @IsOptional()
+  paymasterVerificationGasLimit?: BigNumberish;
+
+  @IsBigNumber()
+  @IsOptional()
+  paymasterPostOpGasLimit?: BigNumberish;
+
+  @IsString()
+  @IsOptional()
+  paymasterData?: BytesLike;
 }
 
 export class SendUserOperationGasArgs {
   @IsDefined()
   @IsObject()
   @ValidateNested()
-  @Type(() => SendUserOperationStruct)
-  userOp!: SendUserOperationStruct;
+  @Type(() => SendUserOperation)
+  userOp!: SendUserOperation;
 
   @IsEthereumAddress()
   entryPoint!: string;

packages/api/src/dto/SetMempool.dto.ts

@@ -4,13 +4,13 @@ import {
   IsEthereumAddress,
   ValidateNested,
 } from "class-validator";
-import { SendUserOperationStruct } from "./SendUserOperation.dto";
+import { SendUserOperation } from "./SendUserOperation.dto";
 
 export class SetMempoolArgs {
   @IsDefined()
   @IsArray()
   @ValidateNested()
-  userOps!: SendUserOperationStruct[];
+  userOps!: SendUserOperation[];
 
   @IsEthereumAddress()
   entryPoint!: string;

packages/api/src/modules/debug.ts

@@ -1,4 +1,4 @@
-import { UserOperationStruct } from "types/lib/executor/contracts/EntryPoint";
+import { UserOperation } from "types/lib/contracts/UserOperation";
 import { Debug } from "executor/lib/modules";
 import { IsEthereumAddress } from "class-validator";
 import { BundlingMode } from "types/lib/api/interfaces";
@@ -49,7 +49,7 @@ export class DebugAPI {
    * Dumps the current UserOperations mempool
    * array - Array of UserOperations currently in the mempool
    */
-  async dumpMempool(): Promise<UserOperationStruct[]> {
+  async dumpMempool(): Promise<UserOperation[]> {
     return await this.debugModule.dumpMempool();
   }
 

packages/api/src/utils/RpcMethodValidator.ts

@@ -29,7 +29,11 @@ export function validationFactory<T>(
             arguments: args[0],
           },
         });
-        throw new RpcError("Invalid Request", RpcErrorCodes.INVALID_REQUEST);
+        throw new RpcError("Invalid Request", RpcErrorCodes.INVALID_REQUEST, {
+          data: {
+            errors,
+          },
+        });
       }
 
       return method.apply(this, args);

packages/cli/src/cmds/node/handler.ts

@@ -12,76 +12,78 @@ import { getVersionData } from "../../util/version";
 import { initPeerIdAndEnr } from "./initPeerIdAndEnr";
 
 export async function nodeHandler(args: IGlobalArgs): Promise<void> {
-  const params = await getNodeConfigFromArgs(args);
-
-  //create the necessary directories
-  mkdir(params.dataDir);
-
   logger.info("  ___                                            ___  ");
   logger.info(" (o o)                                          (o o) ");
   logger.info("(  V  ) Skandha - A modular typescript bundler (  V  )");
   logger.info("--m-m--------------------------------------------m-m--");
+  logger.info("P2P is not yet available for EntryPoint v7. Stay tuned");
+  return;
 
-  logger.info(`Using the configFile from ${params.configFile}`);
-  logger.info(`Initialised the dataDir at ${params.dataDir}`);
-  logger.info("Boot ENR: " + params.p2p["bootEnrs"].length);
+  // const params = await getNodeConfigFromArgs(args);
 
-  let config: Config;
-  try {
-    const networkConfig = readFile(params.configFile) as NetworkConfig;
-    config = await Config.init({
-      config: networkConfig,
-      testingMode: params.testingMode,
-      unsafeMode: params.unsafeMode,
-      redirectRpc: params.redirectRpc,
-    });
-  } catch (err) {
-    if (err instanceof Error && err.message.indexOf("chain id") > -1) {
-      logger.error(err.message);
-      return;
-    }
-    logger.info("Config file not found. Proceeding with env vars...");
-    config = await Config.init({
-      config: null,
-      testingMode: params.testingMode,
-      unsafeMode: params.unsafeMode,
-      redirectRpc: params.redirectRpc,
-    });
-  }
+  // //create the necessary directories
+  // mkdir(params.dataDir);
 
-  const db = new RocksDbController(
-    params.dataDir,
-    getNamespaceByValue(Namespace.userOps)
-  );
-  await db.start();
+  // logger.info(`Using the configFile from ${params.configFile}`);
+  // logger.info(`Initialised the dataDir at ${params.dataDir}`);
+  // logger.info("Boot ENR: " + params.p2p["bootEnrs"].length);
 
-  const { enr, peerId } = await initPeerIdAndEnr(args, logger);
+  // let config: Config;
+  // try {
+  //   const networkConfig = readFile(params.configFile) as NetworkConfig;
+  //   config = await Config.init({
+  //     config: networkConfig,
+  //     testingMode: params.testingMode,
+  //     unsafeMode: params.unsafeMode,
+  //     redirectRpc: params.redirectRpc,
+  //   });
+  // } catch (err) {
+  //   if (err instanceof Error && err.message.indexOf("chain id") > -1) {
+  //     logger.error(err.message);
+  //     return;
+  //   }
+  //   logger.info("Config file not found. Proceeding with env vars...");
+  //   config = await Config.init({
+  //     config: null,
+  //     testingMode: params.testingMode,
+  //     unsafeMode: params.unsafeMode,
+  //     redirectRpc: params.redirectRpc,
+  //   });
+  // }
 
-  const options: IBundlerNodeOptions = {
-    ...defaultOptions,
-    api: {
-      port: params.api["port"],
-      address: params.api["address"],
-      cors: params.api["cors"],
-      enableRequestLogging: params.api["enableRequestLogging"],
-    },
-    network: initNetworkOptions(enr, params.p2p, params.dataDir),
-  };
+  // const db = new RocksDbController(
+  //   params.dataDir,
+  //   getNamespaceByValue(Namespace.userOps)
+  // );
+  // await db.start();
+
+  // const { enr, peerId } = await initPeerIdAndEnr(args, logger);
+
+  // const options: IBundlerNodeOptions = {
+  //   ...defaultOptions,
+  //   api: {
+  //     port: params.api["port"],
+  //     address: params.api["address"],
+  //     cors: params.api["cors"],
+  //     enableRequestLogging: params.api["enableRequestLogging"],
+  //   },
+  //   network: initNetworkOptions(enr, params.p2p, params.dataDir),
+  // };
 
-  const version = getVersionData();
-  const node = await BundlerNode.init({
-    nodeOptions: options,
-    relayersConfig: config,
-    relayerDb: db,
-    testingMode: params.testingMode,
-    redirectRpc: params.redirectRpc,
-    bundlingMode: params.executor.bundlingMode,
-    peerId,
-    metricsOptions: params.metrics,
-    version,
-  });
+  // const version = getVersionData();
+  // const node = await BundlerNode.init({
+  //   nodeOptions: options,
+  //   relayersConfig: config,
+  //   relayerDb: db,
+  //   testingMode: params.testingMode,
+  //   redirectRpc: params.redirectRpc,
+  //   bundlingMode: params.executor.bundlingMode,
+  //   peerId,
+  //   metricsOptions: params.metrics,
+  //   version,
+  // });
 
-  await node.start();
+  // await node.start();
 }
 
 export async function getNodeConfigFromArgs(args: IGlobalArgs): Promise<{

packages/executor/src/config.ts

@@ -73,7 +73,7 @@ export class Config {
   }
 
   isEntryPointSupported(entryPoint: string): boolean {
-    return !!this.config.entryPoints.some(
+    return this.config.entryPoints.some(
       (addr) => addr.toLowerCase() === entryPoint.toLowerCase()
     );
   }
@@ -82,7 +82,7 @@ export class Config {
     if (config == null) config = {} as NetworkConfig;
     config.entryPoints = fromEnvVar(
       "ENTRYPOINTS",
-      config.entryPoints,
+      config.entryPoints || [],
       true
     ) as string[];