fix ancient8 oracle

.github/workflows/bundler-spec-tests.yml

@@ -44,13 +44,13 @@ jobs:
 
       - name: Install Geth
         run: |
-          sudo add-apt-repository -y ppa:ethereum/ethereum && \
-          sudo apt-get update && \
-          sudo apt-get install ethereum
+          wget https://gethstore.blob.core.windows.net/builds/geth-linux-amd64-1.13.15-c5ba367e.tar.gz
+          tar -xvf geth-linux-amd64-1.13.15-c5ba367e.tar.gz
 
       - name: Run Geth
         run: |
-          geth \
+          cd geth-linux-amd64-1.13.15-c5ba367e &&
+          ./geth \
           --verbosity 1 \
           --http.vhosts '*,localhost,host.docker.internal' \
           --http \
@@ -76,7 +76,8 @@ jobs:
 
       - name: Fund bundler
         run: |
-          geth \
+          cd geth-linux-amd64-1.13.15-c5ba367e &&
+          ./geth \
           --exec "eth.sendTransaction({from: eth.accounts[0], to: \"0x55082761664aEb8062B3427ba5E0455bFb7b68CB\", value: web3.toWei(4337, \"ether\")})" \
           attach http://localhost:8545/
 

.gitignore

@@ -138,3 +138,4 @@ packages/contracts/out-via-ir/
 packages/contracts/.env
 packages/contracts/broadcast/*/*/*
 packages/contracts/out/
+packages/cli/.git-data.json

package.json

@@ -1,9 +1,6 @@
 {
   "name": "root",
-  "private": false,
-  "publishConfig": {
-    "access": "public"
-  },
+  "private": true,
   "version": "1.5.7",
   "engines": {
     "node": ">=18.0.0"

packages/params/src/gas-price-oracles/getGasFee.ts

@@ -19,7 +19,8 @@ export const getGasFee = async (
   try {
     const feeData = await provider.getFeeData();
     return {
-      maxPriorityFeePerGas: feeData.maxPriorityFeePerGas ?? feeData.gasPrice ?? 0,
+      maxPriorityFeePerGas:
+        feeData.maxPriorityFeePerGas ?? feeData.gasPrice ?? 0,
       maxFeePerGas: feeData.maxFeePerGas ?? feeData.gasPrice ?? 0,
       gasPrice: feeData.gasPrice ?? 0,
     };

packages/params/src/gas-price-oracles/oracles/ancient8.ts

@@ -1,26 +1,41 @@
 import { fetchJson, hexValue } from "ethers/lib/utils";
-import { BigNumber } from "ethers";
+import { BigNumber, providers } from "ethers";
 import { parseGwei } from "./utils";
 import { IGetGasFeeResult, IOracle } from "./interfaces";
 
-export const getAncient8GasFee: IOracle =
-  async (): Promise<IGetGasFeeResult> => {
-    const { gas_prices }: Ancient8Response = await fetchJson({
-      url: "https://scan.ancient8.gg/api/v2/stats",
-      headers: {
-        "updated-gas-oracle": "true",
-      },
-    });
-    const maxPriorityFeePerGas = hexValue(
-      BigNumber.from(gas_prices.fast.priority_fee_wei)
-    );
-    const maxFeePerGas = parseGwei(gas_prices.fast.priority_fee);
-    return {
-      maxPriorityFeePerGas: maxPriorityFeePerGas,
-      gasPrice: maxFeePerGas,
-      maxFeePerGas: maxFeePerGas,
-    };
+export const getAncient8GasFee: IOracle = async (
+  apiKey: string,
+  provider?: providers.JsonRpcProvider
+): Promise<IGetGasFeeResult> => {
+  try {
+    if (provider) {
+      const gasPrice = await provider.getGasPrice();
+      return {
+        maxPriorityFeePerGas: gasPrice,
+        gasPrice: gasPrice,
+        maxFeePerGas: gasPrice,
+      };
+    }
+  } catch (err) {
+    /* empty */
+  }
+
+  const { gas_prices }: Ancient8Response = await fetchJson({
+    url: "https://scan.ancient8.gg/api/v2/stats",
+    headers: {
+      "updated-gas-oracle": "true",
+    },
+  });
+  const maxPriorityFeePerGas = hexValue(
+    BigNumber.from(gas_prices.average.priority_fee_wei)
+  );
+  const maxFeePerGas = parseGwei(gas_prices.average.priority_fee);
+  return {
+    maxPriorityFeePerGas: maxPriorityFeePerGas,
+    gasPrice: maxFeePerGas,
+    maxFeePerGas: maxFeePerGas,
   };
+};
 
 type Ancient8Response = {
   gas_prices: {