fix conflicts

Author: pacrob

ens/main.py

@@ -67,6 +67,7 @@
 if TYPE_CHECKING:
     from web3 import Web3  # noqa: F401
     from web3.contract import (  # noqa: F401
+        AsyncContract,
         Contract,
     )
     from web3.providers import (  # noqa: F401
@@ -232,7 +233,7 @@ def setup_address(
         if address is None:
             address = EMPTY_ADDR_HEX
         transact['from'] = owner
-        resolver: 'Contract' = self._set_resolver(name, transact=transact)
+        resolver: Union['Contract', 'AsyncContract'] = self._set_resolver(name, transact=transact)
         return resolver.functions.setAddr(raw_name_to_hash(name), address).transact(transact)
 
     def setup_name(
@@ -285,7 +286,7 @@ def setup_name(
                 self.setup_address(name, address, transact=transact)
             return self._setup_reverse(name, address, transact=transact)
 
-    def resolver(self, name: str) -> Optional['Contract']:
+    def resolver(self, name: str) -> Optional[Union['Contract', 'AsyncContract']]:
         """
         Get the resolver for an ENS name.
 
@@ -294,7 +295,8 @@ def resolver(self, name: str) -> Optional['Contract']:
         normal_name = normalize_name(name)
         return self._get_resolver(normal_name)[0]
 
-    def reverser(self, target_address: ChecksumAddress) -> Optional['Contract']:
+    def reverser(self,
+                 target_address: ChecksumAddress) -> Optional[Union['Contract', 'AsyncContract']]:
         reversed_domain = address_to_reverse_domain(target_address)
         return self.resolver(reversed_domain)
 
@@ -511,7 +513,7 @@ def _set_resolver(
         name: str,
         resolver_addr: Optional[ChecksumAddress] = None,
         transact: Optional["TxParams"] = None
-    ) -> 'Contract':
+    ) -> Union['Contract', 'AsyncContract']:
         if not transact:
             transact = {}
         transact = deepcopy(transact)
@@ -529,7 +531,7 @@ def _get_resolver(
         self,
         normal_name: str,
         fn_name: str = 'addr'
-    ) -> Tuple[Optional['Contract'], str]:
+    ) -> Tuple[Optional[Union['Contract', 'AsyncContract']], str]:
         current_name = normal_name
 
         # look for a resolver, starting at the full name and taking the parent each time that no
@@ -549,7 +551,8 @@ def _get_resolver(
             current_name = self.parent(current_name)
 
     def _decode_ensip10_resolve_data(
-        self, contract_call_result: bytes, extended_resolver: 'Contract', fn_name: str,
+        self, contract_call_result: bytes,
+        extended_resolver: Union['Contract', 'AsyncContract'], fn_name: str,
     ) -> Any:
         func = extended_resolver.get_function_by_name(fn_name)
         output_types = get_abi_output_types(func.abi)
@@ -568,18 +571,21 @@ def _setup_reverse(
         transact['from'] = address
         return self._reverse_registrar().functions.setName(name).transact(transact)
 
-    def _type_aware_resolver(self, address: ChecksumAddress, func: str) -> 'Contract':
+    def _type_aware_resolver(self,
+                             address: ChecksumAddress,
+                             func: str) -> Union['Contract', 'AsyncContract']:
         return (
             self._reverse_resolver_contract(address=address) if func == 'name' else
             self._resolver_contract(address=address)
         )
 
-    def _reverse_registrar(self) -> 'Contract':
+    def _reverse_registrar(self) -> Union['Contract', 'AsyncContract']:
         addr = self.ens.caller.owner(normal_name_to_hash(REVERSE_REGISTRAR_DOMAIN))
         return self.w3.eth.contract(address=addr, abi=abis.REVERSE_REGISTRAR)
 
 
-def _resolver_supports_interface(resolver: 'Contract', interface_id: HexStr) -> bool:
+def _resolver_supports_interface(resolver: Union['Contract', 'AsyncContract'],
+                                 interface_id: HexStr) -> bool:
     if not any('supportsInterface' in repr(func) for func in resolver.all_functions()):
         return False
     return resolver.caller.supportsInterface(interface_id)

tests/core/eth-module/test_eth_properties.py

@@ -56,4 +56,4 @@ async def test_async_set_chain_id(async_w3):
     assert await async_w3.eth.chain_id == 72
 
     async_w3.eth.chain_id = None
-    assert await async_w3.eth.chain_id == 131277322940537
+    assert await async_w3.eth.chain_id == 131277322940537

tests/integration/test_ethereum_tester.py

@@ -392,12 +392,6 @@ def test_eth_chain_id(self, w3):
         assert is_integer(chain_id)
         assert chain_id == 131277322940537
 
-    def test_eth_chainId(self, w3):
-        with pytest.warns(DeprecationWarning):
-            chain_id = w3.eth.chainId
-        assert is_integer(chain_id)
-        assert chain_id == 131277322940537
-
     @disable_auto_mine
     def test_eth_wait_for_transaction_receipt_unmined(self,
                                                       eth_tester,

web3/providers/eth_tester/middleware.py

@@ -83,6 +83,7 @@ def is_hexstr(value: Any) -> bool:
 
 
 TRANSACTION_REQUEST_FORMATTERS = {
+    'chainId': to_integer_if_hex,
     'gas': to_integer_if_hex,
     'gasPrice': to_integer_if_hex,
     'value': to_integer_if_hex,