From b9972568efeed4ab3d5c6dbdafb3cdf9a5a6d54c Mon Sep 17 00:00:00 2001
From: marie-fourier <sobirovutkir@gmail.com>
Date: Tue, 20 Aug 2024 14:50:12 +0500
Subject: [PATCH] update matic oracle & temp remove knownAccounts check

---
 .../BundlingService/relayers/fastlane.ts      | 35 +++++++++----------
 .../src/gas-price-oracles/oracles/matic.ts    | 16 ++++++---
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/packages/executor/src/services/BundlingService/relayers/fastlane.ts b/packages/executor/src/services/BundlingService/relayers/fastlane.ts
index 40dc859b..695cea9e 100644
--- a/packages/executor/src/services/BundlingService/relayers/fastlane.ts
+++ b/packages/executor/src/services/BundlingService/relayers/fastlane.ts
@@ -83,23 +83,23 @@ export class FastlaneRelayer extends BaseRelayer {
         maxFeePerGas: bundle.maxFeePerGas,
       };
 
-      if (this.networkConfig.eip2930) {
-        const { storageMap } = bundle;
-        const addresses = Object.keys(storageMap);
-        if (addresses.length) {
-          const accessList: AccessList = [];
-          for (const address of addresses) {
-            const storageKeys = storageMap[address];
-            if (typeof storageKeys == "object") {
-              accessList.push({
-                address,
-                storageKeys: Object.keys(storageKeys),
-              });
-            }
-          }
-          transactionRequest.accessList = accessList;
-        }
-      }
+      // if (this.networkConfig.eip2930) {
+      //   const { storageMap } = bundle;
+      //   const addresses = Object.keys(storageMap);
+      //   if (addresses.length) {
+      //     const accessList: AccessList = [];
+      //     for (const address of addresses) {
+      //       const storageKeys = storageMap[address];
+      //       if (typeof storageKeys == "object") {
+      //         accessList.push({
+      //           address,
+      //           storageKeys: Object.keys(storageKeys),
+      //         });
+      //       }
+      //     }
+      //     transactionRequest.accessList = accessList;
+      //   }
+      // }
 
       if (
         chainsWithoutEIP1559.some((chainId: number) => chainId === this.chainId)
@@ -206,7 +206,6 @@ export class FastlaneRelayer extends BaseRelayer {
         const params = [
           signedRawTx,
           {
-            knownAccounts: storageMap,
             blockNumberMin: block.number,
             blockNumberMax: block.number + 180, // ~10 minutes
             timestampMin: block.timestamp,
diff --git a/packages/params/src/gas-price-oracles/oracles/matic.ts b/packages/params/src/gas-price-oracles/oracles/matic.ts
index bee5fde7..36b85fbf 100644
--- a/packages/params/src/gas-price-oracles/oracles/matic.ts
+++ b/packages/params/src/gas-price-oracles/oracles/matic.ts
@@ -1,12 +1,18 @@
 import { IGetGasFeeResult, IOracle } from "./interfaces";
 import { parseGwei } from "./utils";
 
-export const getMaticGasFee: IOracle = async (): Promise<IGetGasFeeResult> => {
-  const oracle = "https://gasstation.polygon.technology/v2";
+export const getMaticGasFee: IOracle = async (
+  apiKey: string
+): Promise<IGetGasFeeResult> => {
+  let oracle =
+    "https://api.polygonscan.com/api?module=gastracker&action=gasoracle";
+  if (apiKey) {
+    oracle += `&apikey=${apiKey}`;
+  }
   const data = await (await fetch(oracle)).json();
   return {
-    maxPriorityFeePerGas: parseGwei(data.fast.maxPriorityFee),
-    maxFeePerGas: parseGwei(data.fast.maxFee),
-    gasPrice: parseGwei(data.fast.maxFee),
+    maxPriorityFeePerGas: parseGwei(data.result.FastGasPrice),
+    maxFeePerGas: parseGwei(data.result.FastGasPrice),
+    gasPrice: parseGwei(data.result.FastGasPrice),
   };
 };