echonet: refactor, remove decoded class, merge functions (#10581)

Author: ayeletstarkware

echonet/l1_blocks.py

@@ -36,7 +36,7 @@ def find_l1_block_for_tx(
         logs = client.get_logs(start_block_data, end_block_data)
 
         for log in logs:
-            l1_event = L1Events.parse_event(log)
+            l1_event = L1Events.decode_log(log)
 
             if L1Events.l1_event_matches_feeder_tx(l1_event, feeder_tx):
                 # TODO(Ayelet): Add blockNumber to L1Event.

echonet/l1_events.py

@@ -10,17 +10,6 @@
 
 
 class L1Events:
-    @dataclass(frozen=True)
-    class DecodedLogMessageToL2:
-        from_address: str
-        to_address: str
-        selector: int
-        payload: List[int]
-        nonce: int
-        fee: int
-        l1_tx_hash: str
-        block_timestamp: int
-
     @dataclass(frozen=True)
     class L1HandlerTransaction:
         """Mirrors Rust starknet_api::transaction::L1HandlerTransaction"""
@@ -39,7 +28,7 @@ class L1Event:
         l1_tx_hash: str
         block_timestamp: int
 
-    def decode_log(log: dict) -> DecodedLogMessageToL2:
+    def decode_log(log: dict) -> "L1Events.L1Event":
         """
         Decodes Ethereum log from Starknet L1 contract into DecodedLogMessageToL2 event.
         Event structure defined in: crates/papyrus_base_layer/resources/Starknet-0.10.3.4.json
@@ -66,34 +55,20 @@ def decode_log(log: dict) -> DecodedLogMessageToL2:
         data_bytes = bytes.fromhex(data[2:])  # Remove 0x prefix and convert to bytes
         payload, nonce, fee = eth_abi.decode(["uint256[]", "uint256", "uint256"], data_bytes)
 
-        return L1Events.DecodedLogMessageToL2(
-            from_address=from_address,
-            to_address=to_address,
-            selector=selector,
-            payload=list(payload),
-            nonce=nonce,
-            fee=fee,
-            l1_tx_hash=log["transactionHash"],
-            block_timestamp=int(log["blockTimestamp"], 16),
-        )
-
-    @staticmethod
-    def parse_event(log: dict) -> "L1Events.L1Event":
-        decoded = L1Events.decode_log(log)
-        calldata = [int(decoded.from_address, 16)] + decoded.payload
+        calldata = [int(from_address, 16)] + list(payload)
 
         tx = L1Events.L1HandlerTransaction(
-            contract_address=decoded.to_address,
-            entry_point_selector=decoded.selector,
+            contract_address=to_address,
+            entry_point_selector=selector,
             calldata=calldata,
-            nonce=decoded.nonce,
+            nonce=nonce,
         )
 
         return L1Events.L1Event(
             tx=tx,
-            fee=decoded.fee,
-            l1_tx_hash=decoded.l1_tx_hash,
-            block_timestamp=decoded.block_timestamp,
+            fee=fee,
+            l1_tx_hash=log["transactionHash"],
+            block_timestamp=int(log["blockTimestamp"], 16),
         )
 
     @staticmethod

echonet/tests/test_l1_events.py

@@ -36,23 +36,6 @@ class TestL1Events(unittest.TestCase):
         "removed": False,
     }
 
-    DECODED_LOG = L1Events.DecodedLogMessageToL2(
-        from_address="0xf5b6ee2caeb6769659f6c091d209dfdcaf3f69eb",
-        to_address="0x616757a151c21f9be8775098d591c2807316d992bbc3bb1a5c1821630589256",
-        selector=0x1B64B1B3B690B43B9B514FB81377518F4039CD3E4F4914D8A6BDF01D679FB19,
-        payload=[
-            0x04C46E830BB56CE22735D5D8FC9CB90309317D0F,
-            0xC50A951C4426760BA75C5253985A16196B342168,
-            0x11BF9DBEBDD770C31FF13808C96A1CB2DE15A240274DC527E7D809BB2BF38DF,
-            0x956DFDEAC59085EDC3,
-            0x0,
-        ],
-        nonce=0x19B255,
-        fee=0x1308ABA4ADE2,
-        l1_tx_hash="0x726df509fdd23a944f923a6fc18e80cbe7300a54aa34f8e6bd77e9961ca6ce52",
-        block_timestamp=1764500447,
-    )
-
     L1_EVENT = L1Events.L1Event(
         tx=L1Events.L1HandlerTransaction(
             contract_address="0x616757a151c21f9be8775098d591c2807316d992bbc3bb1a5c1821630589256",
@@ -91,10 +74,10 @@ class TestL1Events(unittest.TestCase):
     }
 
     def test_decode_log_success(self):
-        decoded_log_result = L1Events.decode_log(self.RAW_JSON_LOG)
+        result = L1Events.decode_log(self.RAW_JSON_LOG)
 
-        self.assertIsInstance(decoded_log_result, L1Events.DecodedLogMessageToL2)
-        self.assertEqual(decoded_log_result, self.DECODED_LOG)
+        self.assertIsInstance(result, L1Events.L1Event)
+        self.assertEqual(result, self.L1_EVENT)
 
     def test_decode_log_invalid_topics_raises_error(self):
         with self.assertRaisesRegex(
@@ -110,12 +93,6 @@ def test_decode_log_wrong_signature_raises_error(self):
         with self.assertRaisesRegex(ValueError, "Unhandled event signature"):
             L1Events.decode_log(log)
 
-    def test_parse_event_success(self):
-        result = L1Events.parse_event(self.RAW_JSON_LOG)
-        self.assertIsInstance(result, L1Events.L1Event)
-
-        self.assertEqual(result, self.L1_EVENT)
-
     def test_matches_l1_handler_tx_success(self):
         l1_event = self.L1_EVENT