feat: adding tenderly simulation for userop validation

lerna.json

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

package.json

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

packages/api/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.5.34",
+  "version": "1.5.35",
   "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": "^1.5.34",
-    "@skandha/monitoring": "^1.5.34",
-    "@skandha/types": "^1.5.34",
-    "@skandha/utils": "^1.5.34",
+    "@skandha/executor": "^1.5.35",
+    "@skandha/monitoring": "^1.5.35",
+    "@skandha/types": "^1.5.35",
+    "@skandha/utils": "^1.5.35",
     "class-transformer": "0.5.1",
     "class-validator": "0.14.1",
     "ethers": "5.7.2",

packages/cli/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.5.34",
+  "version": "1.5.35",
   "description": "> TODO: description",
   "author": "zincoshine <[email protected]>",
   "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": "^1.5.34",
-    "@skandha/db": "^1.5.34",
-    "@skandha/executor": "^1.5.34",
-    "@skandha/monitoring": "^1.5.34",
-    "@skandha/node": "^1.5.34",
-    "@skandha/types": "^1.5.34",
+    "@skandha/api": "^1.5.35",
+    "@skandha/db": "^1.5.35",
+    "@skandha/executor": "^1.5.35",
+    "@skandha/monitoring": "^1.5.35",
+    "@skandha/node": "^1.5.35",
+    "@skandha/types": "^1.5.35",
     "find-up": "5.0.0",
     "got": "12.5.3",
     "js-yaml": "4.1.0",

packages/contracts/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.5.34",
+  "version": "1.5.35",
   "description": "Smart contracts of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://https://github.com/etherspot/skandha#readme",

packages/db/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.5.34",
+  "version": "1.5.35",
   "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": "^1.5.34"
+    "@skandha/types": "^1.5.35"
   },
   "devDependencies": {
     "@types/rocksdb": "3.0.1",

packages/executor/package.json

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

packages/executor/src/config.ts

@@ -346,6 +346,20 @@ export class Config {
       )
     );
 
+    config.tenderlyApiUrl = String(
+      fromEnvVar(
+        "TENDERLY_API_URL",
+        config.tenderlyApiUrl || bundlerDefaultConfigs.tenderlyApiUrl
+      )
+    );
+
+    config.tenderlyKey = String(
+      fromEnvVar(
+        "TENDERLY_KEY",
+        config.tenderlyKey || bundlerDefaultConfigs.tenderlyKey
+      )
+    );
+
     config.blockscoutApiKeys = fromEnvVar(
       "BLOCKSCOUT_API_KEYS",
       config.blockscoutApiKeys != undefined
@@ -433,6 +447,8 @@ const bundlerDefaultConfigs: BundlerConfig = {
   fastlaneValidators: [],
   blockscoutUrl: "",
   blockscoutApiKeys: [],
+  tenderlyApiUrl: "",
+  tenderlyKey: "",
 };
 
 function getEnvVar<T>(envVar: string, fallback: T): T | string {

packages/executor/src/interfaces.ts

@@ -176,6 +176,8 @@ export interface NetworkConfig {
   fastlaneValidators: string[];
   blockscoutUrl: string;
   blockscoutApiKeys: string[];
+  tenderlyApiUrl: string;
+  tenderlyKey: string;
 }
 
 export type BundlerConfig = Omit<

packages/executor/src/modules/skandha.ts

@@ -170,6 +170,8 @@ export class Skandha {
       vglMarkupPercent: this.networkConfig.vglMarkupPercent,
       blockscoutUrl: this.networkConfig.blockscoutUrl,
       blockscoutApiKeys: this.networkConfig.blockscoutApiKeys.length,
+      tenderlyApiUrl: this.networkConfig.tenderlyApiUrl,
+      tenderlyKey: this.networkConfig.tenderlyKey,
     };
   }
 

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

@@ -51,6 +51,7 @@ export class UserOpValidationService {
     );
     this.unsafeValidationService = new UnsafeValidationService(
       this.provider,
+      this.chainId,
       this.networkConfig,
       this.logger
     );

packages/executor/src/services/UserOpValidation/validators/tenderly.ts

@@ -0,0 +1,53 @@
+import { UserOperationStruct } from "@skandha/types/lib/executor/contracts/EntryPoint";
+import { IEntryPoint } from "@skandha/types/src/executor/contracts";
+import axios from "axios";
+import { BigNumber, constants } from "ethers";
+import { Logger } from "@skandha/types/lib";
+
+export class TenderlyValidationService {
+  constructor(
+    private tenderlyApiUrl: string,
+    private tenderlyAccessKey: string,
+    private chainId: number,
+    private logger: Logger
+  ) {}
+
+  async validate(
+    userOp: UserOperationStruct,
+    entryPoint: IEntryPoint,
+    gasLimit?: BigNumber
+  ): Promise<any> {
+    const config = {
+      method: "post",
+      url: `${this.tenderlyApiUrl}/simulate`,
+      headers: {
+        "Content-Type": "application/json",
+        "X-Access-Key": this.tenderlyAccessKey,
+      },
+      data: JSON.stringify({
+        network_id: `${this.chainId}`,
+        from: constants.AddressZero,
+        to: entryPoint.address,
+        input: entryPoint.interface.encodeFunctionData("simulateValidation", [
+          userOp,
+        ]),
+        gas: gasLimit?.toNumber(),
+      }),
+    };
+    return await axios
+      .request(config)
+      .then((response) => {
+        const parsed = entryPoint.interface.parseError(
+          response.data.transaction.transaction_info.call_trace.error_hex_data
+        );
+        return {
+          ...parsed,
+          errorName: parsed.name,
+          errorArgs: parsed.args,
+        };
+      })
+      .catch((err) => {
+        this.logger.error(`Tenderly validation failed: ${err}`);
+      });
+  }
+}

packages/executor/src/services/UserOpValidation/validators/unsafe.ts

@@ -2,16 +2,30 @@ import { IEntryPoint__factory } from "@skandha/types/lib/executor/contracts";
 import { UserOperationStruct } from "@skandha/types/lib/executor/contracts/EntryPoint";
 import { Contract, providers, constants } from "ethers";
 import { Logger } from "@skandha/types/lib";
+import * as RpcErrorCodes from "@skandha/types/lib/api/errors/rpc-error-codes";
+import RpcError from "@skandha/types/lib/api/errors/rpc-error";
 import { NetworkConfig, UserOpValidationResult } from "../../../interfaces";
 import { nonGethErrorHandler, parseErrorResult } from "../utils";
 import { getUserOpGasLimit } from "../../BundlingService/utils";
+import { TenderlyValidationService } from "./tenderly";
 
 export class UnsafeValidationService {
+  private tenderlyValidationService: TenderlyValidationService | null = null;
   constructor(
     private provider: providers.Provider,
+    private chainId: number,
     private networkConfig: NetworkConfig,
     private logger: Logger
-  ) {}
+  ) {
+    if (networkConfig.tenderlyKey && networkConfig.tenderlyApiUrl) {
+      this.tenderlyValidationService = new TenderlyValidationService(
+        networkConfig.tenderlyApiUrl,
+        networkConfig.tenderlyKey,
+        chainId,
+        logger
+      );
+    }
+  }
 
   async validateUnsafely(
     userOp: UserOperationStruct,
@@ -30,12 +44,38 @@ export class UnsafeValidationService {
         )
       : undefined;
 
-    const errorResult = await entryPointContract.callStatic
-      .simulateValidation(userOp, {
-        gasLimit,
-      })
-      .catch((e: any) => nonGethErrorHandler(entryPointContract, e));
-    return parseErrorResult(userOp, errorResult, false);
+    let errorResult;
+
+    if (this.tenderlyValidationService) {
+      errorResult = await this.tenderlyValidationService.validate(
+        userOp,
+        entryPointContract,
+        gasLimit
+      );
+    } else {
+      errorResult = await entryPointContract.callStatic
+        .simulateValidation(userOp, {
+          gasLimit,
+        })
+        .catch((e: any) => nonGethErrorHandler(entryPointContract, e));
+    }
+
+    const result = parseErrorResult(userOp, errorResult, false);
+
+    const { returnInfo } = result;
+    if (returnInfo.sigFailed) {
+      throw new RpcError(
+        "Invalid UserOp signature or paymaster signature",
+        RpcErrorCodes.INVALID_SIGNATURE
+      );
+    }
+
+    const now = Math.floor(Date.now() / 1000);
+    if (returnInfo.validUntil != null && returnInfo.validUntil < now) {
+      throw new RpcError("already expired", RpcErrorCodes.USEROP_EXPIRED);
+    }
+
+    return result;
   }
 
   async validateUnsafelyWithForwarder(

packages/monitoring/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.5.34",
+  "version": "1.5.35",
   "description": "The Monitoring module of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://github.com/etherspot/etherspot-bundler#readme",
@@ -32,7 +32,7 @@
     "check-readme": "typescript-docs-verifier"
   },
   "dependencies": {
-    "@skandha/types": "^1.5.34",
+    "@skandha/types": "^1.5.35",
     "prom-client": "^14.2.0"
   }
 }

packages/node/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.5.34",
+  "version": "1.5.35",
   "description": "The bundler node module of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://https://github.com/etherspot/skandha#readme",
@@ -56,13 +56,13 @@
     "@libp2p/prometheus-metrics": "1.1.3",
     "@libp2p/tcp": "6.1.0",
     "@multiformats/multiaddr": "11.4.0",
-    "@skandha/api": "^1.5.34",
-    "@skandha/db": "^1.5.34",
-    "@skandha/executor": "^1.5.34",
-    "@skandha/monitoring": "^1.5.34",
-    "@skandha/params": "^1.5.34",
-    "@skandha/types": "^1.5.34",
-    "@skandha/utils": "^1.5.34",
+    "@skandha/api": "^1.5.35",
+    "@skandha/db": "^1.5.35",
+    "@skandha/executor": "^1.5.35",
+    "@skandha/monitoring": "^1.5.35",
+    "@skandha/params": "^1.5.35",
+    "@skandha/types": "^1.5.35",
+    "@skandha/utils": "^1.5.35",
     "@types/varint": "6.0.1",
     "abstract-leveldown": "7.2.0",
     "datastore-core": "8.0.1",

packages/params/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.5.34",
+  "version": "1.5.35",
   "description": "Various bundler parameters",
   "author": "Etherspot",
   "homepage": "https://github.com/etherspot/skandha#readme",
@@ -28,8 +28,8 @@
     "@arbitrum/sdk": "3.1.4",
     "@chainsafe/ssz": "0.10.1",
     "@mantleio/sdk": "0.2.1",
-    "@skandha/types": "^1.5.34",
-    "@skandha/utils": "^1.5.34",
+    "@skandha/types": "^1.5.35",
+    "@skandha/utils": "^1.5.35",
     "ethers": "5.7.2"
   },
   "scripts": {

packages/types/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.5.34",
+  "version": "1.5.35",
   "description": "The types of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://https://github.com/etherspot/skandha#readme",

packages/types/src/api/interfaces.ts

@@ -101,6 +101,8 @@ export type GetConfigResponse = {
   vglMarkupPercent: number;
   blockscoutUrl: string;
   blockscoutApiKeys: number;
+  tenderlyApiUrl: string;
+  tenderlyKey: string;
 };
 
 export type SupportedEntryPoints = string[];