Merge pull request #36 from etherspot/polygon-gas-fees

use-oracle-for-matic

lerna.json

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

package.json

@@ -1,7 +1,7 @@
 {
   "name": "root",
   "private": true,
-  "version": "0.0.5",
+  "version": "0.0.6",
   "engines": {
     "node": ">=12.9.0"
   },

packages/api/package.json

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

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cli",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "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.5",
-    "db": "^0.0.5",
-    "executor": "^0.0.5",
+    "api": "^0.0.6",
+    "db": "^0.0.6",
+    "executor": "^0.0.6",
     "find-up": "5.0.0",
     "got": "12.5.3",
     "js-yaml": "4.1.0",
-    "types": "^0.0.5",
+    "types": "^0.0.6",
     "yargs": "17.6.2"
   },
   "devDependencies": {

packages/db/package.json

@@ -1,6 +1,6 @@
 {
   "name": "db",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "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.5"
+    "types": "^0.0.6"
   }
 }

packages/executor/package.json

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

packages/executor/src/services/BundlingService.ts

@@ -11,6 +11,7 @@ import { MempoolEntry } from "../entities/MempoolEntry";
 import { ReputationStatus } from "../entities/interfaces";
 import { Config } from "../config";
 import { BundlingMode, Logger } from "../interfaces";
+import { getGasFee } from "../utils/getGasFee";
 import { ReputationService } from "./ReputationService";
 import {
   UserOpValidationResult,
@@ -65,7 +66,7 @@ export class BundlingService {
     const wallet = this.config.getRelayer(this.network)!;
     const beneficiary = await this.selectBeneficiary();
     try {
-      const feeData = await this.provider.getFeeData();
+      const gasFee = await getGasFee(this.network, this.provider);
       const txRequest = entryPointContract.interface.encodeFunctionData(
         "handleOps",
         [bundle.map((entry) => entry.userOp), beneficiary]
@@ -74,8 +75,8 @@ export class BundlingService {
         to: entryPoint,
         data: txRequest,
         type: 2,
-        maxPriorityFeePerGas: feeData.maxPriorityFeePerGas ?? 0,
-        maxFeePerGas: feeData.maxFeePerGas ?? 0,
+        maxPriorityFeePerGas: gasFee.maxPriorityFeePerGas ?? 0,
+        maxFeePerGas: gasFee.maxFeePerGas ?? 0,
       });
 
       this.logger.debug(`Sent new bundle ${tx.hash}`);

packages/executor/src/utils/getGasFee.ts

@@ -0,0 +1,48 @@
+import { BigNumber, BigNumberish, ethers, providers } from "ethers";
+import { NetworkName } from "types/lib";
+
+export type IGetGasFeeResult = {
+  maxPriorityFeePerGas: BigNumberish | undefined;
+  maxFeePerGas: BigNumberish | undefined;
+};
+
+export const getGasFee = async (
+  network: NetworkName,
+  provider: providers.JsonRpcProvider
+): Promise<IGetGasFeeResult> => {
+  if (network === "matic") {
+    try {
+      return getMaticGasFee();
+    } catch (err) {
+      // eslint-disable-next-line no-console
+      console.error(`Couldn't fetch fee data for matic: ${err}`);
+    }
+  }
+  try {
+    const feeData = await provider.getFeeData();
+    return {
+      maxPriorityFeePerGas: feeData.maxPriorityFeePerGas ?? 0,
+      maxFeePerGas: feeData.maxFeePerGas ?? 0,
+    };
+  } catch (err) {
+    // eslint-disable-next-line no-console
+    console.error(`Couldn't fetch fee data: ${err}`);
+  }
+  return {
+    maxPriorityFeePerGas: undefined,
+    maxFeePerGas: undefined,
+  };
+};
+
+function parseGwei(num: number): BigNumber {
+  return ethers.utils.parseUnits(num.toFixed(9), "gwei");
+}
+
+export const getMaticGasFee = async (): Promise<IGetGasFeeResult> => {
+  const oracle = "https://gasstation-mainnet.matic.network/v2";
+  const data = await (await fetch(oracle)).json();
+  return {
+    maxPriorityFeePerGas: parseGwei(data.fast.maxPriorityFee),
+    maxFeePerGas: parseGwei(data.fast.maxFee),
+  };
+};

packages/params/package.json

@@ -1,6 +1,6 @@
 {
   "name": "params",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "Various bundler parameters",
   "author": "Etherspot",
   "homepage": "https://github.com/etherspot/skandha#readme",
@@ -21,7 +21,7 @@
     "url": "https://github.com/etherspot/skandha/issues"
   },
   "dependencies": {
-    "types": "^0.0.5"
+    "types": "^0.0.6"
   },
   "scripts": {
     "clean": "rm -rf lib && rm -f *.tsbuildinfo",

packages/types/package.json

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