Merge pull request #49 from etherspot/l2-gas-fees

change docs & set query limit on read receipt & set mumbai gas oracle

lerna.json

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

package.json

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

packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "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.13",
+    "executor": "^0.0.14",
     "fastify": "4.14.1",
     "pino": "8.11.0",
     "pino-pretty": "10.0.0",
     "reflect-metadata": "0.1.13",
-    "types": "^0.0.13"
+    "types": "^0.0.14"
   },
   "devDependencies": {
     "@types/connect": "3.4.35"

packages/api/src/server.ts

@@ -54,7 +54,7 @@ export class Server {
 
   setup(): void {
     this.app.get("*", () => {
-      return "GET requests are not supported. Visit https://docs.etherspot.io/etherspot-skandha-bundler";
+      return "GET requests are not supported. Visit https://skandha.fyi";
     });
   }
 

packages/cli/package.json

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

packages/db/package.json

@@ -1,6 +1,6 @@
 {
   "name": "db",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "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.13"
+    "types": "^0.0.14"
   }
 }

packages/executor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "executor",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "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.13",
-    "types": "^0.0.13"
+    "params": "^0.0.14",
+    "types": "^0.0.14"
   }
 }

packages/executor/src/modules/eth.ts

@@ -356,8 +356,16 @@ export class Eth {
     for (const addr of await this.getSupportedEntryPoints()) {
       const contract = EntryPoint__factory.connect(addr, this.provider);
       try {
+        const blockNumber = await this.provider.getBlockNumber();
+        let fromBlockNumber = blockNumber - 15000; // limit query to 15k blocks, otherwise it throw timeout error
+        // underflow check
+        if (fromBlockNumber < 0) {
+          fromBlockNumber = blockNumber;
+        }
+
         event = await contract.queryFilter(
-          contract.filters.UserOperationEvent(userOpHash)
+          contract.filters.UserOperationEvent(userOpHash),
+          fromBlockNumber
         );
         // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
         if (event[0]) {

packages/executor/src/utils/getGasFee.ts

@@ -22,13 +22,22 @@ export const getGasFee = async (
 
   if (network === "optimism") {
     try {
-      return getOptimismGasFee();
+      return await getOptimismGasFee();
     } catch (err) {
       // eslint-disable-next-line no-console
       console.error(`Couldn't fetch fee data for optimism: ${err}`);
     }
   }
 
+  if (network === "mumbai") {
+    try {
+      return await getMumbaiGasFee();
+    } catch (err) {
+      // eslint-disable-next-line no-console
+      console.error(`Couldn't fetch fee data for mumbai: ${err}`);
+    }
+  }
+
   try {
     const feeData = await provider.getFeeData();
     return {
@@ -65,6 +74,16 @@ export const getMaticGasFee = async (): Promise<IGetGasFeeResult> => {
   };
 };
 
+export const getMumbaiGasFee = async (): Promise<IGetGasFeeResult> => {
+  const oracle = "https://gasstation-testnet.polygon.technology/v2";
+  const data = await (await fetch(oracle)).json();
+  return {
+    maxPriorityFeePerGas: parseGwei(data.fast.maxPriorityFee),
+    maxFeePerGas: parseGwei(data.fast.maxFee),
+    gasPrice: parseGwei(data.fast.maxFee),
+  };
+};
+
 export const getEtherscanGasFee = async (
   apiUrl: string,
   apiKey: string | undefined = undefined

packages/params/package.json

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

packages/params/src/types/IGetL1Cost.ts

@@ -0,0 +1,7 @@
+import { BigNumber, providers } from "ethers";
+
+export type IGetL1GasPriceWrapper = (
+  provider: providers.StaticJsonRpcProvider
+) => IGetL1GasPrice;
+
+export type IGetL1GasPrice = () => Promise<BigNumber>;

packages/types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "types",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "description": "The types of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://https://github.com/etherspot/skandha#readme",