Update Gas Magic

v3xlabs · Sep 2, 2024 · fc0af89 · fc0af89
1 parent 0d03ab5
commit fc0af89
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 24 deletions.
diff --git a/web/src/App.tsx b/web/src/App.tsx
@@ -137,14 +137,12 @@ export const App = () => {
                                 <div className="text-right font-bold text-lg">
                                     {formatThousands(totals.renewAverage)}
                                 </div>
-                                {currentUSDCPrice ? (
-                                    <div className="text-light-text-secondary flex justify-between gap-2 items-center">
-                                        <div className="flex items-center gap-1">
-                                            <BsFuelPump />
-                                            {formatGas(
-                                                totals.renewGasPriceAverage
-                                            )}
-                                        </div>
+                                <div className="text-light-text-secondary flex justify-between gap-2 items-center">
+                                    <div className="flex items-center gap-1">
+                                        <BsFuelPump />
+                                        {formatGas(totals.renewGasPriceAverage)}
+                                    </div>
+                                    {currentUSDCPrice ? (
                                         <div className="text-right flex items-center justify-end">
                                             ~{' '}
                                             {gasPriceMagic(
@@ -154,8 +152,8 @@ export const App = () => {
                                             )}{' '}
                                             USD
                                         </div>
-                                    </div>
-                                ) : undefined}
+                                    ) : undefined}
+                                </div>
                             </div>
                         ) : (
                             <div>Loading...</div>

diff --git a/web/src/txHistory/TransactionEntry.tsx b/web/src/txHistory/TransactionEntry.tsx
@@ -7,6 +7,7 @@ import { FiBox, FiChevronDown } from 'react-icons/fi';
 import { formatFullAndRelativeDate } from '../utils/date';
 import { AllMultiReturnTypes } from '../utils/decodeTransaction';
 import { useEthUsd } from '../utils/ethUsd';
+import { formatGas } from '../utils/formatGas';
 import { formatThousands } from '../utils/formatThousands';
 
 const formatAddress = (address: string) =>
@@ -59,18 +60,28 @@ export const TransactionEntry: FC<{ tx: AllMultiReturnTypes }> = ({ tx }) => {
                 )}
                 {tx.length > 0 && (
                     <div className="text-center">
-                        <div>
-                            {formatThousands(
-                                BigInt(tx.gas_used) / BigInt(tx.length)
-                            )}
+                        <div className="text-sm">
+                            <span>
+                                {formatThousands(
+                                    BigInt(tx.gas_used) / BigInt(tx.length)
+                                )}
+                                {tx.length > 1 && ' each'}
+                            </span>
                         </div>
-                        <div className="text-xs">Per Name</div>
+                        {tx.length > 1 && (
+                            <span className="text-xs">
+                                <span>
+                                    {formatThousands(BigInt(tx.gas_used))}
+                                </span>{' '}
+                                total
+                            </span>
+                        )}
                     </div>
                 )}
                 <div className="flex flex-col justify-center items-center gap-1">
                     <div className="flex justify-center items-center gap-1">
                         <BsFuelPump />
-                        <div>{formatThousands(BigInt(tx.gas_used))}</div>
+                        <div>{formatGas(BigInt(tx.gas_price))}</div>
                     </div>
                     {ethUsd.data ? (
                         <div className="text-sm opacity-70">

diff --git a/web/src/utils/aggregateTotals.ts b/web/src/utils/aggregateTotals.ts
@@ -1,5 +1,7 @@
 import { AllMultiReturnTypes } from './decodeTransaction';
 
+// gas_price - 9 decimals
+
 export const aggregateTotals = (txs: AllMultiReturnTypes[]) => {
     const aggregates = txs.reduce(
         (aggregate, current) => {
@@ -38,6 +40,8 @@ export const aggregateTotals = (txs: AllMultiReturnTypes[]) => {
         }
     );
 
+    console.log({ aggregates });
+
     return {
         commitAverage: aggregates.commitTotal / aggregates.commitCount,
         commitGasPriceAverage:

diff --git a/web/src/utils/formatGas.ts b/web/src/utils/formatGas.ts
@@ -1,4 +1,4 @@
 // Divide by 10e8 to get gwei but keep 2 decimals of precision so 1.23 return as string
 export const formatGas = (gas: BigInt): string => {
-    return (Number(BigInt(gas.toString()) / BigInt(10e6)) / 10).toString();
+    return (Number(BigInt(gas.toString()) / BigInt(10e6)) / 100).toString();
 };
diff --git a/web/src/utils/gasMagic.ts b/web/src/utils/gasMagic.ts
@@ -4,12 +4,6 @@ export const gasPriceMagic = (
     ethUSDC: bigint
 ) => {
     return (
-        Number(
-            BigInt(
-                Math.round(
-                    Number(BigInt((gas * gasPrice) / 10_000n) * BigInt(ethUSDC))
-                )
-            ) / 1_000_000n
-        ) / 1_000_000_000_000
+        Number((BigInt(gas * gasPrice) * BigInt(ethUSDC)) / 1_000_000n) / 1e18
     ).toPrecision(3);
 };