Fix async issue with parsing block identifier

- ``BaseContractCaller`` used the sync version of ``parse_block_identifier`` which would render any calls inside it useless for ``AsyncContractCaller`` which inherits from it. I'm assuming we don't test all cases here. This commit splits the bulk of that logic out to the sync and async __init__ methods for contract caller and calls a more appropriate method for parsing the block identifier that doesn't involve an extra call. This reduces some of the intended functionality, but that wasn't working to begin with.

This will need to be revised at some point to see if we can account for all desired cases within the async contract caller __init__.

Author: fselmo

web3/_utils/contracts.py

@@ -422,7 +422,7 @@ def parse_block_identifier(
     elif isinstance(block_identifier, bytes) or is_hex_encoded_block_hash(
         block_identifier
     ):
-        return w3.eth.get_block(HexBytes(block_identifier))["number"]
+        return w3.eth.get_block(block_identifier)["number"]
     else:
         raise BlockNumberOutofRange
 
@@ -438,23 +438,50 @@ def parse_block_identifier_int(w3: "Web3", block_identifier_int: int) -> BlockNu
     return BlockNumber(block_num)
 
 
-def async_parse_block_identifier(
+def parse_block_identifier_no_extra_call(
+    async_w3: Union["Web3", "AsyncWeb3"], block_identifier: BlockIdentifier
+) -> BlockIdentifier:
+    if block_identifier is None:
+        return async_w3.eth.default_block
+    elif isinstance(block_identifier, int) and block_identifier >= 0:
+        return block_identifier
+    elif block_identifier in ["latest", "earliest", "pending", "safe", "finalized"]:
+        return block_identifier
+    elif isinstance(block_identifier, bytes):
+        return HexBytes(block_identifier)
+    elif is_hex_encoded_block_hash(block_identifier):
+        return HexStr(str(block_identifier))
+    else:
+        raise BlockNumberOutofRange
+
+
+async def async_parse_block_identifier(
     async_w3: "AsyncWeb3", block_identifier: BlockIdentifier
 ) -> BlockIdentifier:
     if block_identifier is None:
         return async_w3.eth.default_block
     if isinstance(block_identifier, int):
-        return async_parse_block_identifier_int(block_identifier)
+        return await async_parse_block_identifier_int(async_w3, block_identifier)
     elif block_identifier in ["latest", "earliest", "pending", "safe", "finalized"]:
         return block_identifier
     elif isinstance(block_identifier, bytes) or is_hex_encoded_block_hash(
         block_identifier
     ):
-        return HexBytes(block_identifier)
+        requested_block = await async_w3.eth.get_block(block_identifier)
+        return requested_block["number"]
     else:
         raise BlockNumberOutofRange
 
 
-def async_parse_block_identifier_int(block_identifier_int: int) -> BlockNumber:
-    assert block_identifier_int >= 0
-    return BlockNumber(block_identifier_int)
+async def async_parse_block_identifier_int(
+    async_w3: "AsyncWeb3", block_identifier_int: int
+) -> BlockNumber:
+    if block_identifier_int >= 0:
+        block_num = block_identifier_int
+    else:
+        last_block = await async_w3.eth.get_block("latest")
+        last_block_num = last_block["number"]
+        block_num = last_block_num + block_identifier_int + 1
+        if block_num < 0:
+            raise BlockNumberOutofRange
+    return BlockNumber(block_num)

web3/contract/async_contract.py

@@ -35,6 +35,7 @@
 )
 from web3._utils.contracts import (
     async_parse_block_identifier,
+    parse_block_identifier_no_extra_call,
 )
 from web3._utils.datatypes import (
     PropertyCheckingFactory,
@@ -339,7 +340,7 @@ async def call(
         """
         call_transaction = self._get_call_txparams(transaction)
 
-        block_id = async_parse_block_identifier(self.w3, block_identifier)
+        block_id = await async_parse_block_identifier(self.w3, block_identifier)
 
         return await async_call_contract_function(
             self.w3,
@@ -586,7 +587,12 @@ def __init__(
                     decode_tuples=decode_tuples,
                 )
 
-                block_id = async_parse_block_identifier(self.w3, block_identifier)
+                # TODO: This is a hack to get around the fact that we can't call the
+                #  full async method from within a class's __init__ method. We'll need
+                #  to see if there's a way to account for all desired elif cases.
+                block_id = parse_block_identifier_no_extra_call(
+                    self.w3, block_identifier
+                )
                 caller_method = partial(
                     self.call_function,
                     fn,