Fix 0x hash prefix missing in LazyTimestampContainer - looks like liv…

…e RPC nodes

  where returning JSON-RPC responses differently formatted

CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.21.7
+
+- Add `block_identifier` parameteter to `estimate_buy_received_amount() / estimate_sell_received_amount()`,
+  so we can ask historical prices and also track the price information per block
+- Fix `0x` hash prefix missing in `LazyTimestampContainer` - looks like live RPC nodes  
+  where returning JSON-RPC responses differently formatted
+
 # 0.21.6
 
 - Add `HotWallet.sign_bound_call_with_new_nonce`

eth_defi/event_reader/lazy_timestamp_reader.py

@@ -2,6 +2,7 @@
 
 See :py:func:`extract_timestamps_json_rpc_lazy`
 """
+import logging
 from hexbytes import HexBytes
 
 from eth_defi.event_reader.conversion import convert_jsonrpc_value_to_int
@@ -10,6 +11,9 @@
 from web3.types import BlockIdentifier
 
 
+logger = logging.getLogger(__name__)
+
+
 class OutOfSpecifiedRangeRead(Exception):
     """We tried to read a block outside out original given range."""
 
@@ -44,13 +48,23 @@ def __init__(self, web3: Web3, start_block: int, end_block: int):
         self.cache_by_block_number = {}
 
     def update_block_hash(self, block_identifier: BlockIdentifier) -> int:
+        """Internal function to get block timestamp from JSON-RPC and store it in the cache."""
         # Skip web3.py stack of slow result formatters
+
+        # TODO: Later tune down log level when successfully run in the production
+        logger.info("update_block_hash(%s)", block_identifier)
+
         if type(block_identifier) == int:
             assert block_identifier > 0
             result = self.web3.manager.request_blocking("eth_getBlockByNumber", (block_identifier, False))
         else:
             if isinstance(block_identifier, HexBytes):
                 block_identifier = block_identifier.hex()
+
+            # Make sure there is always 0x prefix for hashes
+            if not block_identifier.startswith("0x"):
+                block_identifier = "0x" + block_identifier
+
             result = self.web3.manager.request_blocking("eth_getBlockByHash", (block_identifier, False))
 
         # Note to self: block_number = 0 for the genesis block on Anvil