From 9dbe68b2842f161713a4704b876102dc2043a1d1 Mon Sep 17 00:00:00 2001
From: Gui Heise <gheise@ufl.edu>
Date: Fri, 11 Feb 2022 16:39:50 -0500
Subject: [PATCH] Single block export function

---
 cli.py                   |  6 +++---
 mev_inspect/s3_export.py | 14 +++++---------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/cli.py b/cli.py
index 7c7ed03..8473b83 100644
--- a/cli.py
+++ b/cli.py
@@ -13,7 +13,7 @@ from mev_inspect.inspector import MEVInspector
 from mev_inspect.prices import fetch_prices, fetch_prices_range
 from mev_inspect.queue.broker import connect_broker
 from mev_inspect.queue.tasks import inspect_many_blocks_task
-from mev_inspect.s3_export import export_block_range
+from mev_inspect.s3_export import export_block
 
 RPC_URL_ENV = "RPC_URL"
 
@@ -136,9 +136,9 @@ def fetch_all_prices():
 @cli.command()
 @click.argument("after_block_number", type=int)
 @click.argument("before_block_number", type=int)
-def s3_export(after_block_number: int, before_block_number: int):
+def s3_export(block_number: int):
     inspect_db_session = get_inspect_session()
-    export_block_range(inspect_db_session, after_block_number, before_block_number)
+    export_block(inspect_db_session, block_number)
 
 
 @cli.command()
diff --git a/mev_inspect/s3_export.py b/mev_inspect/s3_export.py
index 30ea439..422dfe8 100644
--- a/mev_inspect/s3_export.py
+++ b/mev_inspect/s3_export.py
@@ -16,25 +16,21 @@ EXPORT_AWS_SECRET_ACCESS_KEY_ENV = "EXPORT_AWS_SECRET_ACCESS_KEY"
 MEV_SUMMARY_EXPORT_QUERY = """
     SELECT to_json(mev_summary)
     FROM mev_summary
-    WHERE
-        block_number >= :after_block_number AND
-        block_number < :before_block_number
+WHERE
+    block_number = :block_number
     """
 
 logger = logging.getLogger(__name__)
 
 
-def export_block_range(
-    inspect_db_session, after_block_number: int, before_block_number
-) -> None:
+def export_block(inspect_db_session, block_number: int) -> None:
     export_bucket_name = get_export_bucket_name()
     client = get_s3_client()
 
     mev_summary_json_results = inspect_db_session.execute(
         statement=MEV_SUMMARY_EXPORT_QUERY,
         params={
-            "after_block_number": after_block_number,
-            "before_block_number": before_block_number,
+            "block_number": block_number,
         },
     )
 
@@ -42,7 +38,7 @@ def export_block_range(
         (f"{json.dumps(row)}\n".encode("utf-8") for (row,) in mev_summary_json_results)
     )
 
-    key = f"mev_summary/flashbots_{after_block_number}_{before_block_number}.json"
+    key = f"mev_summary/flashbots_{block_number}.json"
 
     client.upload_fileobj(
         mev_summary_json_fileobj,