defi-state-querier 0.4.24__py3-none-any.whl → 0.4.26__py3-none-any.whl

defi_services/__init__.py

@@ -1 +1 @@
-__version__ = "0.4.24"
+__version__ = "0.4.26"

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/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_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/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_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_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

@@ -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_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/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.24.dist-info → defi_state_querier-0.4.26.dist-info}/METADATA

@@ -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.24.dist-info → defi_state_querier-0.4.26.dist-info}/RECORD

@@ -1,4 +1,4 @@
-defi_services/__init__.py,sha256=WWrTOK_Nz_e97GQCElAGK_CtxVsM2uOWZphO5msHKOs,23
+defi_services/__init__.py,sha256=lR0PxzTAjaaJQ_3Wm5vE1PfTgOS8pdhmsmn4OrIioB0,23
 defi_services/abis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 defi_services/abis/dex/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 defi_services/abis/dex/biswap/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -252,13 +252,13 @@ defi_services/constants/entities/vault_services.py,sha256=IMmQc15wS1KA7EuQqM_Ara
 defi_services/jobs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 defi_services/jobs/processors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 defi_services/jobs/processors/cosmos_state_processor.py,sha256=2S5fhqHQ4pUtRaLnbFJNUo4jKc5MHq7HA-0FHebOJyo,1334
-defi_services/jobs/processors/multi_state_processor.py,sha256=20pYx-vpOvJwYNM4NvRrc149V4DM_RZGhJ6EQDQ0oJw,4749
+defi_services/jobs/processors/multi_state_processor.py,sha256=uMv1kVkkBV_GkYnMVaE8UgAhdnu7J_FzU6-fAoXCqjo,4752
 defi_services/jobs/processors/solana_state_processor.py,sha256=szsBYrkEV8kBzuA_iaSVescnwKJ2MHoTbut5kORbWTs,4065
-defi_services/jobs/processors/state_processor.py,sha256=EqHSjL4hgGX51n54d1WLlNdbxE2W39byGzzJd8ghMHM,7288
+defi_services/jobs/processors/state_processor.py,sha256=Ze_5isU_l_APB262E-VV_4KZwEG6W0XE6PikJZIcAoM,7291
 defi_services/jobs/processors/substrate_state_processor.py,sha256=KkiY1NkaxnizNJBTfn4twB-zuQo3fT3akOlbie8VF5g,3940
 defi_services/jobs/queriers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 defi_services/jobs/queriers/solana_state_querier.py,sha256=TQELYo6GUoF8s-LfetqYbclNaH8bakQqC7y2ifACIb8,3239
-defi_services/jobs/queriers/state_querier.py,sha256=CACVB3UOpka37qgDY1aS00zIJJFrkIPvmBULIMEeZRQ,7299
+defi_services/jobs/queriers/state_querier.py,sha256=-bx71x2ZobwuAlc2pVp5Ju_fxYt48wLrs8IdLN1KJVs,7306
 defi_services/jobs/queriers/substrate_state_querier.py,sha256=_T0Dk06sP_uBKaxgj2J_EBtJDoq-hi8jU7Np4iuO0LA,3858
 defi_services/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 defi_services/services/cosmos_token_services.py,sha256=6z_eE7lF5tY461VJ6uVoG18hOdXKeWR4NgDDP-MGI0k,1603
@@ -269,49 +269,49 @@ defi_services/services/solana_token_services.py,sha256=NQKUHGMBe9eQciOaY3N20rPbI
 defi_services/services/substrate_token_services.py,sha256=HsjceBHo0fxQIcXgDaV0OBANLuggRwXAEPt7ASB0BKk,2904
 defi_services/services/token_services.py,sha256=ncGdOpATIb9tGFa9cY1dQq3hFRwbhcYwIz0we9tNWNY,2766
 defi_services/services/dex/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-defi_services/services/dex/pancakeswap_service.py,sha256=MR3x5lvZrZWqrAiSwIe-0ANBhGJ9u0iWvpYDFrxW8_w,4635
-defi_services/services/dex/pancakeswap_v2_service.py,sha256=iEWF2u40zLj0C0zvIon40lCKU-jMeCXs63RApNmpJ1o,13096
-defi_services/services/dex/pancakeswap_v3_service.py,sha256=DUBXVQQRsQM5Z404zmLjFBPCpk572AGw8XcUeSc3_2s,20171
+defi_services/services/dex/pancakeswap_service.py,sha256=cN_L7897l8dh7DnNuHo6fcnYa-JLHI7yLLzBW1C9RlI,4637
+defi_services/services/dex/pancakeswap_v2_service.py,sha256=ppRruxXHKeY3BQY5DxBQoNDjNIc6kqo3Wjgd6mO9CcA,13098
+defi_services/services/dex/pancakeswap_v3_service.py,sha256=TR1OjlFeUEoxbYBJuyeshdciHuBmUiTJHMRog5OxwO0,21543
 defi_services/services/dex/quickswap_v2_service.py,sha256=vpjBNcPlxwOW-WqTuxYKK2coVZhXDjK39nEq8X6awQU,1155
-defi_services/services/dex/quickswap_v3_service.py,sha256=q-zCRyvH3XCnqE7_Tdw4APBHGR1PKow7uE_ai6fUCi8,10925
+defi_services/services/dex/quickswap_v3_service.py,sha256=21jGmrwoVrY8N2x0aiNBr8de88Ji2DtQ0xVYbHFw8Mg,11690
 defi_services/services/dex/spookyswap_v2_service.py,sha256=CBM0_NZTsiqBxkIHm_Ll-oTzlPZsd0TYVh4itcBNBA0,6982
 defi_services/services/dex/sushiswap_service.py,sha256=1_vCvLjQZmjOK55xUpotAgrQKqywL8txhPpBUQuFHMw,3099
 defi_services/services/dex/sushiswap_v2_service.py,sha256=QyOVdTv06sWR_SYphxGGxla3eMN3Q8sRjXU6vPPTr4Q,3834
 defi_services/services/dex/sushiswap_v3_service.py,sha256=fTBJfbyU4nSei_XCWxHKRZxzPRNwLrda3VORgKRAnYo,3141
-defi_services/services/dex/uniswap_v2_service.py,sha256=q2p92JKxAmzSs5JzH5QJsGNWUZ0rgurpYC981y7uR9k,10474
-defi_services/services/dex/uniswap_v3_service.py,sha256=PzZb-icwZrUx9odrJx0nqZEuLXyfwW8F--R9djCK0xw,17852
+defi_services/services/dex/uniswap_v2_service.py,sha256=ps8_-JW0ZjqFCLicap1zY0kenBoa3t43hZZNKI33WI0,10476
+defi_services/services/dex/uniswap_v3_service.py,sha256=R-YbfXeCnGRPWlOY1zefrQ7oT-MsRMQH6Y3wkLE9R0s,18662
 defi_services/services/dex/dex_info/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-defi_services/services/dex/dex_info/pancakeswap_info.py,sha256=oGQfc_3Skv4581p-saTylD8VBkEGnYT6bpR5F_y_hEc,1694
+defi_services/services/dex/dex_info/pancakeswap_info.py,sha256=dLtYR9_ZpKN3dme5gDZ-Oi7gnYRx2GMRRI1D9eQ3y5w,2075
 defi_services/services/dex/dex_info/quickswap_info.py,sha256=79ul5xG6rKa2IVj2ptJrQzTyG9A5vweHodU28B1lpro,963
 defi_services/services/dex/dex_info/spookyswap_info.py,sha256=oNwWsFsXE0R7b72ZDCmrhDOKwN_-T7y3N0sX26TmhIA,535
 defi_services/services/dex/dex_info/sushiswap_info.py,sha256=VnfZR6c4bsjWTTaTPxO1c1W2fjhspHQfanSP2uCFuu8,4219
 defi_services/services/dex/dex_info/uniswap_info.py,sha256=RhEXmbERg_k5NsgMKnlrgRHE7LKbyWL0wxHUy3Vt4mM,897
 defi_services/services/lending/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-defi_services/services/lending/aave_v2_services.py,sha256=RTurCor1K_DGsT_k2WNIHgrIj-ouWQsgMKIUT7ykVdw,21607
-defi_services/services/lending/aave_v3_services.py,sha256=6iMU189Qxgsd2wvQVezFOXRrkMLsOI-kXp5DsLUXPB0,16153
-defi_services/services/lending/apeswap_services.py,sha256=pum1i3rcAbpd7HY7WYGHlUNoXsaiIzyi17um1qnt4Eg,4731
-defi_services/services/lending/compound_service.py,sha256=_OOcSJZ2ZM0zcxWZeoS3A2aegogKRmpgfF9Fe73mgmg,21911
-defi_services/services/lending/compound_v3_services.py,sha256=l-8Z8k-GsS3rCNNNcSkMiXtLCTNaZ9fwKAtfxfvH3Hw,17126
+defi_services/services/lending/aave_v2_services.py,sha256=SiuBz9wKeUfg0rsGdSqt6c9TzElnbv8Xaqu71QN6WQw,21613
+defi_services/services/lending/aave_v3_services.py,sha256=HKLKJR_x--I5bO-wW5I9_PxA0x-y2HN4K-SFUnhbz8M,16163
+defi_services/services/lending/apeswap_services.py,sha256=UrLhXVzGvim_xfs54hSJ1qeTH6ber4xh01j5PWFl4C8,4737
+defi_services/services/lending/compound_service.py,sha256=8r7pAs8KaaakDuHg4BUICW4zLD-ihm_DQETYwnAFc98,21917
+defi_services/services/lending/compound_v3_services.py,sha256=wsUavP2LAJCxmr8A0MPXLDb_YmANT_3DcSlgEgXuJv4,17128
 defi_services/services/lending/cream_services.py,sha256=vtah0kMHAxztenWbJp4CxEcBMF0XUBglGRk6p9d-oiU,1644
-defi_services/services/lending/flux_services.py,sha256=3lmF0V81psxCsDuykTgA6024OBGgntea3pPKjc-_b8k,12611
+defi_services/services/lending/flux_services.py,sha256=C9WJ2MIBK4xTaXIHF3yBVu52xGCNzO4Ed5DWyxWTTeE,12617
 defi_services/services/lending/geist_services.py,sha256=UI5D-MbMqplrt7D4krSFdpaREKOT81k8boD_XhGGpUQ,1035
-defi_services/services/lending/granary_services.py,sha256=Z34sE21DcmBgfl7YPDBIYKoInnnbh10_5mEoC8wqTDQ,16461
-defi_services/services/lending/iron_bank_service.py,sha256=TgjRcd-7IjC1g8il3ZCnxHu9yGMGLIuQAuaxABvWNjY,15577
-defi_services/services/lending/justlend_service.py,sha256=2yGDfQcEkvVRl2dZZaSXIRx3Dx4jRlm0MmbIC08I4eQ,8868
-defi_services/services/lending/liqee_service.py,sha256=oZKueLnlhsTH9a9XxRuWQ8xIOxzw-6Sb1oubM9_C34Q,17134
-defi_services/services/lending/morpho_aave_v2_services.py,sha256=qUaSVisEck6dqj5f_eETxZseaBNQqvNFZNrOkInphPg,8470
-defi_services/services/lending/morpho_aave_v3_services.py,sha256=_dRWGi_CnG-87icCl2OdbGtP_FgcpKhXmH-eWSfPgZE,8266
-defi_services/services/lending/morpho_compound_services.py,sha256=QYijw7k9FJ2B58_hrUcCcSQCmMKAG8x8Uc2wUcfzDOM,14902
-defi_services/services/lending/onyx_service.py,sha256=TMuUJDvJiXffp6IrcNjoNSpp9XGULZVTdsk6T1i_y5o,15393
+defi_services/services/lending/granary_services.py,sha256=kmKaaZA1Poj4EwspijIQ5AQnykUgamvNmz-8gMMD_RI,16463
+defi_services/services/lending/iron_bank_service.py,sha256=GuXoXEbR4gkkNYfAyFkDtVeI3-knq3kFnLBeWVuUvv8,15585
+defi_services/services/lending/justlend_service.py,sha256=az1OxDAqDKjT7jZ2CiNS4sfKXjhS04kD6FWB4ZT16mQ,8874
+defi_services/services/lending/liqee_service.py,sha256=dBMlQpREqSzZY2_JCpJDxnWl9A8fWxa56KhsDNd--as,17140
+defi_services/services/lending/morpho_aave_v2_services.py,sha256=o1Ke6tS3sSbwN4WAg0s284VOiJlKTxAu_20rNY6NC4Y,8474
+defi_services/services/lending/morpho_aave_v3_services.py,sha256=bW0TSP-VpMPd0nm-a_gaN1LvaRU_iEbmnaKs7DVkJQw,8270
+defi_services/services/lending/morpho_compound_services.py,sha256=38AXwi-7yxSrRghS3OCRZrOy9cfJnC3k-yNf1Ep27Ds,14912
+defi_services/services/lending/onyx_service.py,sha256=CqQcenVidyKYIxNlaTliaYmSI8zV7_zxK_wCQE5s-r4,15401
 defi_services/services/lending/radiant_v2_services.py,sha256=ywjZ4sb2UQlbc4wBWz7mn9P6y19AvGVsgroDXl46fgc,3021
-defi_services/services/lending/silo_services.py,sha256=8HCPsq2MqzHNKiKb894xgcjZLo7ncgzkxVK31wCo4L8,16720
+defi_services/services/lending/silo_services.py,sha256=yLw90u_IXEqE3NbfhVAhG1y8qQqo26xSbYXXlh4lL3g,16726
 defi_services/services/lending/spark_services.py,sha256=68_egY0yOT7YIOVbd8rbHJBJEsL0sOr0zSsTSdw0BUY,1042
-defi_services/services/lending/strike_service.py,sha256=8rYJ41S66SyEtE7RyKFOdYGjq0XKQhfgPKRjMAURgNc,13791
-defi_services/services/lending/trava_services.py,sha256=EokudVkG9OvgIclLkwb8zQEs-W1bOpjn-saN2oqZZA0,19097
-defi_services/services/lending/uwu_services.py,sha256=m5LNC2cLvguIUWXB1NnQ9DxetnXfpZz5ueKzSmLoJ94,13839
-defi_services/services/lending/valas_services.py,sha256=cZ0Tgoq-AO5NMEs2i2mTzjrsC4EH59l6O3B6Tso4rKQ,22445
-defi_services/services/lending/venus_services.py,sha256=vALh-wDlOQye8DdOo_B6lkrhV15N7MFrp7aEni-Gg54,16507
-defi_services/services/lending/wepiggy_services.py,sha256=RyUa6Bq7pcYtliWWIgNsddSNF-axicQiq4t3mtUWsK4,15676
+defi_services/services/lending/strike_service.py,sha256=ZQ9B6Xngo64njwqABOO3CH-ESFmUmQWbisCgVXYKjak,13797
+defi_services/services/lending/trava_services.py,sha256=EpCzEweNuq-n38oxWtdPHZstrJf5BlY9rmwUjkMOxSs,19103
+defi_services/services/lending/uwu_services.py,sha256=lRGQMsDmDrpzOhHqy4ELW7aFe4JUaBoWZbgVb7Yo6mY,13845
+defi_services/services/lending/valas_services.py,sha256=gz4jgcJpOEbLH5NqPgwfcUlLCoSbjyHqz7B9Qf1rWWI,22447
+defi_services/services/lending/venus_services.py,sha256=LhSG2H16kZn8AqIS7DAOy0kxP8N2O_ZUAEl9Eho4Ujo,16523
+defi_services/services/lending/wepiggy_services.py,sha256=x10QkYpn47wgNvmDeMGgmzJxv7WPte6hqR3MCBRgMbM,15684
 defi_services/services/lending/lending_info/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 defi_services/services/lending/lending_info/arbitrum/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 defi_services/services/lending/lending_info/arbitrum/aave_v3_arbitrum.py,sha256=8lpLYjXE2bKijTeWjRQH4XUFhG3s7df3J3r5oZEZcjA,3556
@@ -383,7 +383,7 @@ defi_services/services/vault/vault_info/fantom/__init__.py,sha256=47DEQpj8HBSa-_
 defi_services/services/vault/vault_info/fantom/trava_ftm.py,sha256=dy8us4Lt0jrS9ZfaeXD4qz3OA4QwDPMRDkkxyNrJUUU,1165
 defi_services/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 defi_services/utils/apy.py,sha256=zQ9wrID79uccLj9pJI5Q9KhTDWXeBt9JaEVjNnYmnyg,356
-defi_services/utils/convert_address.py,sha256=UdElOSrUKsKIB90sYbrRPUlO6KfIruf3Q6KiMaL8_4k,1070
+defi_services/utils/convert_address.py,sha256=56u9xFXGKKwEV0Ir8NTdJzSBWmbuNBo9WfufLS-uwG4,1072
 defi_services/utils/get_fees.py,sha256=L8Xivqev5M73IC2s7FaEP97EDymoazw_YhJBOja73c8,1742
 defi_services/utils/graph_operations.py,sha256=2-onMqflUqOrbVsy7JGFyeTMOcwTgPoZ3uGWruWMA_k,6271
 defi_services/utils/init_dex_services.py,sha256=kbSoq4BR8lu8kURUoDOaOS4A-ynv4CgqS0kDA5IcZlA,529
@@ -393,8 +393,8 @@ defi_services/utils/market_service.py,sha256=imPtPHBkpEx5JnhqeIWYqbCjsIEm8IKBYHN
 defi_services/utils/memory_storage.py,sha256=BOT8laB0iVSCGE-oDlpWJQLbSC6X2blKX4zuQbs4inc,851
 defi_services/utils/sqrt_price_math.py,sha256=9lgUeWFT4wjl3Vq3b7-jZ2bGvvZx7dDBSfVnM3lsZ8o,5575
 defi_services/utils/thread_proxy.py,sha256=5Z8biAyEReUkh3vfJSvEv7GwMe3CsE5M8CbghkQtePw,2951
-defi_state_querier-0.4.24.dist-info/LICENSE,sha256=6jmfxa8nUIwfKnzZUxAHJSJ_IS7h7mpbJq26cWjoo-o,1063
-defi_state_querier-0.4.24.dist-info/METADATA,sha256=wB9cy6ruyNflAZZQQmaCQr1IJ-DRvwA6x3k5FiFvSug,4376
-defi_state_querier-0.4.24.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-defi_state_querier-0.4.24.dist-info/top_level.txt,sha256=C-OTxHK6MknKK-nAbEzCPDUl1M6pktRhgJrmsozdf6g,14
-defi_state_querier-0.4.24.dist-info/RECORD,,
+defi_state_querier-0.4.26.dist-info/LICENSE,sha256=6jmfxa8nUIwfKnzZUxAHJSJ_IS7h7mpbJq26cWjoo-o,1063
+defi_state_querier-0.4.26.dist-info/METADATA,sha256=RWDX0wrAOkLX1vUu62d9bpuM2nFqm-kfqTJTHRp9RSY,4376
+defi_state_querier-0.4.26.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+defi_state_querier-0.4.26.dist-info/top_level.txt,sha256=C-OTxHK6MknKK-nAbEzCPDUl1M6pktRhgJrmsozdf6g,14
+defi_state_querier-0.4.26.dist-info/RECORD,,