Geth additions2

README.md

@@ -45,6 +45,7 @@ Example:
 export RPC_URL="http://111.111.111.111:8546"
 ```
 
+**Note**: mev-inspect-py currently requires an RPC of a full archive node with support for Erigon traces and receipts. Geth additions have been added to translate geth traces and receipts to Erigon ones and can be accessed using `--geth` flag.
 
 Next, start all services with:
 
@@ -71,17 +72,19 @@ And load prices data
 ### Inspect a single block
 
 Inspecting block [12914944](https://twitter.com/mevalphaleak/status/1420416437575901185):
+**Note**: Add `geth` at the end instead of `parity` if RPC_URL points to a geth / geth like node.
 
 ```
-./mev inspect 12914944
+./mev inspect 12914944 parity
 ```
 
 ### Inspect many blocks
 
 Inspecting blocks 12914944 to 12914954:
+**Note**: Add `geth` at the end instead of `parity` if RPC_URL points to a geth / geth like node.
 
 ```
-./mev inspect-many 12914944 12914954
+./mev inspect-many 12914944 12914954 parity
 ```
 
 ### Inspect all incoming blocks

Tiltfile

@@ -27,7 +27,7 @@ k8s_yaml(secret_from_dict("mev-inspect-db-credentials", inputs = {
     "password": "password",
     "host": "postgresql",
 }))
-
+ 
 # if using https://github.com/taarushv/trace-db
 # k8s_yaml(secret_from_dict("trace-db-credentials", inputs = {
 #     "username" : "username",
@@ -79,6 +79,8 @@ k8s_resource(
     resource_deps=["postgresql", "redis-master"],
 )
 
+# k8s_resource(workload='mev-inspect', port_forwards='8101')
+
 k8s_resource(
     workload="mev-inspect-workers",
     resource_deps=["postgresql", "redis-master"],
@@ -102,17 +104,17 @@ local_resource(
 #    "export-aws-secret-access-key": "foobar",
 #}))
 
-#helm_remote(
+# helm_remote(
 #    "localstack",
 #    repo_name="localstack-charts",
 #    repo_url="https://localstack.github.io/helm-charts",
-#)
-#
-#local_resource(
+# )
+
+# local_resource(
 #    'localstack-port-forward',
 #    serve_cmd='kubectl port-forward --namespace default svc/localstack 4566:4566',
 #    resource_deps=["localstack"]
-#)
+# )
 #
 #k8s_yaml(configmap_from_dict("mev-inspect-export", inputs = {
 #    "services": "s3",

cli.py

@@ -20,6 +20,7 @@
     inspect_many_blocks_task,
 )
 from mev_inspect.s3_export import export_block
+from mev_inspect.utils import RPCType
 
 RPC_URL_ENV = "RPC_URL"
 
@@ -35,12 +36,18 @@ def cli():
 @cli.command()
 @click.argument("block_number", type=int)
 @click.option("--rpc", default=lambda: os.environ.get(RPC_URL_ENV, ""))
+@click.option(
+    "--type",
+    type=click.Choice(list(map(lambda x: x.name, RPCType)), case_sensitive=False),
+    default=RPCType.parity.name,
+)
 @coro
-async def inspect_block_command(block_number: int, rpc: str):
+async def inspect_block_command(block_number: int, rpc: str, type: str):
+    type_e = convert_str_to_enum(type)
     inspect_db_session = get_inspect_session()
     trace_db_session = get_trace_session()
 
-    inspector = MEVInspector(rpc)
+    inspector = MEVInspector(rpc, type_e)
 
     await inspector.inspect_single_block(
         inspect_db_session=inspect_db_session,
@@ -49,26 +56,38 @@ async def inspect_block_command(block_number: int, rpc: str):
     )
 
 
+def convert_str_to_enum(type: str) -> RPCType:
+    if type == "parity":
+        return RPCType.parity
+    elif type == "geth":
+        return RPCType.geth
+    raise ValueError
+
+
 @cli.command()
 @click.argument("block_number", type=int)
 @click.option("--rpc", default=lambda: os.environ.get(RPC_URL_ENV, ""))
 @coro
 async def fetch_block_command(block_number: int, rpc: str):
     trace_db_session = get_trace_session()
 
-    inspector = MEVInspector(rpc)
+    inspector = MEVInspector(rpc, RPCType.parity)
     block = await inspector.create_from_block(
         block_number=block_number,
         trace_db_session=trace_db_session,
     )
-
     print(block.json())
 
 
 @cli.command()
 @click.argument("after_block", type=int)
 @click.argument("before_block", type=int)
 @click.option("--rpc", default=lambda: os.environ.get(RPC_URL_ENV, ""))
+@click.option(
+    "--type",
+    type=click.Choice(list(map(lambda x: x.name, RPCType)), case_sensitive=False),
+    default=RPCType.parity.name,
+)
 @click.option(
     "--max-concurrency",
     type=int,
@@ -85,12 +104,14 @@ async def inspect_many_blocks_command(
     rpc: str,
     max_concurrency: int,
     request_timeout: int,
+    type: str,
 ):
+    type_e = convert_str_to_enum(type)
     inspect_db_session = get_inspect_session()
     trace_db_session = get_trace_session()
-
     inspector = MEVInspector(
-        rpc,
+        rpc=rpc,
+        type=type_e,
         max_concurrency=max_concurrency,
         request_timeout=request_timeout,
     )

listener.py

@@ -4,6 +4,7 @@
 
 import dramatiq
 from aiohttp_retry import ExponentialRetry, RetryClient
+from web3 import HTTPProvider, Web3
 
 from mev_inspect.block import get_latest_block_number
 from mev_inspect.concurrency import coro
@@ -21,6 +22,7 @@
     realtime_export_task,
 )
 from mev_inspect.signal_handler import GracefulKiller
+from mev_inspect.utils import RPCType
 
 logging.basicConfig(filename="listener.log", filemode="a", level=logging.INFO)
 logger = logging.getLogger(__name__)
@@ -29,6 +31,14 @@
 BLOCK_NUMBER_LAG = 5
 
 
+def convert_str_to_enum(type: str) -> RPCType:
+    if type == "parity":
+        return RPCType.parity
+    elif type == "geth":
+        return RPCType.geth
+    raise ValueError
+
+
 @coro
 async def run():
     rpc = os.getenv("RPC_URL")
@@ -52,8 +62,19 @@ async def run():
         priority=HIGH_PRIORITY,
     )
 
-    inspector = MEVInspector(rpc)
-    base_provider = get_base_provider(rpc)
+    w3 = Web3(HTTPProvider(rpc))
+    res = w3.provider.make_request("trace_block", ["earliest"])
+    if (
+        "error" in res
+        and res["error"]["message"]
+        == "the method trace_block does not exist/is not available"
+    ):
+        type_e = RPCType.geth
+    else:
+        type_e = RPCType.parity
+    base_provider = get_base_provider(rpc, type=type_e)
+    # type_e = convert_str_to_enum(sys.argv[1])
+    inspector = MEVInspector(rpc, type_e)
 
     while not killer.kill_now:
         await inspect_next_block(

mev

@@ -58,15 +58,17 @@ case "$1" in
 	;;
   inspect)
         block_number=$2
+        rpc_type=$3
         echo "Inspecting block $block_number"
-        kubectl exec -ti deploy/mev-inspect -- poetry run inspect-block $block_number
+        kubectl exec -ti deploy/mev-inspect -- poetry run inspect-block $block_number --type $rpc_type
 	;;
   inspect-many)
-        after_block_number=$2
-        before_block_number=$3
-        echo "Inspecting from block $after_block_number to $before_block_number"
+        start_block_number=$2
+        end_block_number=$3
+        rpc_type=$4
+        echo "Inspecting from block $start_block_number to $end_block_number"
         kubectl exec -ti deploy/mev-inspect -- \
-            poetry run inspect-many-blocks $after_block_number $before_block_number
+            poetry run inspect-many-blocks $start_block_number $end_block_number --type $rpc_type
 	;;
   test)
         shift