Fix(Gas estimation): gas price from oracles can be a float

safe-global · Jan 22, 2025 · 60b4b4f · 60b4b4f
1 parent 0935bb7
commit 60b4b4f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/apps/web/src/hooks/__tests__/useGasPrice.test.ts b/apps/web/src/hooks/__tests__/useGasPrice.test.ts
@@ -63,8 +63,8 @@ describe('useGasPrice', () => {
           json: () =>
             Promise.resolve({
               data: {
-                FastGasPrice: '47',
-                suggestBaseFee: '44',
+                FastGasPrice: '47.543',
+                suggestBaseFee: '44.435',
               },
             }),
         }),
@@ -104,8 +104,8 @@ describe('useGasPrice', () => {
           json: () =>
             Promise.resolve({
               data: {
-                FastGasPrice: '30',
-                suggestBaseFee: '10',
+                FastGasPrice: '30.45435',
+                suggestBaseFee: '10.5435435',
               },
             }),
         }),
@@ -270,8 +270,8 @@ describe('useGasPrice', () => {
             json: () =>
               Promise.resolve({
                 data: {
-                  FastGasPrice: '21',
-                  suggestBaseFee: '19',
+                  FastGasPrice: '21.5435435',
+                  suggestBaseFee: '19.5435',
                 },
               }),
           }),
@@ -282,8 +282,8 @@ describe('useGasPrice', () => {
             json: () =>
               Promise.resolve({
                 data: {
-                  FastGasPrice: '22',
-                  suggestBaseFee: '19',
+                  FastGasPrice: '22.89879',
+                  suggestBaseFee: '19.1243',
                 },
               }),
           }),

diff --git a/apps/web/src/hooks/useGasPrice.ts b/apps/web/src/hooks/useGasPrice.ts
@@ -46,6 +46,10 @@ const isEtherscanResult = (data: any): data is EtherscanResult => {
   return 'FastGasPrice' in data && 'suggestBaseFee' in data
 }
 
+const stringToBigInt = (value: string): bigint => {
+  return BigInt(value.split('.')[0])
+}
+
 /**
  * Parses result from etherscan oracle.
  * Since EIP 1559 it returns the `maxFeePerGas` as gas price and the current network baseFee as `suggestedBaseFee`.
@@ -55,8 +59,8 @@ const isEtherscanResult = (data: any): data is EtherscanResult => {
  * @see https://docs.etherscan.io/api-endpoints/gas-tracker
  */
 const parseEtherscanOracleResult = (result: EtherscanResult, gweiFactor: string): EstimatedGasPrice => {
-  const maxFeePerGas = BigInt(Number(result.FastGasPrice) * Number(gweiFactor))
-  const baseFee = BigInt(Number(result.suggestBaseFee) * Number(gweiFactor))
+  const maxFeePerGas = stringToBigInt(result.FastGasPrice) * stringToBigInt(gweiFactor)
+  const baseFee = stringToBigInt(result.suggestBaseFee) * stringToBigInt(gweiFactor)
 
   return {
     maxFeePerGas,