From a960d5e4cf1f580354e4d383586c1220c79cc864 Mon Sep 17 00:00:00 2001
From: Luke Van Seters <lukevanseters@gmail.com>
Date: Wed, 25 Aug 2021 11:58:10 -0400
Subject: [PATCH] Add gas payment to miner payments

---
 mev_inspect/block.py                  |  6 ++++--
 mev_inspect/miner_payments.py         | 18 +++++++++++-------
 mev_inspect/schemas/miner_payments.py |  7 ++++++-
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/mev_inspect/block.py b/mev_inspect/block.py
index 861b298..c9a906f 100644
--- a/mev_inspect/block.py
+++ b/mev_inspect/block.py
@@ -35,11 +35,13 @@ def create_from_block_number(
 
 
 def fetch_block(w3, base_provider, block_number: int) -> Block:
-    block_json = w3.eth.get_block(block_number, True)
+    block_json = w3.eth.get_block(block_number)
     receipts_json = base_provider.make_request("eth_getBlockReceipts", [block_number])
     traces_json = w3.parity.trace_block(block_number)
 
-    receipts: List[Receipt] = [Receipt(**receipt) for receipt in receipts_json["result"]]
+    receipts: List[Receipt] = [
+        Receipt(**receipt) for receipt in receipts_json["result"]
+    ]
     traces = [Trace(**trace_json) for trace_json in traces_json]
 
     return Block(
diff --git a/mev_inspect/miner_payments.py b/mev_inspect/miner_payments.py
index c81c763..56deb1c 100644
--- a/mev_inspect/miner_payments.py
+++ b/mev_inspect/miner_payments.py
@@ -24,16 +24,20 @@ def get_miner_payments(
             eth_transfers, to_address=miner_address.lower()
         )
 
-        total_eth_transfer_payment = sum(
+        wei_transfered_to_miner = sum(
             transfer.amount for transfer in miner_eth_transfers
         )
 
-        if total_eth_transfer_payment > 0:
-            miner_payments.append(
-                MinerPayment(
-                    transaction_hash=receipt.transaction_hash,
-                    total_eth_transfer_payment=total_eth_transfer_payment,
-                )
+        miner_payments.append(
+            MinerPayment(
+                miner_address=miner_address,
+                block_number=receipt.block_number,
+                transaction_hash=receipt.transaction_hash,
+                transaction_index=receipt.transaction_index,
+                effective_gas_price=receipt.effective_gas_price,
+                gas_used=receipt.gas_used,
+                wei_transfered_to_miner=wei_transfered_to_miner,
             )
+        )
 
     return miner_payments
diff --git a/mev_inspect/schemas/miner_payments.py b/mev_inspect/schemas/miner_payments.py
index abc96cf..0df8dff 100644
--- a/mev_inspect/schemas/miner_payments.py
+++ b/mev_inspect/schemas/miner_payments.py
@@ -2,5 +2,10 @@ from pydantic import BaseModel
 
 
 class MinerPayment(BaseModel):
+    block_number: int
     transaction_hash: str
-    total_eth_transfer_payment: int
+    transaction_index: int
+    miner_address: str
+    wei_transfered_to_miner: int
+    effective_gas_price: int
+    gas_used: int