Use cached EthereumBlock information for indexing Safe events

safe-global · Aug 9, 2024 · 77c3007 · 77c3007
1 parent 7a49a47
commit 77c3007
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/safe_transaction_service/history/indexers/safe_events_indexer.py b/safe_transaction_service/history/indexers/safe_events_indexer.py
@@ -299,8 +299,9 @@ def _process_decoded_element(
         args = dict(decoded_element["args"])
         ethereum_tx_hash = HexBytes(decoded_element["transactionHash"])
         ethereum_tx_hash_hex = ethereum_tx_hash.hex()
-        ethereum_block = EthereumBlock.objects.values("number", "timestamp").get(
-            txs=ethereum_tx_hash
+        ethereum_block_number = decoded_element["blockNumber"]
+        ethereum_block_timestamp = EthereumBlock.objects.get_timestamp_by_hash(
+            decoded_element["blockHash"]
         )
         logger.debug(
             "[%s] %s - tx-hash=%s - Processing event %s",
@@ -312,8 +313,8 @@ def _process_decoded_element(
 
         internal_tx = InternalTx(
             ethereum_tx_id=ethereum_tx_hash,
-            timestamp=ethereum_block["timestamp"],
-            block_number=ethereum_block["number"],
+            timestamp=ethereum_block_timestamp,
+            block_number=ethereum_block_number,
             _from=safe_address,
             gas=50000,
             data=b"",
@@ -393,8 +394,8 @@ def _process_decoded_element(
             if args["value"] and not data:  # Simulate ether transfer
                 child_internal_tx = InternalTx(
                     ethereum_tx_id=ethereum_tx_hash,
-                    timestamp=ethereum_block["timestamp"],
-                    block_number=ethereum_block["number"],
+                    timestamp=ethereum_block_timestamp,
+                    block_number=ethereum_block_number,
                     _from=safe_address,
                     gas=23000,
                     data=b"",
@@ -459,7 +460,7 @@ def _process_decoded_element(
                             ethereum_tx_id=ethereum_tx_hash,
                             safe=safe_address,
                             defaults={
-                                "timestamp": ethereum_block["timestamp"],
+                                "timestamp": ethereum_block_timestamp,
                             },
                         )
                     if child_internal_tx: