V2 whitelist and estimaterpc & ssz fix (#270)

lerna.json

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

package.json

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

packages/api/package.json

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

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

@@ -26,29 +26,6 @@ export class EstimateUserOperation {
   @IsString()
   signature!: BytesLike;
 
-  /**
-   * Optional properties
-   */
-  @IsBigNumber()
-  @IsOptional()
-  callGasLimit?: BigNumberish;
-
-  @IsBigNumber()
-  @IsOptional()
-  verificationGasLimit?: BigNumberish;
-
-  @IsBigNumber()
-  @IsOptional()
-  preVerificationGas?: BigNumberish;
-
-  @IsBigNumber()
-  @IsOptional()
-  maxFeePerGas?: BigNumberish;
-
-  @IsBigNumber()
-  @IsOptional()
-  maxPriorityFeePerGas?: BigNumberish;
-
   /**
    * EntryPoint v7 Properties
    */

packages/cli/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.0.26",
+  "version": "2.0.27",
   "description": "> TODO: description",
   "author": "zincoshine <psramanuj@gmail.com>",
   "homepage": "https://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": "^2.0.26",
-    "@skandha/db": "^2.0.26",
-    "@skandha/executor": "^2.0.26",
-    "@skandha/monitoring": "^2.0.26",
-    "@skandha/node": "^2.0.26",
-    "@skandha/types": "^2.0.26",
+    "@skandha/api": "^2.0.27",
+    "@skandha/db": "^2.0.27",
+    "@skandha/executor": "^2.0.27",
+    "@skandha/monitoring": "^2.0.27",
+    "@skandha/node": "^2.0.27",
+    "@skandha/types": "^2.0.27",
     "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": "2.0.26",
+  "version": "2.0.27",
   "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": "^2.0.26"
+    "@skandha/types": "^2.0.27"
   },
   "devDependencies": {
     "@types/rocksdb": "3.0.1",

packages/executor/package.json

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

packages/executor/src/config.ts

@@ -351,7 +351,7 @@ export class Config {
     /**
      * validate whitelist addresses
      */
-    for (const entity of ["paymaster", "account", "factory"]) {
+    for (const entity of ["paymaster", "account", "factory", "external"]) {
       config.whitelistedEntities[entity as IEntity] = fromEnvVar(
         `WL_${entity.toUpperCase()}`,
         config.whitelistedEntities[entity as IEntity],
@@ -393,7 +393,12 @@ const bundlerDefaultConfigs: BundlerConfig = {
   enforceGasPriceThreshold: 1000,
   eip2930: false,
   useropsTTL: 300, // 5 minutes
-  whitelistedEntities: { paymaster: [], account: [], factory: [] },
+  whitelistedEntities: {
+    paymaster: [],
+    account: [],
+    factory: [],
+    external: [],
+  },
   bundleGasLimitMarkup: 25000,
   bundleInterval: 10000, // 10 seconds
   bundleSize: 4, // max size of bundle (in terms of user ops)

packages/executor/src/interfaces.ts

@@ -222,6 +222,9 @@ export interface UserOpValidationResult {
   aggregatorInfo?: StakeInfo;
   referencedContracts?: ReferencedCodeHashes;
   storageMap?: StorageMap;
+
+  belongsToCanonicalMempool: boolean;
+  mempoolId?: string;
 }
 
 export interface ExecutionResult {

packages/executor/src/modules/eth.ts

@@ -35,6 +35,7 @@ import {
   SendUserOperationGasArgs,
 } from "./interfaces";
 import { Skandha } from "./skandha";
+import { hexlifyUserOp } from "../utils/hexlifyUserop";
 
 export class Eth {
   private pvgEstimator: IPVGEstimator | null = null;
@@ -133,6 +134,7 @@ export class Eth {
         if (nodeApi) {
           const { canonicalEntryPoint, canonicalMempoolId } = this.config;
           if (
+            validationResult.belongsToCanonicalMempool &&
             canonicalEntryPoint.toLowerCase() == entryPoint.toLowerCase() &&
             canonicalMempoolId.length > 0
           ) {
@@ -408,7 +410,7 @@ export class Eth {
           transaction = await this.provider.getTransaction(entry.transaction);
         }
         return {
-          userOperation: entry.userOp,
+          userOperation: hexlifyUserOp(entry.userOp),
           entryPoint: entry.entryPoint,
           transactionHash: transaction.hash,
           blockHash: transaction.blockHash,

packages/executor/src/services/EntryPointService/versions/0.0.7.ts

@@ -364,6 +364,7 @@ export class EntryPointV7Service implements IEntryPointService {
         decoded.aggregatorInfo.aggregator,
         decoded.aggregatorInfo.stakeInfo
       ),
+      belongsToCanonicalMempool: true,
     };
   }