defi-state-querier 0.4.25__py3-none-any.whl → 0.4.27__py3-none-any.whl

defi_services/jobs/processors/multi_state_processor.py

@@ -31,11 +31,11 @@ class MultiStateProcessor:
 
     @staticmethod
     def check_address(address):
-        return Web3.isAddress(address)
+        return Web3.is_address(address)
 
     @staticmethod
     def checksum_address(address):
-        return Web3.toChecksumAddress(address)
+        return Web3.to_checksum_address(address)
 
     def init_rpc_call_information(
             self, wallet: str, query_id: str, entity_id: str, query_type: str, block_number: int = 'latest', **kwargs):

defi_services/jobs/processors/state_processor.py

@@ -39,11 +39,11 @@ class StateProcessor:
 
     @staticmethod
     def check_address(address):
-        return Web3.isAddress(address)
+        return Web3.is_address(address)
 
     @staticmethod
     def checksum_address(address):
-        return Web3.toChecksumAddress(address)
+        return Web3.to_checksum_address(address)
 
     def init_rpc_call_information(
             self, wallet: str, query_id: str, entity_id: str, query_type: str, block_number: int = 'latest', **kwargs):

defi_services/jobs/queriers/state_querier.py

@@ -112,7 +112,7 @@ class StateQuerier:
     @staticmethod
     def add_native_token_balance_rpc_call(
             fn_paras: str = None, call_id: str = None, block_number: int = "latest"):
-        eth_call = GetBalance(Web3.toChecksumAddress(fn_paras), block_number, call_id)
+        eth_call = GetBalance(Web3.to_checksum_address(fn_paras), block_number, call_id)
         return eth_call
 
     def add_rpc_call(self, abi: dict, fn_name: str, contract_address: str,
@@ -120,12 +120,12 @@ class StateQuerier:
         args = []
         if fn_paras:
             for item in fn_paras:
-                if self._w3.isAddress(item):
-                    item = self._w3.toChecksumAddress(item)
+                if self._w3.is_address(item):
+                    item = self._w3.to_checksum_address(item)
                 args.append(item)
 
         data_call = encode_eth_call_data(abi=abi, fn_name=fn_name, args=args)
-        eth_call = EthCall(to=self._w3.toChecksumAddress(contract_address), block_number=block_number,
+        eth_call = EthCall(to=self._w3.to_checksum_address(contract_address), block_number=block_number,
                            data=data_call, abi=abi, fn_name=fn_name, id=call_id)
         return eth_call
 

defi_services/services/dex/pancakeswap_service.py

@@ -38,7 +38,7 @@ class PancakeSwapServices(PancakeSwapV2Services):
         masterchef_addr = self.pool_info.get('master_chef_address')
 
         master_chef_contract = web3.eth.contract(abi=self.masterchef_abi,
-                                                 address=web3.toChecksumAddress(masterchef_addr))
+                                                 address=web3.to_checksum_address(masterchef_addr))
         pool_length = master_chef_contract.functions.poolLength().call()
 
         rpc_calls = {}

defi_services/services/dex/pancakeswap_v2_service.py

@@ -42,7 +42,7 @@ class PancakeSwapV2Services(UniswapV2Services):
         masterchef_addr = self.pool_info.get('master_chef_address')
 
         master_chef_contract = web3.eth.contract(abi=self.masterchef_abi,
-                                                 address=web3.toChecksumAddress(masterchef_addr))
+                                                 address=web3.to_checksum_address(masterchef_addr))
         pool_length = master_chef_contract.functions.poolLength().call()
 
         rpc_calls = {}

defi_services/services/dex/uniswap_v2_service.py

@@ -41,7 +41,7 @@ class UniswapV2Services(DexProtocolServices):
         factory_addr = self.pool_info.get('factory_address')
 
         factory_contract = web3.eth.contract(
-            address=web3.toChecksumAddress(factory_addr), abi=self.factory_abi)
+            address=web3.to_checksum_address(factory_addr), abi=self.factory_abi)
         pool_length = factory_contract.functions.allPairsLength().call()
 
         rpc_calls = {}

defi_services/services/dex/uniswap_v3_service.py

@@ -361,6 +361,6 @@ class UniswapV3Services(DexProtocolServices):
         return user_data
 
     def checksum_address(self, address):
-        if self.web3.isAddress(address):
-            address = self.web3.toChecksumAddress(address)
+        if self.Web3.is_address(address):
+            address = self.web3.to_checksum_address(address)
         return address

defi_services/services/lending/aave_v2_services.py

@@ -54,7 +54,7 @@ class AaveV2StateService(ProtocolServices):
     def get_dapp_asset_info(self, block_number: int = 'latest'):
         begin = time.time()
         _w3 = self.state_service.get_w3()
-        pool_address = Web3.toChecksumAddress(self.pool_info['address'])
+        pool_address = Web3.to_checksum_address(self.pool_info['address'])
         contract = _w3.eth.contract(address=pool_address, abi=self.lending_abi)
         reserves_list = contract.functions.getReservesList().call(block_identifier=block_number)
         reserves_info = {}
@@ -430,7 +430,7 @@ class AaveV2StateService(ProtocolServices):
         rpc_calls = {}
         tokens = []
         for token, value in reserves_info.items():
-            atoken, debt_token = Web3.toChecksumAddress(value['tToken']), Web3.toChecksumAddress(value['dToken'])
+            atoken, debt_token = Web3.to_checksum_address(value['tToken']), Web3.to_checksum_address(value['dToken'])
             tokens += [atoken, debt_token]
         key = f"getRewardsBalance_{self.name}_{wallet}_{block_number}".lower()
         rpc_calls[key] = self.get_function_incentive_info(

defi_services/services/lending/aave_v3_services.py

@@ -59,13 +59,13 @@ class AaveV3StateService(AaveV2StateService):
     def get_dapp_asset_info(self, block_number: int = 'latest'):
         _w3 = self.state_service.get_w3()
         pool_address = self.pool_info.get("address")
-        pool_contract = _w3.eth.contract(address=_w3.toChecksumAddress(pool_address), abi=self.lending_abi)
+        pool_contract = _w3.eth.contract(address=_w3.to_checksum_address(pool_address), abi=self.lending_abi)
         reserve_list = pool_contract.functions.getReservesList().call(block_identifier=block_number)
         reserves_info = {}
         for token in reserve_list:
             token = token.lower()
             reserve_data = pool_contract.functions.getReserveData(
-                _w3.toChecksumAddress(token)).call(block_identifier=block_number)
+                _w3.to_checksum_address(token)).call(block_identifier=block_number)
             reserves_info[token] = {}
             reserves_info[token]["tToken"] = reserve_data[8].lower()
             reserves_info[token]["sdToken"] = reserve_data[9].lower()
@@ -293,9 +293,9 @@ class AaveV3StateService(AaveV2StateService):
                 reward_token, ERC20_ABI, "decimals", block_number=block_number)
         tokens = []
         for key, value in reserves_info.items():
-            tokens += [Web3.toChecksumAddress(value["tToken"]), Web3.toChecksumAddress(value["dToken"])]
+            tokens += [Web3.to_checksum_address(value["tToken"]), Web3.to_checksum_address(value["dToken"])]
         key = f"getAllUserRewards_{self.name}_{wallet}_{block_number}".lower()
-        rpc_calls[key] = self.get_function_incentive_info("getAllUserRewards", [tokens, Web3.toChecksumAddress(wallet)], block_number)
+        rpc_calls[key] = self.get_function_incentive_info("getAllUserRewards", [tokens, Web3.to_checksum_address(wallet)], block_number)
         return rpc_calls
 
     def calculate_rewards_balance(

defi_services/services/lending/apeswap_services.py

@@ -43,7 +43,7 @@ class ApeSwapStateService(CompoundStateService):
             block_number: int = "latest"):
         _w3 = self.state_service.get_w3()
         comptroller_contract = _w3.eth.contract(
-            address=_w3.toChecksumAddress(self.pool_info.get("comptrollerAddress")), abi=self.comptroller_abi)
+            address=_w3.to_checksum_address(self.pool_info.get("comptrollerAddress")), abi=self.comptroller_abi)
         ctokens = []
         for token in comptroller_contract.functions.getAllMarkets().call(block_identifier=block_number):
             # if token in [ContractAddresses.LUNA.lower(), ContractAddresses.UST.lower(), ContractAddresses.LUNA,
@@ -52,9 +52,9 @@ class ApeSwapStateService(CompoundStateService):
             ctokens.append(token)
 
         lens_contract = _w3.eth.contract(
-            address=Web3.toChecksumAddress(self.pool_info.get("lensAddress")), abi=self.lens_abi
+            address=Web3.to_checksum_address(self.pool_info.get("lensAddress")), abi=self.lens_abi
         )
-        tokens = [Web3.toChecksumAddress(i) for i in ctokens]
+        tokens = [Web3.to_checksum_address(i) for i in ctokens]
         metadata = lens_contract.functions.cTokenMetadataAll(tokens).call(block_identifier=block_number)
         reserves_info = {}
         for data in metadata:

defi_services/services/lending/compound_service.py

@@ -50,7 +50,7 @@ class CompoundStateService(ProtocolServices):
             block_number: int = "latest"):
         _w3 = self.state_service.get_w3()
         comptroller_contract = _w3.eth.contract(
-            address=_w3.toChecksumAddress(self.pool_info.get("comptrollerAddress")), abi=self.comptroller_abi)
+            address=_w3.to_checksum_address(self.pool_info.get("comptrollerAddress")), abi=self.comptroller_abi)
         ctokens = []
         for token in comptroller_contract.functions.getAllMarkets().call(block_identifier=block_number):
             # if token in [ContractAddresses.LUNA.lower(), ContractAddresses.UST.lower(), ContractAddresses.LUNA,
@@ -59,9 +59,9 @@ class CompoundStateService(ProtocolServices):
             ctokens.append(token)
 
         lens_contract = _w3.eth.contract(
-            address=Web3.toChecksumAddress(self.pool_info.get("lensAddress")), abi=self.lens_abi
+            address=Web3.to_checksum_address(self.pool_info.get("lensAddress")), abi=self.lens_abi
         )
-        tokens = [Web3.toChecksumAddress(i) for i in ctokens]
+        tokens = [Web3.to_checksum_address(i) for i in ctokens]
         metadata = lens_contract.functions.cTokenMetadataAll(tokens).call(block_identifier=block_number)
         reserves_info = {}
         for data in metadata:

defi_services/services/lending/compound_v3_services.py

@@ -51,7 +51,7 @@ class CompoundV3StateService(CompoundStateService):
         if comets:
             pools += comets
         for pool in pools:
-            contract = w3.eth.contract(address=w3.toChecksumAddress(pool), abi=self.comet_abi)
+            contract = w3.eth.contract(address=w3.to_checksum_address(pool), abi=self.comet_abi)
             base_token = contract.functions.baseToken().call().lower()
             number_assets = contract.functions.numAssets().call()
             asset_data = {}

defi_services/services/lending/flux_services.py

@@ -47,7 +47,7 @@ class FluxStateService(CompoundStateService):
             block_number: int = "latest"):
         _w3 = self.state_service.get_w3()
         comptroller_contract = _w3.eth.contract(
-            address=_w3.toChecksumAddress(self.pool_info.get("comptrollerAddress")), abi=self.comptroller_abi)
+            address=_w3.to_checksum_address(self.pool_info.get("comptrollerAddress")), abi=self.comptroller_abi)
         ctokens = []
         for token in comptroller_contract.functions.getAllMarkets().call(block_identifier=block_number):
             # if token in [ContractAddresses.LUNA.lower(), ContractAddresses.UST.lower(), ContractAddresses.LUNA,
@@ -56,9 +56,9 @@ class FluxStateService(CompoundStateService):
             ctokens.append(token)
 
         lens_contract = _w3.eth.contract(
-            address=Web3.toChecksumAddress(self.pool_info.get("lensAddress")), abi=self.lens_abi
+            address=Web3.to_checksum_address(self.pool_info.get("lensAddress")), abi=self.lens_abi
         )
-        tokens = [Web3.toChecksumAddress(i) for i in ctokens]
+        tokens = [Web3.to_checksum_address(i) for i in ctokens]
         metadata = lens_contract.functions.cTokenMetadataAll(tokens).call(block_identifier=block_number)
         reserves_info = {}
         for data in metadata:

defi_services/services/lending/granary_services.py

@@ -61,7 +61,7 @@ class GranaryStateService(ProtocolServices):
     def get_dapp_asset_info(self, block_number: int = 'latest'):
         begin = time.time()
         _w3 = self.state_service.get_w3()
-        pool_address = Web3.toChecksumAddress(self.pool_info['address'])
+        pool_address = Web3.to_checksum_address(self.pool_info['address'])
         contract = _w3.eth.contract(address=pool_address, abi=self.lending_abi)
         reserves_list = contract.functions.getReservesList().call(block_identifier=block_number)
         reserves_info = {}

defi_services/services/lending/iron_bank_service.py

@@ -53,7 +53,7 @@ class IronBankStateService(CompoundStateService):
             block_number: int = "latest"):
         _w3 = self.state_service.get_w3()
         comptroller_contract = _w3.eth.contract(
-            address=_w3.toChecksumAddress(self.pool_info.get("comptrollerAddress")), abi=self.comptroller_abi)
+            address=_w3.to_checksum_address(self.pool_info.get("comptrollerAddress")), abi=self.comptroller_abi)
         ctokens = []
         for token in comptroller_contract.functions.getAllMarkets().call(block_identifier=block_number):
             # if token in [ContractAddresses.LUNA.lower(), ContractAddresses.UST.lower(), ContractAddresses.LUNA,
@@ -62,9 +62,9 @@ class IronBankStateService(CompoundStateService):
             ctokens.append(token)
 
         lens_contract = _w3.eth.contract(
-            address=Web3.toChecksumAddress(self.pool_info.get("lensAddress")), abi=self.lens_abi
+            address=Web3.to_checksum_address(self.pool_info.get("lensAddress")), abi=self.lens_abi
         )
-        tokens = [Web3.toChecksumAddress(i) for i in ctokens]
+        tokens = [Web3.to_checksum_address(i) for i in ctokens]
         reserves_info = {}
         queries = {}
         for token in tokens:
@@ -91,7 +91,7 @@ class IronBankStateService(CompoundStateService):
             liquidation_threshold = decoded_data.get(markets)[1] / 10 ** 18
 
             if underlying != Token.native_token:
-                underlying_contract = _w3.eth.contract(address=Web3.toChecksumAddress(underlying), abi=ERC20_ABI)
+                underlying_contract = _w3.eth.contract(address=Web3.to_checksum_address(underlying), abi=ERC20_ABI)
                 underlying_decimal = underlying_contract.functions.decimals().call()
             else:
                 underlying_decimal = Chain.native_decimals.get(self.chain_id, 18)

defi_services/services/lending/justlend_service.py

@@ -42,12 +42,12 @@ class JustLendStateService(CompoundStateService):
             block_number: int = "latest"):
         _w3 = self.state_service.get_w3()
         comptroller_contract = _w3.eth.contract(
-            address=_w3.toChecksumAddress(self.pool_info.get("comptrollerAddress")), abi=self.comptroller_abi)
+            address=_w3.to_checksum_address(self.pool_info.get("comptrollerAddress")), abi=self.comptroller_abi)
         ctokens = []
         for token in comptroller_contract.functions.getAllMarkets().call(block_identifier=block_number):
             ctokens.append(token)
 
-        tokens = [Web3.toChecksumAddress(i) for i in ctokens]
+        tokens = [Web3.to_checksum_address(i) for i in ctokens]
         reserves_info = {}
         queries = {}
         for token in tokens:
@@ -74,7 +74,7 @@ class JustLendStateService(CompoundStateService):
             liquidation_threshold = decoded_data.get(markets)[1] / 10 ** 18
 
             if underlying != Token.native_token:
-                underlying_contract = _w3.eth.contract(address=Web3.toChecksumAddress(underlying), abi=ERC20_ABI)
+                underlying_contract = _w3.eth.contract(address=Web3.to_checksum_address(underlying), abi=ERC20_ABI)
                 underlying_decimal = underlying_contract.functions.decimals().call()
             else:
                 underlying_decimal = Chain.native_decimals.get(self.chain_id, 18)

defi_services/services/lending/liqee_service.py

@@ -53,13 +53,13 @@ class LiqeeStateService(CompoundStateService):
             block_number: int = "latest"):
         _w3 = self.state_service.get_w3()
         comptroller_contract = _w3.eth.contract(
-            address=_w3.toChecksumAddress(self.pool_info.get("controllerAddress")), abi=self.controller_abi)
+            address=_w3.to_checksum_address(self.pool_info.get("controllerAddress")), abi=self.controller_abi)
         ctokens = []
         for token in comptroller_contract.functions.getAlliTokens().call(block_identifier=block_number):
             ctokens.append(token)
         reserves_info = {}
         for token in ctokens:
-            address = _w3.toChecksumAddress(token)
+            address = _w3.to_checksum_address(token)
             contract = _w3.eth.contract(address=address, abi=self.lquee_token_abi)
             underlying = contract.functions.underlying().call(block_identifier=block_number)
             liquidation_threshold = comptroller_contract.functions.markets(address).call(block_identifier=block_number)
@@ -182,7 +182,7 @@ class LiqeeStateService(CompoundStateService):
             reserves_info: dict = None,
             block_number: int = "latest",
     ):
-        fn_paras = [Web3.toChecksumAddress(wallet)]
+        fn_paras = [Web3.to_checksum_address(wallet)]
         rpc_call = self.get_lending_function_info("getAccountRewardAmount", fn_paras, block_number)
         get_reward_id = f"getAccountRewardAmount_{self.name}_{wallet}_{block_number}".lower()
         return {get_reward_id: rpc_call}

defi_services/services/lending/morpho_aave_v2_services.py

@@ -57,10 +57,10 @@ class MorphoAaveV2StateService(MorphoCompoundStateService):
             block_number: int = "latest"):
         begin = time.time()
         _w3 = self.state_service.get_w3()
-        pool_address = Web3.toChecksumAddress(self.aave_info['address'])
+        pool_address = Web3.to_checksum_address(self.aave_info['address'])
         contract = _w3.eth.contract(address=pool_address, abi=self.lending_abi)
         comptroller_contract = _w3.eth.contract(
-            address=_w3.toChecksumAddress(self.pool_info.get("comptrollerAddress")), abi=self.comptroller_abi)
+            address=_w3.to_checksum_address(self.pool_info.get("comptrollerAddress")), abi=self.comptroller_abi)
         markets = comptroller_contract.functions.getMarketsCreated().call(block_identifier=block_number)
         reserves_list = contract.functions.getReservesList().call(block_identifier=block_number)
         reserves_info = {}

defi_services/services/lending/morpho_aave_v3_services.py

@@ -55,10 +55,10 @@ class MorphoAaveV3StateService(MorphoCompoundStateService):
             block_number: int = "latest"):
         begin = time.time()
         _w3 = self.state_service.get_w3()
-        pool_address = Web3.toChecksumAddress(self.aave_info['address'])
+        pool_address = Web3.to_checksum_address(self.aave_info['address'])
         contract = _w3.eth.contract(address=pool_address, abi=self.lending_abi)
         comptroller_contract = _w3.eth.contract(
-            address=_w3.toChecksumAddress(self.pool_info.get("comptrollerAddress")), abi=self.comptroller_abi)
+            address=_w3.to_checksum_address(self.pool_info.get("comptrollerAddress")), abi=self.comptroller_abi)
         markets = comptroller_contract.functions.marketsCreated().call(block_identifier=block_number)
         markets = [i.lower() for i in markets]
         reserves_list = contract.functions.getReservesList().call(block_identifier=block_number)

defi_services/services/lending/morpho_compound_services.py

@@ -56,7 +56,7 @@ class MorphoCompoundStateService(ProtocolServices):
             block_number: int = "latest"):
         _w3 = self.state_service.get_w3()
         comptroller_contract = _w3.eth.contract(
-            address=_w3.toChecksumAddress(self.pool_info.get("comptrollerAddress")), abi=self.comptroller_abi)
+            address=_w3.to_checksum_address(self.pool_info.get("comptrollerAddress")), abi=self.comptroller_abi)
         ctokens = []
         for token in comptroller_contract.functions.getAllMarkets().call(block_identifier=block_number):
             # if token in [ContractAddresses.LUNA.lower(), ContractAddresses.UST.lower(), ContractAddresses.LUNA,
@@ -65,9 +65,9 @@ class MorphoCompoundStateService(ProtocolServices):
             ctokens.append(token)
 
         compound_lens_contract = _w3.eth.contract(
-            address=Web3.toChecksumAddress(self.compound_info.get("lensAddress")), abi=self.compound_lens_abi
+            address=Web3.to_checksum_address(self.compound_info.get("lensAddress")), abi=self.compound_lens_abi
         )
-        tokens = [Web3.toChecksumAddress(i) for i in ctokens]
+        tokens = [Web3.to_checksum_address(i) for i in ctokens]
         metadata = compound_lens_contract.functions.cTokenMetadataAll(tokens).call(block_identifier=block_number)
         reserves_info = {}
         for data in metadata:
@@ -196,8 +196,8 @@ class MorphoCompoundStateService(ProtocolServices):
         if not reserves_info:
             reserves_info = self.pool_info.get("reservesList")
         params = [
-            [Web3.toChecksumAddress(value.get(self.market_key)) for key, value in reserves_info.items()],
-            Web3.toChecksumAddress(wallet)
+            [Web3.to_checksum_address(value.get(self.market_key)) for key, value in reserves_info.items()],
+            Web3.to_checksum_address(wallet)
         ]
         rpc_call = self.get_lens_function_info("getUserUnclaimedRewards", params, block_number)
         get_reward_id = f"getUserUnclaimedRewards_{self.name}_{wallet}_{block_number}".lower()

defi_services/services/lending/onyx_service.py

@@ -49,7 +49,7 @@ class OnyxStateService(CompoundStateService):
             block_number: int = "latest"):
         _w3 = self.state_service.get_w3()
         comptroller_contract = _w3.eth.contract(
-            address=_w3.toChecksumAddress(self.pool_info.get("comptrollerAddress")), abi=self.comptroller_abi)
+            address=_w3.to_checksum_address(self.pool_info.get("comptrollerAddress")), abi=self.comptroller_abi)
         ctokens = []
         for token in comptroller_contract.functions.getAllMarkets().call(block_identifier=block_number):
             # if token in [ContractAddresses.LUNA.lower(), ContractAddresses.UST.lower(), ContractAddresses.LUNA,
@@ -58,9 +58,9 @@ class OnyxStateService(CompoundStateService):
             ctokens.append(token)
 
         lens_contract = _w3.eth.contract(
-            address=Web3.toChecksumAddress(self.pool_info.get("lensAddress")), abi=self.lens_abi
+            address=Web3.to_checksum_address(self.pool_info.get("lensAddress")), abi=self.lens_abi
         )
-        tokens = [Web3.toChecksumAddress(i) for i in ctokens]
+        tokens = [Web3.to_checksum_address(i) for i in ctokens]
         metadata = lens_contract.functions.oTokenMetadataAll(tokens).call(block_identifier=block_number)
         reserves_info = {}
         for data in metadata:
@@ -199,7 +199,7 @@ class OnyxStateService(CompoundStateService):
             )
             key = f"oTokenBalances_{self.name}_{wallet}_{token}_{block_number}".lower()
             rpc_calls[key] = self.get_lens_function_info(
-                "oTokenBalances", [value.get("cToken"), Web3.toChecksumAddress(wallet)])
+                "oTokenBalances", [value.get("cToken"), Web3.to_checksum_address(wallet)])
         return rpc_calls
 
     def calculate_wallet_deposit_borrow_balance(

defi_services/services/lending/silo_services.py

@@ -64,15 +64,15 @@ class SiloStateService(ProtocolServices):
     ):
         _w3 = self.state_service.get_w3()
         repository_contract = _w3.eth.contract(
-            address=_w3.toChecksumAddress(self.pool_info.get("repositoryAddress")), abi=self.repository_abi)
+            address=_w3.to_checksum_address(self.pool_info.get("repositoryAddress")), abi=self.repository_abi)
         result = {}
         if not tokens:
             tokens = self.pool_info.get("reservesList").keys()
         for token in tokens:
-            silo_token = repository_contract.functions.getSilo(_w3.toChecksumAddress(token)).call(block_identifier=block_number)
+            silo_token = repository_contract.functions.getSilo(_w3.to_checksum_address(token)).call(block_identifier=block_number)
             if not silo_token:
                 continue
-            contract = _w3.eth.contract(address=_w3.toChecksumAddress(silo_token), abi=self.silo_abi)
+            contract = _w3.eth.contract(address=_w3.to_checksum_address(silo_token), abi=self.silo_abi)
             assets = contract.functions.getAssets().call()
             main_asset = contract.functions.siloAsset().call()
             all_assets = [i.lower() for i in assets]

defi_services/services/lending/strike_service.py

@@ -47,7 +47,7 @@ class StrikeStateService(CompoundStateService):
             block_number: int = "latest"):
         _w3 = self.state_service.get_w3()
         comptroller_contract = _w3.eth.contract(
-            address=_w3.toChecksumAddress(self.pool_info.get("comptrollerAddress")), abi=self.comptroller_abi)
+            address=_w3.to_checksum_address(self.pool_info.get("comptrollerAddress")), abi=self.comptroller_abi)
         ctokens = []
         for token in comptroller_contract.functions.getAllMarkets().call(block_identifier=block_number):
             # if token in [ContractAddresses.LUNA.lower(), ContractAddresses.UST.lower(), ContractAddresses.LUNA,
@@ -56,9 +56,9 @@ class StrikeStateService(CompoundStateService):
             ctokens.append(token)
 
         lens_contract = _w3.eth.contract(
-            address=Web3.toChecksumAddress(self.pool_info.get("lensAddress")), abi=self.lens_abi
+            address=Web3.to_checksum_address(self.pool_info.get("lensAddress")), abi=self.lens_abi
         )
-        tokens = [Web3.toChecksumAddress(i) for i in ctokens]
+        tokens = [Web3.to_checksum_address(i) for i in ctokens]
         metadata = lens_contract.functions.sTokenMetadataAll(tokens).call(block_identifier=block_number)
         reserves_info = {}
         for data in metadata:

defi_services/services/lending/trava_services.py

@@ -53,7 +53,7 @@ class TravaStateService(ProtocolServices):
     def get_dapp_asset_info(self, block_number: int = 'latest'):
         begin = time.time()
         _w3 = self.state_service.get_w3()
-        pool_address = Web3.toChecksumAddress(self.pool_info['address'])
+        pool_address = Web3.to_checksum_address(self.pool_info['address'])
         contract = _w3.eth.contract(address=pool_address, abi=self.lending_abi)
         reserves_list = contract.functions.getReservesList().call(block_identifier=block_number)
         reserves_info = {}
@@ -396,7 +396,7 @@ class TravaStateService(ProtocolServices):
         rpc_calls = {}
         tokens = []
         for token, value in reserves_info.items():
-            atoken, debt_token = Web3.toChecksumAddress(value['tToken']), Web3.toChecksumAddress(value['dToken'])
+            atoken, debt_token = Web3.to_checksum_address(value['tToken']), Web3.to_checksum_address(value['dToken'])
             tokens += [atoken, debt_token]
         key = f"getRewardsBalance_{self.name}_{wallet}_{block_number}".lower()
         rpc_calls[key] = self.get_function_incentive_info(

defi_services/services/lending/uwu_services.py

@@ -48,7 +48,7 @@ class UwuStateService(ProtocolServices):
     def get_dapp_asset_info(self, block_number: int = 'latest'):
         begin = time.time()
         _w3 = self.state_service.get_w3()
-        pool_address = Web3.toChecksumAddress(self.pool_info['address'])
+        pool_address = Web3.to_checksum_address(self.pool_info['address'])
         contract = _w3.eth.contract(address=pool_address, abi=self.lending_abi)
         reserves_list = contract.functions.getReservesList().call(block_identifier=block_number)
         reserves_info = {}
@@ -287,7 +287,7 @@ class UwuStateService(ProtocolServices):
         rpc_calls = {}
         tokens = []
         for token, value in reserves_info.items():
-            atoken, debt_token = Web3.toChecksumAddress(value['tToken']), Web3.toChecksumAddress(value['dToken'])
+            atoken, debt_token = Web3.to_checksum_address(value['tToken']), Web3.to_checksum_address(value['dToken'])
             tokens += [atoken, debt_token]
         key = f"claimableReward_{self.name}_{wallet}_{block_number}".lower()
         rpc_calls[key] = self.get_function_incentive_info(

defi_services/services/lending/valas_services.py

@@ -51,7 +51,7 @@ class ValasStateService(ProtocolServices):
     def get_dapp_asset_info(self, block_number: int = 'latest'):
         begin = time.time()
         _w3 = self.state_service.get_w3()
-        pool_address = Web3.toChecksumAddress(self.pool_info['address'])
+        pool_address = Web3.to_checksum_address(self.pool_info['address'])
         contract = _w3.eth.contract(address=pool_address, abi=self.lending_abi)
         reserves_list = contract.functions.getReservesList().call(block_identifier=block_number)
         reserves_info = {}

defi_services/services/lending/venus_services.py

@@ -50,7 +50,7 @@ class VenusStateService(CompoundStateService):
             block_number: int = "latest"):
         _w3 = self.state_service.get_w3()
         comptroller_contract = _w3.eth.contract(
-            address=_w3.toChecksumAddress(self.pool_info.get("comptrollerAddress")), abi=self.comptroller_abi)
+            address=_w3.to_checksum_address(self.pool_info.get("comptrollerAddress")), abi=self.comptroller_abi)
         ctokens = []
         for token in comptroller_contract.functions.getAllMarkets().call(block_identifier=block_number):
             # if token in [ContractAddresses.LUNA.lower(), ContractAddresses.UST.lower(), ContractAddresses.LUNA,
@@ -59,7 +59,7 @@ class VenusStateService(CompoundStateService):
             ctokens.append(token)
 
         reserves_info = {}
-        tokens = [Web3.toChecksumAddress(i) for i in ctokens]
+        tokens = [Web3.to_checksum_address(i) for i in ctokens]
         queries = {}
         for token in tokens:
             key = f"underlying_{token}_{block_number}".lower()
@@ -83,7 +83,7 @@ class VenusStateService(CompoundStateService):
             ltv = liquidation_threshold
 
             if underlying != Token.native_token:
-                underlying_contract = _w3.eth.contract(address=Web3.toChecksumAddress(underlying), abi=ERC20_ABI)
+                underlying_contract = _w3.eth.contract(address=Web3.to_checksum_address(underlying), abi=ERC20_ABI)
                 underlying_decimal = underlying_contract.functions.decimals().call()
             else:
                 underlying_decimal = Chain.native_decimals.get(self.chain_id, 18)
@@ -152,9 +152,9 @@ class VenusStateService(CompoundStateService):
     def calculate_rewards_balance(
             self, wallet: str, reserves_info: dict, decoded_data: dict, block_number: int = "latest"):
         w3 = self.state_service.get_w3()
-        contract = w3.eth.contract(address=w3.toChecksumAddress(self.pool_info.get("lensAddress")), abi = self.lens_abi)
+        contract = w3.eth.contract(address=w3.to_checksum_address(self.pool_info.get("lensAddress")), abi = self.lens_abi)
         # get_reward_id = f"pendingRewards_{self.name}_{wallet}_{block_number}".lower()
-        return_data = contract.functions.pendingRewards(w3.toChecksumAddress(wallet), w3.toChecksumAddress(self.pool_info.get("comptrollerAddress"))).call(block_identifier=block_number)
+        return_data = contract.functions.pendingRewards(w3.to_checksum_address(wallet), w3.to_checksum_address(self.pool_info.get("comptrollerAddress"))).call(block_identifier=block_number)
         rewards = return_data[2]
         for item in return_data[-1]:
             rewards += item[-1]
@@ -365,7 +365,7 @@ class VenusStateService(CompoundStateService):
             reserves_info: dict = None,
             block_number: int = "latest"
     ):
-        tokens = [Web3.toChecksumAddress(value['cToken']) for key, value in reserves_info.items()]
+        tokens = [Web3.to_checksum_address(value['cToken']) for key, value in reserves_info.items()]
         key = f"vTokenMetadataAll_{self.pool_info.get('lensAddress')}_{block_number}".lower()
         return {
             key: self.get_lens_function_info("vTokenMetadataAll", tokens, block_number)
@@ -373,7 +373,7 @@ class VenusStateService(CompoundStateService):
 
     def ctoken_underlying_price_all(
             self, reserves_info, block_number: int = 'latest'):
-        tokens = [Web3.toChecksumAddress(value['cToken']) for key, value in reserves_info.items()]
+        tokens = [Web3.to_checksum_address(value['cToken']) for key, value in reserves_info.items()]
         key = f"vTokenUnderlyingPriceAll_{self.pool_info.get('lensAddress')}_{block_number}".lower()
         return {
             key: self.get_lens_function_info("cTokenUnderlyingPriceAll", tokens, block_number)

defi_services/services/lending/wepiggy_services.py

@@ -56,7 +56,7 @@ class WepiggyStateService(CompoundStateService):
             block_number: int = "latest"):
         _w3 = self.state_service.get_w3()
         comptroller_contract = _w3.eth.contract(
-            address=_w3.toChecksumAddress(self.pool_info.get("comptrollerAddress")), abi=self.comptroller_abi)
+            address=_w3.to_checksum_address(self.pool_info.get("comptrollerAddress")), abi=self.comptroller_abi)
         ctokens = []
         for token in comptroller_contract.functions.getAllMarkets().call(block_identifier=block_number):
             # if token in [ContractAddresses.LUNA.lower(), ContractAddresses.UST.lower(), ContractAddresses.LUNA,
@@ -65,16 +65,16 @@ class WepiggyStateService(CompoundStateService):
             ctokens.append(token)
 
         lens_contract = _w3.eth.contract(
-            address=Web3.toChecksumAddress(self.pool_info.get("lensAddress")), abi=self.lens_abi
+            address=Web3.to_checksum_address(self.pool_info.get("lensAddress")), abi=self.lens_abi
         )
-        tokens = [Web3.toChecksumAddress(i) for i in ctokens]
+        tokens = [Web3.to_checksum_address(i) for i in ctokens]
         reserves_info = {}
         for token in tokens:
             if token.lower() == '0xef86384cf696929c3227428f539e740ee12fcdc7':
                 reserves_info[token.lower()] = self.pool_info.get("reservesList").get(
                     "0xf88506b0f1d30056b9e5580668d5875b9cd30f23")
                 continue
-            data = lens_contract.functions.pTokenMetadata(Web3.toChecksumAddress(token)).call(
+            data = lens_contract.functions.pTokenMetadata(Web3.to_checksum_address(token)).call(
                 block_identifier=block_number)
             underlying = data[2].lower()
             ctoken = data[0].lower()

defi_services/services/token_services.py

@@ -24,7 +24,7 @@ class TokenServices:
         balance_key = f"balanceOf_{wallet}_{token}_{block_number}".lower()
         if balance_key in decoded_data:
             balance = decoded_data.get(balance_key) or 0
-            decimals = decoded_data.get(decimals_key, 18)
+            decimals = decoded_data.get(decimals_key) or 18
             return balance * token_prices.get(token, 1) / 10 ** decimals
 
         return None

defi_services/utils/convert_address.py

@@ -21,11 +21,11 @@ def convert_address_dict(data):
     if isinstance(data, dict):
         result = {}
         for key, value in data.items():
-            if Web3.isAddress(key):
+            if Web3.is_address(key):
                 key = hex_to_base58(key)
             if isinstance(value, dict):
                 value = convert_address_dict(value)
-            if Web3.isAddress(value):
+            if Web3.is_address(value):
                 value = hex_to_base58(value)
             result[key] = value
         return result

{defi_state_querier-0.4.25.dist-info → defi_state_querier-0.4.27.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: defi-state-querier
-Version: 0.4.25
+Version: 0.4.27
 Summary: Calculate apy, apr, and wallet information,... in decentralized applications.
 Home-page: https://github.com/Centic-io/defi-state-querier
 Author: Viet-Bang Pham