echonet: refactor, move match func to l1_blocks class (#10585)

Author: ayeletstarkware

echonet/l1_blocks.py

@@ -8,6 +8,33 @@
 
 
 class L1Blocks:
+    @staticmethod
+    def l1_event_matches_feeder_tx(l1_event: L1Events.L1Event, feeder_tx: dict) -> bool:
+        """
+        Compares L1Event with an L1_HANDLER feeder tx using only contract_address, entry_point_selector, nonce, and calldata.
+        Transaction hashes are ignored.
+        """
+        if feeder_tx.get("type") != "L1_HANDLER":
+            return False
+
+        feeder_contract = hex(int(feeder_tx["contract_address"], 16))
+        if l1_event.contract_address != feeder_contract:
+            return False
+
+        feeder_selector = int(feeder_tx["entry_point_selector"], 16)
+        if l1_event.entry_point_selector != feeder_selector:
+            return False
+
+        feeder_nonce = int(feeder_tx["nonce"], 16)
+        if l1_event.nonce != feeder_nonce:
+            return False
+
+        feeder_calldata = [int(item, 16) for item in feeder_tx["calldata"]]
+        if l1_event.calldata != feeder_calldata:
+            return False
+
+        return True
+
     @staticmethod
     # TODO(Ayelet): Consider changing timestamp params to datetime.
     def find_l1_block_for_tx(
@@ -38,7 +65,7 @@ def find_l1_block_for_tx(
         for log in logs:
             l1_event = L1Events.decode_log(log)
 
-            if L1Events.l1_event_matches_feeder_tx(l1_event, feeder_tx):
+            if L1Blocks.l1_event_matches_feeder_tx(l1_event, feeder_tx):
                 logger.info(
                     f"Found matching L1 block: {l1_event.block_number} for L1 tx: {feeder_tx['transaction_hash']}"
                 )

echonet/l1_events.py

@@ -64,30 +64,3 @@ def decode_log(log: dict) -> "L1Events.L1Event":
             block_timestamp=int(log["blockTimestamp"], 16),
             block_number=int(log["blockNumber"], 16),
         )
-
-    @staticmethod
-    def l1_event_matches_feeder_tx(l1_event: L1Event, feeder_tx: dict) -> bool:
-        """
-        Compares L1Event with an L1_HANDLER feeder tx using only contract_address, entry_point_selector, nonce, and calldata.
-        Transaction hashes are ignored.
-        """
-        if feeder_tx.get("type") != "L1_HANDLER":
-            return False
-
-        feeder_contract = hex(int(feeder_tx["contract_address"], 16))
-        if l1_event.contract_address != feeder_contract:
-            return False
-
-        feeder_selector = int(feeder_tx["entry_point_selector"], 16)
-        if l1_event.entry_point_selector != feeder_selector:
-            return False
-
-        feeder_nonce = int(feeder_tx["nonce"], 16)
-        if l1_event.nonce != feeder_nonce:
-            return False
-
-        feeder_calldata = [int(item, 16) for item in feeder_tx["calldata"]]
-        if l1_event.calldata != feeder_calldata:
-            return False
-
-        return True

echonet/tests/test_l1_blocks.py

@@ -11,7 +11,7 @@
 from test_utils import TestUtils
 
 
-class TestFindL1BlockForTx(unittest.TestCase):
+class TestL1Blocks(unittest.TestCase):
     def mock_log(self, block_number: int, nonce: int) -> dict:
         nonce_hex = f"{nonce:064x}"
         return {
@@ -78,6 +78,32 @@ def test_find_l1_block_for_tx_no_logs_found(self):
 
         self.assertIsNone(result)
 
+    def test_matches_l1_handler_tx_success(self):
+        l1_event = TestUtils.L1_EVENT
+
+        feeder_tx = TestUtils.FEEDER_TX
+
+        self.assertTrue(L1Blocks.l1_event_matches_feeder_tx(l1_event, feeder_tx))
+
+    def test_matches_l1_handler_tx_mismatches(self):
+        l1_event = TestUtils.L1_EVENT
+
+        base_feeder_tx = TestUtils.FEEDER_TX
+
+        mismatch_cases = [
+            ("type", {"type": "INVOKE"}),
+            ("contract", {"contract_address": "0x1"}),
+            ("selector", {"entry_point_selector": "0x1"}),
+            ("nonce", {"nonce": "0x1"}),
+            ("calldata", {"calldata": ["0xabc"]}),
+        ]
+
+        for field_name, overrides in mismatch_cases:
+            with self.subTest(field=field_name):
+                # Builds a tx that is valid except for one mismatching field
+                feeder_tx = {**base_feeder_tx, **overrides}
+                self.assertFalse(L1Blocks.l1_event_matches_feeder_tx(l1_event, feeder_tx))
+
 
 if __name__ == "__main__":
     unittest.main()

echonet/tests/test_l1_events.py

@@ -31,32 +31,6 @@ def test_decode_log_wrong_signature_raises_error(self):
         with self.assertRaisesRegex(ValueError, "Unhandled event signature"):
             L1Events.decode_log(log)
 
-    def test_matches_l1_handler_tx_success(self):
-        l1_event = TestUtils.L1_EVENT
-
-        feeder_tx = TestUtils.FEEDER_TX
-
-        self.assertTrue(L1Events.l1_event_matches_feeder_tx(l1_event, feeder_tx))
-
-    def test_matches_l1_handler_tx_mismatches(self):
-        l1_event = TestUtils.L1_EVENT
-
-        base_feeder_tx = TestUtils.FEEDER_TX
-
-        mismatch_cases = [
-            ("type", {"type": "INVOKE"}),
-            ("contract", {"contract_address": "0x1"}),
-            ("selector", {"entry_point_selector": "0x1"}),
-            ("nonce", {"nonce": "0x1"}),
-            ("calldata", {"calldata": ["0xabc"]}),
-        ]
-
-        for field_name, overrides in mismatch_cases:
-            with self.subTest(field=field_name):
-                # Builds a tx that is valid except for one mismatching field
-                feeder_tx = {**base_feeder_tx, **overrides}
-                self.assertFalse(L1Events.l1_event_matches_feeder_tx(l1_event, feeder_tx))
-
 
 if __name__ == "__main__":
     unittest.main()