From 75ac0ea618f64701ecffa0ab50aaf5b6b1175862 Mon Sep 17 00:00:00 2001 From: Supragya Raj Date: Mon, 25 Oct 2021 05:56:23 +0200 Subject: [PATCH 1/3] geth additions --- cli.py | 13 ++- mev_inspect/block.py | 170 +++++++++++++++++++++++++++++++---- mev_inspect/inspect_block.py | 2 + poetry.lock | 16 +++- pyproject.toml | 2 + 5 files changed, 185 insertions(+), 18 deletions(-) diff --git a/cli.py b/cli.py index fb8a080..27f61b1 100644 --- a/cli.py +++ b/cli.py @@ -4,6 +4,7 @@ import sys import click from web3 import Web3 +from web3.middleware import geth_poa_middleware from mev_inspect.classifiers.trace import TraceClassifier from mev_inspect.db import get_inspect_session, get_trace_session @@ -26,12 +27,15 @@ def cli(): @click.argument("block_number", type=int) @click.option("--rpc", default=lambda: os.environ.get(RPC_URL_ENV, "")) @click.option("--cache/--no-cache", default=True) -def inspect_block_command(block_number: int, rpc: str, cache: bool): +@click.option("--geth/--no-geth", default=False) +def inspect_block_command(block_number: int, rpc: str, cache: bool, geth: bool): inspect_db_session = get_inspect_session() trace_db_session = get_trace_session() base_provider = get_base_provider(rpc) w3 = Web3(base_provider) + if geth: + w3.middleware_onion.inject(geth_poa_middleware, layer=0) trace_classifier = TraceClassifier() if not cache: @@ -41,6 +45,7 @@ def inspect_block_command(block_number: int, rpc: str, cache: bool): inspect_db_session, base_provider, w3, + geth, trace_classifier, block_number, trace_db_session=trace_db_session, @@ -52,8 +57,9 @@ def inspect_block_command(block_number: int, rpc: str, cache: bool): @click.argument("before_block", type=int) @click.option("--rpc", default=lambda: os.environ.get(RPC_URL_ENV, "")) @click.option("--cache/--no-cache", default=True) +@click.option("--geth/--no-geth", default=False) def inspect_many_blocks_command( - after_block: int, before_block: int, rpc: str, cache: bool + after_block: int, before_block: int, rpc: str, cache: bool, geth: bool ): inspect_db_session = get_inspect_session() @@ -61,6 +67,8 @@ def inspect_many_blocks_command( base_provider = get_base_provider(rpc) w3 = Web3(base_provider) + if geth: + w3.middleware_onion.inject(geth_poa_middleware, layer=0) trace_classifier = TraceClassifier() if not cache: @@ -79,6 +87,7 @@ def inspect_many_blocks_command( inspect_db_session, base_provider, w3, + geth, trace_classifier, block_number, trace_db_session=trace_db_session, diff --git a/mev_inspect/block.py b/mev_inspect/block.py index ab4afe4..29d90b0 100644 --- a/mev_inspect/block.py +++ b/mev_inspect/block.py @@ -1,5 +1,8 @@ from pathlib import Path from typing import List, Optional +import asyncio +import aiohttp +import json from sqlalchemy import orm from web3 import Web3 @@ -19,6 +22,7 @@ def get_latest_block_number(w3: Web3) -> int: def create_from_block_number( base_provider, w3: Web3, + geth: bool, block_number: int, trace_db_session: Optional[orm.Session], ) -> Block: @@ -28,7 +32,7 @@ def create_from_block_number( block = _find_block(trace_db_session, block_number) if block is None: - return _fetch_block(w3, base_provider, block_number) + return _fetch_block(w3, base_provider, geth, block_number) else: return block @@ -36,26 +40,33 @@ def create_from_block_number( def _fetch_block( w3, base_provider, + geth, block_number: int, ) -> Block: 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"] - ] - traces = [Trace(**trace_json) for trace_json in traces_json] - base_fee_per_gas = fetch_base_fee_per_gas(w3, block_number) + if not geth: + 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"] + ] + traces = [Trace(**trace_json) for trace_json in traces_json] + base_fee_per_gas = fetch_base_fee_per_gas(w3, block_number) + else: + traces = geth_get_tx_traces_parity_format(base_provider, block_json) + geth_tx_receipts = geth_get_tx_receipts(base_provider, block_json["transactions"]) + receipts = geth_receipts_translator(block_json, geth_tx_receipts) + base_fee_per_gas = 0 return Block( - block_number=block_number, - miner=block_json["miner"], - base_fee_per_gas=base_fee_per_gas, - traces=traces, - receipts=receipts, - ) - + block_number=block_number, + miner=block_json["miner"], + base_fee_per_gas=base_fee_per_gas, + traces=traces, + receipts=receipts, + ) def _find_block( trace_db_session: orm.Session, @@ -164,3 +175,132 @@ def cache_block(cache_path: Path, block: Block): def _get_cache_path(block_number: int) -> Path: cache_directory_path = Path(cache_directory) return cache_directory_path / f"{block_number}.json" + +# Geth specific additions + +def geth_get_tx_traces_parity_format(base_provider, block_json): + block_hash = block_json['hash'] + block_trace = geth_get_tx_traces(base_provider, block_hash) + parity_traces = [] + for idx, trace in enumerate(block_trace['result']): + if 'result' in trace: + parity_traces.extend(unwrap_tx_trace_for_parity(block_json, idx, trace['result'])) + return parity_traces + + +def geth_get_tx_traces(base_provider, block_hash): + block_trace = base_provider.make_request("debug_traceBlockByHash", [block_hash.hex(), {"tracer": "callTracer"}]) + return block_trace + + +def unwrap_tx_trace_for_parity( + block_json, tx_pos_in_block, tx_trace, position=[] +) -> List[Trace]: + response_list = [] + _calltype_mapping = { + "CALL": "call", + "DELEGATECALL": "delegateCall", + "CREATE": "create", + "SUICIDE": "suicide", + "REWARD": "reward", + } + try: + if tx_trace["type"] == "STATICCALL": + return [] + action_dict = dict() + action_dict["callType"] = _calltype_mapping[tx_trace["type"]] + if action_dict["callType"] == "call": + action_dict["value"] = tx_trace["value"] + for key in ["from", "to", "gas", "input"]: + action_dict[key] = tx_trace[key] + + result_dict = dict() + for key in ["gasUsed", "output"]: + result_dict[key] = tx_trace[key] + + response_list.append( + Trace( + action=action_dict, + block_hash = str(block_json['hash']), + block_number=int(block_json["number"]), + result=result_dict, + subtraces=len(tx_trace["calls"]) if "calls" in tx_trace.keys() else 0, + trace_address=position, + transaction_hash=block_json["transactions"][tx_pos_in_block].hex(), + transaction_position=tx_pos_in_block, + type=TraceType(_calltype_mapping[tx_trace["type"]]), + ) + ) + except Exception: + return [] + + if "calls" in tx_trace.keys(): + for idx, subcall in enumerate(tx_trace["calls"]): + response_list.extend( + unwrap_tx_trace_for_parity( + block_json, tx_pos_in_block, subcall, position + [idx] + ) + ) + return response_list + +async def geth_get_tx_receipts_task(session, endpoint_uri, tx): + data = { + "jsonrpc": "2.0", + "id": "0", + "method": "eth_getTransactionReceipt", + "params": [tx.hex()], + } + async with session.post(endpoint_uri, json=data) as response: + if response.status != 200: + response.raise_for_status() + return await response.text() + +async def geth_get_tx_receipts_async(endpoint_uri, transactions): + geth_tx_receipts = [] + async with aiohttp.ClientSession() as session: + tasks = [ + asyncio.create_task(geth_get_tx_receipts_task(session, endpoint_uri, tx)) + for tx in transactions + ] + geth_tx_receipts = await asyncio.gather(*tasks) + return [json.loads(tx_receipts) for tx_receipts in geth_tx_receipts] + +def geth_get_tx_receipts(base_provider, transactions): + return asyncio.run(geth_get_tx_receipts_async(base_provider.endpoint_uri, transactions)) + + +def geth_receipts_translator(block_json, geth_tx_receipts) -> List[Receipt]: + json_decoded_receipts = [ + tx_receipt["result"] + if tx_receipt != None and ("result" in tx_receipt.keys()) + else None + for tx_receipt in geth_tx_receipts + ] + results = [] + for idx, tx_receipt in enumerate(json_decoded_receipts): + if tx_receipt != None: + results.append(unwrap_tx_receipt_for_parity(block_json, idx, tx_receipt)) + return results + +def unwrap_tx_receipt_for_parity(block_json, tx_pos_in_block, tx_receipt) -> Receipt: + try: + if tx_pos_in_block != int(tx_receipt["transactionIndex"], 16): + print( + "Alert the position of transaction in block is mismatched ", + tx_pos_in_block, + tx_receipt["transactionIndex"], + ) + return Receipt( + block_number=block_json["number"], + transaction_hash=tx_receipt["transactionHash"], + transaction_index=tx_pos_in_block, + gas_used=tx_receipt["gasUsed"], + effective_gas_price=tx_receipt["effectiveGasPrice"], + cumulative_gas_used=tx_receipt["cumulativeGasUsed"], + to=tx_receipt["to"], + ) + + except Exception as e: + print("error while decoding receipt", tx_receipt, e) + + return Receipt() \ No newline at end of file diff --git a/mev_inspect/inspect_block.py b/mev_inspect/inspect_block.py index d3ab75b..67750ff 100644 --- a/mev_inspect/inspect_block.py +++ b/mev_inspect/inspect_block.py @@ -39,6 +39,7 @@ def inspect_block( inspect_db_session: orm.Session, base_provider, w3: Web3, + geth: bool, trace_clasifier: TraceClassifier, block_number: int, trace_db_session: Optional[orm.Session], @@ -47,6 +48,7 @@ def inspect_block( block = create_from_block_number( base_provider, w3, + geth, block_number, trace_db_session, ) diff --git a/poetry.lock b/poetry.lock index ccd2565..3ee7eab 100644 --- a/poetry.lock +++ b/poetry.lock @@ -51,6 +51,14 @@ category = "main" optional = false python-versions = ">=3.5.3" +[[package]] +name = "asyncio" +version = "3.4.3" +description = "reference implementation of PEP 3156" +category = "main" +optional = false +python-versions = "*" + [[package]] name = "atomicwrites" version = "1.4.0" @@ -1017,7 +1025,7 @@ multidict = ">=4.0" [metadata] lock-version = "1.1" python-versions = "^3.9" -content-hash = "baade6f62f3adaff192b2c85b4f602f4990b9b99d6fcce904aeb5087b6fa1921" +content-hash = "c9435e8660dcaddeb63b19f26dddb70287b0f3b4e43ca4ad6168d5f919f0089d" [metadata.files] aiohttp = [ @@ -1071,6 +1079,12 @@ async-timeout = [ {file = "async-timeout-3.0.1.tar.gz", hash = "sha256:0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f"}, {file = "async_timeout-3.0.1-py3-none-any.whl", hash = "sha256:4291ca197d287d274d0b6cb5d6f8f8f82d434ed288f962539ff18cc9012f9ea3"}, ] +asyncio = [ + {file = "asyncio-3.4.3-cp33-none-win32.whl", hash = "sha256:b62c9157d36187eca799c378e572c969f0da87cd5fc42ca372d92cdb06e7e1de"}, + {file = "asyncio-3.4.3-cp33-none-win_amd64.whl", hash = "sha256:c46a87b48213d7464f22d9a497b9eef8c1928b68320a2fa94240f969f6fec08c"}, + {file = "asyncio-3.4.3-py3-none-any.whl", hash = "sha256:c4d18b22701821de07bd6aea8b53d21449ec0ec5680645e5317062ea21817d2d"}, + {file = "asyncio-3.4.3.tar.gz", hash = "sha256:83360ff8bc97980e4ff25c964c7bd3923d333d177aa4f7fb736b019f26c7cb41"}, +] atomicwrites = [ {file = "atomicwrites-1.4.0-py2.py3-none-any.whl", hash = "sha256:6d1784dea7c0c8d4a5172b6c620f40b6e4cbfdf96d783691f2e1302a7b88e197"}, {file = "atomicwrites-1.4.0.tar.gz", hash = "sha256:ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a"}, diff --git a/pyproject.toml b/pyproject.toml index 797a99c..9fe58e3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,6 +11,8 @@ pydantic = "^1.8.2" hexbytes = "^0.2.1" click = "^8.0.1" psycopg2 = "^2.9.1" +aiohttp = "^3.7.4" +asyncio = "^3.4.3" [tool.poetry.dev-dependencies] pre-commit = "^2.13.0" From 2f1d8262aed8a0c1b43bb650571b69af58701837 Mon Sep 17 00:00:00 2001 From: Supragya Raj Date: Mon, 25 Oct 2021 14:39:24 +0200 Subject: [PATCH 2/3] Readme updates --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index bef5711..1b97e2d 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,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 (not geth 😔). +**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: @@ -62,6 +62,7 @@ kubectl exec deploy/mev-inspect -- alembic upgrade head ### Inspect a single block Inspecting block [12914944](https://twitter.com/mevalphaleak/status/1420416437575901185): +**Note**: Add `--geth` at the end if RPC_URL points to a geth / geth like node. ``` kubectl exec deploy/mev-inspect -- poetry run inspect-block 12914944 @@ -70,6 +71,7 @@ kubectl exec deploy/mev-inspect -- poetry run inspect-block 12914944 ### Inspect many blocks Inspecting blocks 12914944 to 12914954: +**Note**: Add `--geth` at the end if RPC_URL points to a geth / geth like node. ``` kubectl exec deploy/mev-inspect -- poetry run inspect-many-blocks 12914944 12914954 From c8413130ec713afaf8f1c3f21e37722d464c6f29 Mon Sep 17 00:00:00 2001 From: Supragya Raj Date: Wed, 27 Oct 2021 15:47:49 +0200 Subject: [PATCH 3/3] fixed lint issue --- mev_inspect/block.py | 51 +++++++++++++++++++++++++++++--------------- 1 file changed, 34 insertions(+), 17 deletions(-) diff --git a/mev_inspect/block.py b/mev_inspect/block.py index 29d90b0..a46e72a 100644 --- a/mev_inspect/block.py +++ b/mev_inspect/block.py @@ -1,8 +1,8 @@ from pathlib import Path from typing import List, Optional +import json import asyncio import aiohttp -import json from sqlalchemy import orm from web3 import Web3 @@ -46,7 +46,9 @@ def _fetch_block( block_json = w3.eth.get_block(block_number) if not geth: - receipts_json = base_provider.make_request("eth_getBlockReceipts", [block_number]) + receipts_json = base_provider.make_request( + "eth_getBlockReceipts", [block_number] + ) traces_json = w3.parity.trace_block(block_number) receipts: List[Receipt] = [ @@ -56,17 +58,20 @@ def _fetch_block( base_fee_per_gas = fetch_base_fee_per_gas(w3, block_number) else: traces = geth_get_tx_traces_parity_format(base_provider, block_json) - geth_tx_receipts = geth_get_tx_receipts(base_provider, block_json["transactions"]) + geth_tx_receipts = geth_get_tx_receipts( + base_provider, block_json["transactions"] + ) receipts = geth_receipts_translator(block_json, geth_tx_receipts) base_fee_per_gas = 0 return Block( - block_number=block_number, - miner=block_json["miner"], - base_fee_per_gas=base_fee_per_gas, - traces=traces, - receipts=receipts, - ) + block_number=block_number, + miner=block_json["miner"], + base_fee_per_gas=base_fee_per_gas, + traces=traces, + receipts=receipts, + ) + def _find_block( trace_db_session: orm.Session, @@ -176,20 +181,26 @@ def _get_cache_path(block_number: int) -> Path: cache_directory_path = Path(cache_directory) return cache_directory_path / f"{block_number}.json" + # Geth specific additions + def geth_get_tx_traces_parity_format(base_provider, block_json): - block_hash = block_json['hash'] + block_hash = block_json["hash"] block_trace = geth_get_tx_traces(base_provider, block_hash) parity_traces = [] - for idx, trace in enumerate(block_trace['result']): - if 'result' in trace: - parity_traces.extend(unwrap_tx_trace_for_parity(block_json, idx, trace['result'])) + for idx, trace in enumerate(block_trace["result"]): + if "result" in trace: + parity_traces.extend( + unwrap_tx_trace_for_parity(block_json, idx, trace["result"]) + ) return parity_traces def geth_get_tx_traces(base_provider, block_hash): - block_trace = base_provider.make_request("debug_traceBlockByHash", [block_hash.hex(), {"tracer": "callTracer"}]) + block_trace = base_provider.make_request( + "debug_traceBlockByHash", [block_hash.hex(), {"tracer": "callTracer"}] + ) return block_trace @@ -221,7 +232,7 @@ def unwrap_tx_trace_for_parity( response_list.append( Trace( action=action_dict, - block_hash = str(block_json['hash']), + block_hash=str(block_json["hash"]), block_number=int(block_json["number"]), result=result_dict, subtraces=len(tx_trace["calls"]) if "calls" in tx_trace.keys() else 0, @@ -243,6 +254,7 @@ def unwrap_tx_trace_for_parity( ) return response_list + async def geth_get_tx_receipts_task(session, endpoint_uri, tx): data = { "jsonrpc": "2.0", @@ -255,6 +267,7 @@ async def geth_get_tx_receipts_task(session, endpoint_uri, tx): response.raise_for_status() return await response.text() + async def geth_get_tx_receipts_async(endpoint_uri, transactions): geth_tx_receipts = [] async with aiohttp.ClientSession() as session: @@ -265,8 +278,11 @@ async def geth_get_tx_receipts_async(endpoint_uri, transactions): geth_tx_receipts = await asyncio.gather(*tasks) return [json.loads(tx_receipts) for tx_receipts in geth_tx_receipts] + def geth_get_tx_receipts(base_provider, transactions): - return asyncio.run(geth_get_tx_receipts_async(base_provider.endpoint_uri, transactions)) + return asyncio.run( + geth_get_tx_receipts_async(base_provider.endpoint_uri, transactions) + ) def geth_receipts_translator(block_json, geth_tx_receipts) -> List[Receipt]: @@ -282,6 +298,7 @@ def geth_receipts_translator(block_json, geth_tx_receipts) -> List[Receipt]: results.append(unwrap_tx_receipt_for_parity(block_json, idx, tx_receipt)) return results + def unwrap_tx_receipt_for_parity(block_json, tx_pos_in_block, tx_receipt) -> Receipt: try: if tx_pos_in_block != int(tx_receipt["transactionIndex"], 16): @@ -303,4 +320,4 @@ def unwrap_tx_receipt_for_parity(block_json, tx_pos_in_block, tx_receipt) -> Rec except Exception as e: print("error while decoding receipt", tx_receipt, e) - return Receipt() \ No newline at end of file + return Receipt()