From 846f7376d428cc4aa9ee47f9d7784e21e3704da2 Mon Sep 17 00:00:00 2001 From: Luke Van Seters Date: Wed, 29 Dec 2021 09:50:40 -0500 Subject: [PATCH] Break out of finding block on first missing attribute --- mev_inspect/block.py | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/mev_inspect/block.py b/mev_inspect/block.py index 3ec65cd..08e0f1f 100644 --- a/mev_inspect/block.py +++ b/mev_inspect/block.py @@ -79,20 +79,22 @@ def _find_block( block_number: int, ) -> Optional[Block]: block_timestamp = _find_block_timestamp(trace_db_session, block_number) - traces = _find_traces(trace_db_session, block_number) - receipts = _find_receipts(trace_db_session, block_number) - base_fee_per_gas = _find_base_fee(trace_db_session, block_number) + if block_timestamp is None: + return None - if ( - block_timestamp is None - or traces is None - or receipts is None - or base_fee_per_gas is None - ): + base_fee_per_gas = _find_base_fee(trace_db_session, block_number) + if base_fee_per_gas is None: + return None + + traces = _find_traces(trace_db_session, block_number) + if traces is None: + return None + + receipts = _find_receipts(trace_db_session, block_number) + if receipts is None: return None miner_address = _get_miner_address_from_traces(traces) - if miner_address is None: return None