Merge pull request #45 from etherspot/optimism-gas-limit

add additional pvg for optimism

Author: 0xSulpiride

lerna.json

@@ -4,7 +4,7 @@
   ],
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "0.0.9",
+  "version": "0.0.10",
   "stream": "true",
   "command": {
     "version": {

package.json

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

packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "The API module of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://https://github.com/etherspot/skandha#readme",
@@ -35,12 +35,12 @@
     "class-transformer": "0.5.1",
     "class-validator": "0.14.0",
     "ethers": "5.7.2",
-    "executor": "^0.0.9",
+    "executor": "^0.0.10",
     "fastify": "4.14.1",
     "pino": "8.11.0",
     "pino-pretty": "10.0.0",
     "reflect-metadata": "0.1.13",
-    "types": "^0.0.9"
+    "types": "^0.0.10"
   },
   "devDependencies": {
     "@types/connect": "3.4.35"

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cli",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "> TODO: description",
   "author": "zincoshine <psramanuj@gmail.com>",
   "homepage": "https://https://github.com/etherspot/skandha#readme",
@@ -31,13 +31,13 @@
     "url": "https://https://github.com/etherspot/skandha/issues"
   },
   "dependencies": {
-    "api": "^0.0.9",
-    "db": "^0.0.9",
-    "executor": "^0.0.9",
+    "api": "^0.0.10",
+    "db": "^0.0.10",
+    "executor": "^0.0.10",
     "find-up": "5.0.0",
     "got": "12.5.3",
     "js-yaml": "4.1.0",
-    "types": "^0.0.9",
+    "types": "^0.0.10",
     "yargs": "17.6.2"
   },
   "devDependencies": {

packages/db/package.json

@@ -1,6 +1,6 @@
 {
   "name": "db",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "The DB module of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://github.com/etherspot/etherspot-bundler#readme",
@@ -37,6 +37,6 @@
   "devDependencies": {
     "@types/rocksdb": "3.0.1",
     "prettier": "^2.8.4",
-    "types": "^0.0.9"
+    "types": "^0.0.10"
   }
 }

packages/executor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "executor",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "The Relayer module of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://https://github.com/etherspot/skandha#readme",
@@ -33,7 +33,7 @@
   "dependencies": {
     "async-mutex": "0.4.0",
     "ethers": "5.7.2",
-    "params": "^0.0.9",
-    "types": "^0.0.9"
+    "params": "^0.0.10",
+    "types": "^0.0.10"
   }
 }

packages/executor/src/modules/eth.ts

@@ -14,8 +14,8 @@ import {
 } from "types/lib/api/interfaces";
 import { EntryPoint__factory } from "types/lib/executor/contracts/factories";
 import { NetworkName } from "types/lib";
-import { estimateArbitrumPVG } from "params/lib/gas-estimation/arbitrum";
 import { IPVGEstimator } from "params/lib/types/IPVGEstimator";
+import { estimateOptimismPVG, estimateArbitrumPVG } from "params/lib";
 import { NetworkConfig } from "../config";
 import { deepHexlify, packUserOp } from "../utils";
 import { UserOpValidationService, MempoolService } from "../services";
@@ -41,6 +41,10 @@ export class Eth {
     ) {
       this.pvgEstimator = estimateArbitrumPVG(this.provider);
     }
+
+    if (["optimism", "optimismGoerli"].includes(this.networkName)) {
+      this.pvgEstimator = estimateOptimismPVG(this.provider);
+    }
   }
 
   /**

packages/params/package.json

@@ -1,6 +1,6 @@
 {
   "name": "params",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "Various bundler parameters",
   "author": "Etherspot",
   "homepage": "https://github.com/etherspot/skandha#readme",
@@ -21,9 +21,10 @@
     "url": "https://github.com/etherspot/skandha/issues"
   },
   "dependencies": {
-    "types": "^0.0.9",
+    "@arbitrum/sdk": "3.1.4",
+    "@eth-optimism/sdk": "3.0.0",
     "ethers": "5.7.2",
-    "@arbitrum/sdk": "3.1.4"
+    "types": "^0.0.10"
   },
   "scripts": {
     "clean": "rm -rf lib && rm -f *.tsbuildinfo",

packages/params/src/gas-estimation/index.ts

@@ -0,0 +1,2 @@
+export * from "./arbitrum";
+export * from "./optimism";

packages/params/src/gas-estimation/optimism.ts

@@ -0,0 +1,34 @@
+import { UserOperationStruct } from "types/lib/executor/contracts/EntryPoint";
+import { BigNumber, BigNumberish, ethers } from "ethers";
+import { EntryPoint__factory } from "types/lib/executor/contracts";
+import { estimateL1Gas } from "@eth-optimism/sdk";
+import { IPVGEstimator, IPVGEstimatorWrapper } from "../types/IPVGEstimator";
+
+export const estimateOptimismPVG: IPVGEstimatorWrapper = (
+  provider
+): IPVGEstimator => {
+  const dummyWallet = ethers.Wallet.createRandom();
+  return async (
+    entryPointAddr: string,
+    userOp: UserOperationStruct,
+    initial: BigNumberish
+  ): Promise<BigNumber> => {
+    const entryPoint = EntryPoint__factory.connect(entryPointAddr, provider);
+    const handleOpsData = entryPoint.interface.encodeFunctionData("handleOps", [
+      [userOp],
+      dummyWallet.address,
+    ]);
+
+    try {
+      const l1GasEstimated = await estimateL1Gas(provider, {
+        to: entryPointAddr,
+        data: handleOpsData,
+      });
+      return l1GasEstimated.add(initial);
+    } catch (err) {
+      // eslint-disable-next-line no-console
+      console.error("Error while estimating optimism PVG", err);
+      return BigNumber.from(initial);
+    }
+  };
+};