defi-state-querier 0.4.24__tar.gz → 0.4.26__tar.gz

{defi-state-querier-0.4.24 → defi-state-querier-0.4.26}/PKG-INFO

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

defi-state-querier-0.4.26/src/defi_services/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.4.26"

{defi-state-querier-0.4.24 → defi-state-querier-0.4.26}/src/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-state-querier-0.4.24 → defi-state-querier-0.4.26}/src/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-state-querier-0.4.24 → defi-state-querier-0.4.26}/src/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-state-querier-0.4.24 → defi-state-querier-0.4.26}/src/defi_services/services/dex/dex_info/pancakeswap_info.py

@@ -6,6 +6,9 @@ from defi_services.abis.dex.pancakeswap.pancakeswap_v2_factory_abi import PANCAK
 from defi_services.abis.dex.pancakeswap.v3_pool_abi import PANCAKESWAP_V3_POOL_ABI
 
 PANCAKESWAP_V0_BSC_INFO = {
+    "project_id": "pancakeswap",
+    "chain_id": "0x1",
+    "router_address": "0xeff92a263d31888d860bd50809a8d171709b7b1c",
     'master_chef_address': '0x73feaa1ee314f8c655e354234017be2193c9e24e',
     "reward_token": "0x0e09fabb73bd3ade0a17ecc321fd13a19e81ce82",
     'forked': 'uniswap-v2'
@@ -13,15 +16,20 @@ PANCAKESWAP_V0_BSC_INFO = {
 }
 
 PANCAKESWAP_V2_BSC_INFO = {
+    "project_id": "pancakeswap-amm",
+    "chain_id": "0x38",
     'factory_address': '0xca143ce32fe78f1f7019d7d551a6402fc5350c73',
     'master_chef_address': '0xa5f8c5dbd5f286960b9d90548680ae5ebff07652',
     "reward_token": "0x0e09fabb73bd3ade0a17ecc321fd13a19e81ce82",
     'factory_abi': PANCAKESWAP_V2_FACTORY_ABI,
     'master_chef_abi': PANCAKESWAP_MASTERCHEF_V2_ABI,
-    'forked': 'uniswap-v2'
+    'forked': 'uniswap-v2',
+    "router_address": "0x10ed43c718714eb63d5aa57b78b54704e256024e",
 }
 
 PANCAKESWAP_V3_BSC_INFO = {
+    "project_id": "pancakeswap-v3",
+    "chain_id": "0x38",
     'factory_address': '0x0bfbcf9fa4f9c56b0f40a671ad40e0805a091865',
     'factory_abi': PANCAKESWAP_V3_FACTORY_ABI,
     'master_chef_address': '0x556b9306565093c855aea9ae92a594704c2cd59e',
@@ -31,5 +39,6 @@ PANCAKESWAP_V3_BSC_INFO = {
     'pool_abi': PANCAKESWAP_V3_POOL_ABI,
     'forked': 'uniswap-v3',
     "reward_token": "0x0e09fabb73bd3ade0a17ecc321fd13a19e81ce82",
+    'router_address': "0x13f4ea83d0bd40e75c8222255bc855a974568dd4"
 
 }

{defi-state-querier-0.4.24 → defi-state-querier-0.4.26}/src/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-state-querier-0.4.24 → defi-state-querier-0.4.26}/src/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-state-querier-0.4.24 → defi-state-querier-0.4.26}/src/defi_services/services/dex/pancakeswap_v3_service.py

@@ -126,6 +126,10 @@ class PancakeSwapV3Service(UniswapV3Services):
                 query_id = f'decimals_{token_address}_{block_number}'.lower()
                 rpc_calls[query_id] = self.state_service.get_function_info(
                     address=token_address, abi=ERC20_ABI, fn_name="decimals", block_number=block_number)
+                query_id = f'{token_key}_{lp_token}_{block_number}'.lower()
+                rpc_calls[query_id] = self.state_service.get_function_info(
+                    address=lp_token, abi=self.pool_info['pool_abi'], fn_name=token_key, fn_paras=None,
+                    block_number=block_number)
 
         return rpc_calls
 
@@ -133,15 +137,21 @@ class PancakeSwapV3Service(UniswapV3Services):
         lp_token_info = supplied_data['lp_token_info']
         for lp_token, value in lp_token_info.items():
             slot0 = response_data.get(f"slot0_{lp_token}_{block_number}".lower())
-            price = (slot0[0] / 2 ** 96) ** 2
             token0_address = value.get('token0')
             token1_address = value.get('token1')
-            token0_decimals = response_data.get(f'decimals_{token0_address}_{block_number}'.lower())
-            token1_decimals = response_data.get(f'decimals_{token1_address}_{block_number}'.lower())
+            if token0_address == response_data.get(f'token0_{lp_token}_{block_number}'.lower()):
+                token0_decimals = response_data.get(f'decimals_{token0_address}_{block_number}'.lower())
+                token1_decimals = response_data.get(f'decimals_{token1_address}_{block_number}'.lower())
+            else:
+                token1_decimals = response_data.get(f'decimals_{token0_address}_{block_number}'.lower())
+                token0_decimals = response_data.get(f'decimals_{token1_address}_{block_number}'.lower())
+            price = (slot0[0] / 2 ** 96) ** 2 * 10 ** (token0_decimals - token1_decimals)
             unstake_liquidity = response_data.get(f"liquidity_{lp_token}_{block_number}".lower())
             tick_spacing = response_data.get(f'tickSpacing_{lp_token}_{block_number}'.lower())
 
             lp_token_info[lp_token].update({
+                "token0": token0_address,
+                "token1": token1_address,
                 'liquidity_in_range': unstake_liquidity,
                 "price": price,
                 'tick': slot0[1],
@@ -174,9 +184,12 @@ class PancakeSwapV3Service(UniswapV3Services):
             tick_upper = (tick // tick_spacing + 1) * tick_spacing
             amount0, amount1 = get_token_amount_of_pool(liquidity=liquidity_in_range,
                                                         tick_lower=tick_lower, tick_upper=tick_upper)
+            # stake_amount0, stake_amount1 = get_token_amount_of_pool(liquidity=value.get("stake_liquidity"), tick_lower= tick_lower, tick_upper=tick_upper)
             lp_token_info[lp_token].update({
                 'token0_amount_in_range': amount0 / 10 ** value.get('token0_decimals'),
-                'token1_amount_in_range': amount1 / 10 ** value.get('token1_decimals')
+                'token1_amount_in_range': amount1 / 10 ** value.get('token1_decimals'),
+                # 'token0_amount_stake': stake_amount0 / 10 ** value.get('token0_decimals'),
+                # 'token1_amount_stake': stake_amount1 / 10 ** value.get('token1_decimals')
             })
 
         return lp_token_info
@@ -253,6 +266,7 @@ class PancakeSwapV3Service(UniswapV3Services):
                     'tick_upper': master_chef_position[3],
                     'reward': master_chef_position[5] / 10 ** 18,
                     'farming_pid': master_chef_position[7],
+                    'reward_token': self.pool_info['reward_token'],
                     'pending_cake': decoded_data.get(
                         f'pendingCake_{self.masterchef_addr}_{token_id}_{block_number}'.lower()) / 10 ** 18,
                     'fee_growth_inside0_x128': nft_position[8],
@@ -284,9 +298,13 @@ class PancakeSwapV3Service(UniswapV3Services):
                                                                            block_number)
         for token_id, value in user_data['stake_token'].items():
             pid = value.get('farming_pid')
-            lp_token_address = decoded_data.get(f'poolInfo_{self.masterchef_addr}_{pid}_{block_number}'.lower())[1]
+            pool_info = decoded_data.get(f'poolInfo_{self.masterchef_addr}_{pid}_{block_number}'.lower())
+            lp_token_address = pool_info[1]
             user_data['stake_token'][token_id].update({
-                'pool_address': lp_token_address
+                'pool_address': lp_token_address,
+                'token0': pool_info[2],
+                'token1': pool_info[3],
+                'fee': pool_info[4]
             })
             liquidity = value.get('liquidity')
             token0_decimals = lp_token_info.get(lp_token_address, {}).get("token0_decimals")
@@ -296,7 +314,7 @@ class PancakeSwapV3Service(UniswapV3Services):
             tick_lower = value.get('tick_lower')
             tick_upper = value.get('tick_upper')
             if price and tick:
-                sqrt_price_x96 = math.sqrt(price) * 2 ** 96
+                sqrt_price_x96 = (math.sqrt(price / 10 ** (token0_decimals - token1_decimals))) * 2 ** 96
                 token0_amount, token1_amount = get_token_amount_of_user(liquidity=liquidity,
                                                                         sqrt_price_x96=sqrt_price_x96,
                                                                         tick=tick, tick_upper=tick_upper,

{defi-state-querier-0.4.24 → defi-state-querier-0.4.26}/src/defi_services/services/dex/quickswap_v3_service.py

@@ -86,6 +86,10 @@ class QuickSwapV3Services(UniswapV3Services):
                 query_id = f'decimals_{token_address}_{block_number}'.lower()
                 rpc_calls[query_id] = self.state_service.get_function_info(
                     address=token_address, abi=ERC20_ABI, fn_name="decimals", block_number=block_number)
+                query_id = f'{token_key}_{lp_token}_{block_number}'.lower()
+                rpc_calls[query_id] = self.state_service.get_function_info(
+                    address=lp_token, abi=self.pool_info['pool_abi'], fn_name=token_key, fn_paras=None,
+                    block_number=block_number)
 
         return rpc_calls
 
@@ -94,14 +98,20 @@ class QuickSwapV3Services(UniswapV3Services):
         for lp_token, value in lp_token_info.items():
             liquidity_in_range = response_data.get(f'liquidity_{lp_token}_{block_number}'.lower(), 0)
             slot0 = response_data.get(f"globalState_{lp_token}_{block_number}".lower())
-            price = (slot0[0] / 2 ** 96) ** 2
             token0_address = value.get('token0')
             token1_address = value.get('token1')
-            token0_decimals = response_data.get(f'decimals_{token0_address}_{block_number}'.lower())
-            token1_decimals = response_data.get(f'decimals_{token1_address}_{block_number}'.lower())
+            if token0_address == response_data.get(f'token0_{lp_token}_{block_number}'.lower()):
+                token0_decimals = response_data.get(f'decimals_{token0_address}_{block_number}'.lower())
+                token1_decimals = response_data.get(f'decimals_{token1_address}_{block_number}'.lower())
+            else:
+                token1_decimals = response_data.get(f'decimals_{token0_address}_{block_number}'.lower())
+                token0_decimals = response_data.get(f'decimals_{token1_address}_{block_number}'.lower())
+            price = (slot0[0] / 2 ** 96) ** 2 * 10 ** (token0_decimals - token1_decimals)
             tick_spacing = response_data.get(f'tickSpacing_{lp_token}_{block_number}'.lower())
 
             lp_token_info[lp_token].update({
+                "token0": token0_address,
+                "token1": token1_address,
                 "liquidity_in_range": liquidity_in_range,
                 "price": price,
                 'tick': slot0[1],
@@ -213,4 +223,4 @@ class QuickSwapV3Services(UniswapV3Services):
                     'token1_reward': token1_reward
                 })
 
-        return user_data
+        return user_data

{defi-state-querier-0.4.24 → defi-state-querier-0.4.26}/src/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-state-querier-0.4.24 → defi-state-querier-0.4.26}/src/defi_services/services/dex/uniswap_v3_service.py

@@ -98,6 +98,10 @@ class UniswapV3Services(DexProtocolServices):
                 query_id = f'decimals_{token_address}_{block_number}'.lower()
                 rpc_calls[query_id] = self.state_service.get_function_info(
                     address=token_address, abi=ERC20_ABI, fn_name="decimals", block_number=block_number)
+                query_id = f'{token_key}_{lp_token}_{block_number}'.lower()
+                rpc_calls[query_id] = self.state_service.get_function_info(
+                    address=lp_token, abi=self.pool_info['pool_abi'], fn_name=token_key, fn_paras=None,
+                    block_number=block_number)
 
         return rpc_calls
 
@@ -106,14 +110,19 @@ class UniswapV3Services(DexProtocolServices):
         for lp_token, value in lp_token_info.items():
             liquidity_in_range = response_data.get(f'liquidity_{lp_token}_{block_number}'.lower(), 0)
             slot0 = response_data.get(f"slot0_{lp_token}_{block_number}".lower())
-            price = (slot0[0] / 2 ** 96) ** 2
             token0_address = value.get('token0')
             token1_address = value.get('token1')
-            token0_decimals = response_data.get(f'decimals_{token0_address}_{block_number}'.lower())
-            token1_decimals = response_data.get(f'decimals_{token1_address}_{block_number}'.lower())
+            if token0_address == response_data.get(f'token0_{lp_token}_{block_number}'.lower()):
+                token0_decimals = response_data.get(f'decimals_{token0_address}_{block_number}'.lower())
+                token1_decimals = response_data.get(f'decimals_{token1_address}_{block_number}'.lower())
+            else:
+                token1_decimals = response_data.get(f'decimals_{token0_address}_{block_number}'.lower())
+                token0_decimals = response_data.get(f'decimals_{token1_address}_{block_number}'.lower())
+            price = (slot0[0] / 2 ** 96) ** 2 * 10 ** (token0_decimals - token1_decimals)
             tick_spacing = response_data.get(f'tickSpacing_{lp_token}_{block_number}'.lower())
-
             lp_token_info[lp_token].update({
+                "token0": token0_address,
+                "token1": token1_address,
                 "liquidity_in_range": liquidity_in_range,
                 "price": price,
                 'tick': slot0[1],
@@ -272,7 +281,7 @@ class UniswapV3Services(DexProtocolServices):
             tick_upper = value.get('tick_upper')
             tick_lower = value.get('tick_lower')
             if price and tick:
-                sqrt_price_x96 = (math.sqrt(price)) * 2 ** 96
+                sqrt_price_x96 = (math.sqrt(price / 10 ** (token0_decimals - token1_decimals))) * 2 ** 96
 
                 token0_amount, token1_amount = get_token_amount_of_user(
                     liquidity=liquidity,
@@ -352,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-state-querier-0.4.24 → defi-state-querier-0.4.26}/src/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-state-querier-0.4.24 → defi-state-querier-0.4.26}/src/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-state-querier-0.4.24 → defi-state-querier-0.4.26}/src/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-state-querier-0.4.24 → defi-state-querier-0.4.26}/src/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-state-querier-0.4.24 → defi-state-querier-0.4.26}/src/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-state-querier-0.4.24 → defi-state-querier-0.4.26}/src/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-state-querier-0.4.24 → defi-state-querier-0.4.26}/src/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-state-querier-0.4.24 → defi-state-querier-0.4.26}/src/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-state-querier-0.4.24 → defi-state-querier-0.4.26}/src/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-state-querier-0.4.24 → defi-state-querier-0.4.26}/src/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-state-querier-0.4.24 → defi-state-querier-0.4.26}/src/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-state-querier-0.4.24 → defi-state-querier-0.4.26}/src/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-state-querier-0.4.24 → defi-state-querier-0.4.26}/src/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-state-querier-0.4.24 → defi-state-querier-0.4.26}/src/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(