From 78c2555689c3a351728d6f5d77ab31c4a78cda14 Mon Sep 17 00:00:00 2001
From: Willian Mitsuda <wmitsuda@gmail.com>
Date: Sat, 3 Jul 2021 19:14:03 -0300
Subject: [PATCH] Calculate and display block fees

---
 src/Block.tsx                       | 21 ++++++++++++++++++---
 src/components/TransactionValue.tsx |  5 ++++-
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/Block.tsx b/src/Block.tsx
index 35951b0..921bacd 100644
--- a/src/Block.tsx
+++ b/src/Block.tsx
@@ -43,16 +43,24 @@ const Block: React.FC = () => {
           false,
         ]);
       }
-      const [_rawBlock, _rawIssuance] = await Promise.all([
+      const [_rawBlock, _rawIssuance, _rawReceipts] = await Promise.all([
         blockPromise,
         provider.send("erigon_issuance", [params.blockNumberOrHash]),
+        provider.send("eth_getBlockReceipts", [params.blockNumberOrHash]),
       ]);
+      const receipts = (_rawReceipts as any[]).map((r) =>
+        provider.formatter.receipt(r)
+      );
+      const fees = receipts.reduce(
+        (acc, r) => acc.add(r.effectiveGasPrice.mul(r.gasUsed)),
+        BigNumber.from(0)
+      );
 
       const _block = provider.formatter.block(_rawBlock);
       const extBlock: ExtendedBlock = {
         blockReward: provider.formatter.bigNumber(_rawIssuance.blockReward),
         unclesReward: provider.formatter.bigNumber(_rawIssuance.uncleReward),
-        feeReward: provider.formatter.bigNumber("0"),
+        feeReward: fees,
         size: provider.formatter.number(_rawBlock.size),
         sha3Uncles: _rawBlock.sha3Uncles,
         stateRoot: _rawBlock.stateRoot,
@@ -113,7 +121,14 @@ const Block: React.FC = () => {
             </div>
           </InfoRow>
           <InfoRow title="Block Reward">
-            <TransactionValue value={block.blockReward} />
+            <TransactionValue value={block.blockReward.add(block.feeReward)} />
+            {!block.feeReward.isZero() && (
+              <>
+                {" "}
+                (<TransactionValue value={block.blockReward} hideUnit /> +{" "}
+                <TransactionValue value={block.feeReward} hideUnit />)
+              </>
+            )}
           </InfoRow>
           <InfoRow title="Uncles Reward">
             <TransactionValue value={block.unclesReward} />
diff --git a/src/components/TransactionValue.tsx b/src/components/TransactionValue.tsx
index 2a70b04..9b9403c 100644
--- a/src/components/TransactionValue.tsx
+++ b/src/components/TransactionValue.tsx
@@ -5,11 +5,13 @@ import { formatValue } from "./formatter";
 type TransactionValueProps = {
   value: BigNumber;
   decimals?: number;
+  hideUnit?: boolean;
 };
 
 const TransactionValue: React.FC<TransactionValueProps> = ({
   value,
   decimals = 18,
+  hideUnit,
 }) => {
   const formattedValue = formatValue(value, decimals);
 
@@ -18,7 +20,8 @@ const TransactionValue: React.FC<TransactionValueProps> = ({
       className={`text-sm ${value.isZero() ? "text-gray-400" : ""}`}
       title={`${formattedValue} Ether`}
     >
-      <span className={`font-balance`}>{formattedValue}</span> Ether
+      <span className={`font-balance`}>{formattedValue}</span>
+      {!hideUnit && " Ether"}
     </span>
   );
 };