feat: whitelist external entities && dont gossip whitelisted userops …

…to canonical mempool
etherspot · Dec 20, 2024 · d3345d0 · d3345d0
1 parent 3552019
commit d3345d0
Show file tree

Hide file tree

Showing 7 changed files with 194 additions and 144 deletions.
diff --git a/packages/executor/src/config.ts b/packages/executor/src/config.ts
@@ -362,7 +362,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],
@@ -403,7 +403,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)

diff --git a/packages/executor/src/interfaces.ts b/packages/executor/src/interfaces.ts
@@ -221,6 +221,8 @@ export interface UserOpValidationResult {
   aggregatorInfo?: StakeInfo;
   referencedContracts?: ReferencedCodeHashes;
   storageMap?: StorageMap;
+  belongsToCanonicalMempool: boolean;
+  mempoolId?: string;
 }
 
 export interface ExecutionResult {

diff --git a/packages/executor/src/modules/eth.ts b/packages/executor/src/modules/eth.ts
@@ -125,7 +125,7 @@ export class Eth {
 
     try {
       const nodeApi = this.getNodeAPI();
-      if (nodeApi) {
+      if (validationResult.belongsToCanonicalMempool && nodeApi) {
         const { canonicalEntryPoint, canonicalMempoolId } = this.config;
         if (
           canonicalEntryPoint.toLowerCase() == entryPoint.toLowerCase() &&

diff --git a/packages/executor/src/services/UserOpValidation/utils.ts b/packages/executor/src/services/UserOpValidation/utils.ts
@@ -51,7 +51,8 @@ export function nonGethErrorHandler(
 
 export function parseErrorResult(
   userOp: UserOperationStruct,
-  errorResult: { errorName: string; errorArgs: any }
+  errorResult: { errorName: string; errorArgs: any },
+  belongsToCanonicalMempool: boolean = true
 ): UserOpValidationResult {
   if (!errorResult?.errorName?.startsWith("ValidationResult")) {
     // parse it as FailedOp
@@ -106,6 +107,7 @@ export function parseErrorResult(
       aggregatorInfo?.actualAggregator,
       aggregatorInfo?.stakeInfo
     ),
+    belongsToCanonicalMempool,
   };
 }