web3.py V7 compatibility

Author: simone1999

IceCreamSwapWeb3/EthAdvanced.py

@@ -6,7 +6,7 @@
 from web3.datastructures import AttributeDict
 from web3.eth import Eth
 from web3.exceptions import ContractLogicError
-from web3.types import FilterParams, LogReceipt, CallOverride, BlockIdentifier, TxParams, BlockData, _Hash32
+from web3.types import FilterParams, LogReceipt, StateOverride, BlockIdentifier, TxParams, BlockData, _Hash32
 
 from IceCreamSwapWeb3 import Web3Advanced
 from IceCreamSwapWeb3.Subsquid import get_filter
@@ -61,13 +61,12 @@ class EthAdvanced(Eth):
         'get_code', 'get_transaction_count', 'get_transaction_receipt',
         'wait_for_transaction_receipt', 'get_storage_at', 'replace_transaction',
         'modify_transaction', 'sign', 'sign_transaction', 'sign_typed_data', 'filter',
-        'get_filter_changes', 'get_filter_logs', 'uninstall_filter', 'submit_hashrate',
-        'get_work', 'submit_work',
+        'get_filter_changes', 'get_filter_logs', 'uninstall_filter'
     ]
 
     PROPERTIES_TO_RETRY = [
-        'accounts', 'hashrate', 'block_number', 'coinbase', 'gas_price',
-        'max_priority_fee', 'mining', 'syncing'
+        'accounts', 'block_number', 'gas_price',
+        'max_priority_fee', 'syncing'
     ]
 
     def __init__(self, w3):
@@ -92,7 +91,7 @@ def call(
             self,
             transaction: TxParams,
             block_identifier: Optional[BlockIdentifier] = None,
-            state_override: Optional[CallOverride] = None,
+            state_override: Optional[StateOverride] = None,
             ccip_read_enabled: Optional[bool] = None,
             no_retry: bool = False,
     ):
@@ -287,9 +286,6 @@ def get_logs_inner(self, filter_params: FilterParams, no_retry: bool = False):
             no_retry = True
         return exponential_retry(func_name="get_logs")(self._get_logs)(filter_params, no_retry=no_retry)
 
-    def get_block_number_from_identifier(self, block_identifier: BlockIdentifier) -> BlockNumber:
-        return block_identifier if isinstance(block_identifier, int) else self.get_block(block_identifier)["number"]
-
     def _chain_id(self):
         # usually this causes an RPC call and is used in every eth_call. Getting it once in the init and then not again.
         return self.chain_id_cached

IceCreamSwapWeb3/Multicall.py

@@ -6,7 +6,7 @@
 import eth_utils
 import rlp
 from eth_utils import to_checksum_address, to_bytes
-from web3._utils.abi import get_abi_output_types, get_abi_input_types
+from eth_utils.abi import get_abi_output_types, get_abi_input_types
 from web3.contract.contract import ContractFunction, ContractConstructor
 from web3.exceptions import ContractLogicError
 
@@ -45,7 +45,7 @@ def __init__(
             self,
             w3: Web3Advanced
     ):
-        self.w3 = copy.deepcopy(w3)
+        self.w3 = w3
         self.chain_id = self.w3.eth.chain_id
 
         if self.chain_id in self.MULTICALL_DEPLOYMENTS:

IceCreamSwapWeb3/Web3Advanced.py

@@ -5,7 +5,7 @@
 from web3 import Web3
 from web3.exceptions import ContractLogicError
 from web3.main import get_default_modules
-from web3.middleware import geth_poa_middleware
+from web3.middleware import ExtraDataToPOAMiddleware
 
 from .EthAdvanced import EthAdvanced
 from .Multicall import MultiCall
@@ -51,7 +51,7 @@ def __init__(
 
         super().__init__(provider=provider, modules=modules)
 
-        self.middleware_onion.inject(geth_poa_middleware, layer=0, name="poa")  # required for pos chains
+        self.middleware_onion.inject(ExtraDataToPOAMiddleware, layer=0, name="poa")  # required for pos chains
 
         self.latest_seen_block = self.eth.get_block_number(ignore_latest_seen_block=True)
 

setup.py

@@ -5,7 +5,7 @@
 LONG_DESCRIPTION = 'IceCreamSwap Web3.py wrapper with automatic retries, multicall and other advanced functionality'
 
 requirements = [
-    'web3',
+    'web3>=7,<8',
     'rlp',
 ]