defi-state-querier 0.5.18__tar.gz → 0.5.20__tar.gz

{defi_state_querier-0.5.18 → defi_state_querier-0.5.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: defi-state-querier
-Version: 0.5.18
+Version: 0.5.20
 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.5.20/src/defi_services/__init__.py

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

{defi_state_querier-0.5.18 → defi_state_querier-0.5.20}/src/defi_services/constants/chain_constant.py

@@ -30,7 +30,12 @@ class Chain:
     moonriver = '0x505'
     blast = '0xee'
     oasis_sapphire = '0x5afe'
-    zeta = '0x1b58'
+    zetachain = '0x1b58'
+    zksync = '0x144'
+    oraichain = 'orai'
+    bitcoin = 'bitcoin'
+    cosmos = 'cosmos'
+    ton = 'ton'
 
     native_decimals = {
         tron: 6,

defi_state_querier-0.5.20/src/defi_services/constants/network_constants.py

@@ -0,0 +1,58 @@
+
+from defi_services.constants.chain_constant import Chain
+
+POLYGON_AAVE_ADDRESS = '0x8dff5e27ea6b7ac08ebfdf9eb090f32ee9a30fcf'
+ETHEREUM_AAVE_ADDRESS = '0x7d2768de32b0b80b7a3454c06bdac94a69ddc7a9'
+
+BSC_TRAVA_ADDRESS = '0x75de5f7c91a89c16714017c7443eca20c7a8c295'
+ETH_TRAVA_ADDRESS = '0xd61afaaa8a69ba541bc4db9c9b40d4142b43b9a4'
+FTM_TRAVA_ADDRESS = '0xd98bb590bdfabf18c164056c185fbb6be5ee643f'
+
+BSC_VALAS_ADDRESS = '0xe29a55a6aeff5c8b1beede5bcf2f0cb3af8f91f5'
+
+BSC_VENUS_ADDRESS = '0xfd36e2c2a6789db23113685031d7f16329158384'
+BSC_CREAM_ADDRESS = '0x589de0f0ccf905477646599bb3e5c622c84cc0ba'
+
+FTM_GEIST_ADDRESS = '0x9fad24f572045c7869117160a571b2e50b10d068'
+
+ETH_COMPOUND_ADDRESS = '0x3d9819210a31b4961b30ef54be2aed79b9c9cd3b'
+ETH_CREAM_ADDRESS = ''
+
+NATIVE_TOKEN = '0x0000000000000000000000000000000000000000'
+
+NATIVE_TOKENS = {
+    Chain.bsc: '0x0000000000000000000000000000000000000000',
+    Chain.ethereum: '0x0000000000000000000000000000000000000000',
+    Chain.fantom: '0x0000000000000000000000000000000000000000',
+    Chain.polygon: '0x0000000000000000000000000000000000000000',
+    Chain.arbitrum: '0x0000000000000000000000000000000000000000',
+    Chain.optimism: '0x0000000000000000000000000000000000000000',
+    Chain.avalanche: '0x0000000000000000000000000000000000000000',
+    Chain.tron: '0x0000000000000000000000000000000000000000',
+    Chain.ton: 'EQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM9c'
+}
+
+
+class MulticallContract:
+    """
+    References: https://www.multicall3.com/deployments
+    """
+
+    on_chains_v3 = {
+        Chain.ethereum: '0xca11bde05977b3631167028862be2a173976ca11',
+        Chain.bsc: '0xca11bde05977b3631167028862be2a173976ca11',
+        Chain.polygon: '0xca11bde05977b3631167028862be2a173976ca11',
+        Chain.avalanche: '0xca11bde05977b3631167028862be2a173976ca11',
+        Chain.fantom: '0xca11bde05977b3631167028862be2a173976ca11',
+        Chain.arbitrum: '0xca11bde05977b3631167028862be2a173976ca11',
+        Chain.optimism: '0xca11bde05977b3631167028862be2a173976ca11',
+        Chain.tron: '0x32a4f47a74a6810bd0bf861cabab99656a75de9e',
+        Chain.oasis_sapphire: '0xca11bde05977b3631167028862be2a173976ca11',
+        Chain.zksync: '0xf9cda624fbc7e059355ce98a31693d299facd963'
+    }
+
+    default_address = '0xca11bde05977b3631167028862be2a173976ca11'
+
+    @classmethod
+    def get_multicall_contract(cls, chain_id):
+        return cls.on_chains_v3.get(chain_id, cls.default_address)

{defi_state_querier-0.5.18 → defi_state_querier-0.5.20}/src/defi_services/constants/token_constant.py

@@ -45,7 +45,9 @@ class Token:
         Chain.aurora: '0xc9bdeed33cd01541e1eed10f90519d2c06fe3feb',
         Chain.moonriver: '0x98878b06940ae243284ca214f92bb71a2b032b8a',
         Chain.blast: '0x4300000000000000000000000000000000000004',
-        Chain.oasis_sapphire: '0x8bc2b030b299964eefb5e1e0b36991352e56d2d3'
+        Chain.oasis_sapphire: '0x8bc2b030b299964eefb5e1e0b36991352e56d2d3',
+        Chain.zetachain: '0x5f0b1a82749cb4e2278ec87f8bf6b618dc71a8bf',
+        Chain.zksync: '0xf00dad97284d0c6f06dc4db3c32454d4292c6813'
     }
 
 

{defi_state_querier-0.5.18 → defi_state_querier-0.5.20}/src/defi_services/jobs/processors/cosmos_state_processor.py

@@ -1,13 +1,14 @@
 import logging
 
+from defi_services.constants.chain_constant import Chain
 from defi_services.constants.cosmos_decimals_constant import Denoms, MulticallContract
-from defi_services.constants.network_constants import Chains
 from defi_services.services.cosmos_token_services import CosmosTokenServices
 
 logger = logging.getLogger("CosmosStateProcessor")
 
+
 class CosmosStateProcessor:
-    def __init__(self, lcd: str, rest_uri: str = None, chain_id: str = Chains.oraichain):
+    def __init__(self, lcd: str, rest_uri: str = None, chain_id: str = Chain.oraichain):
         self.chain_id = chain_id
         self.lcd = lcd
         self.rest_uri = rest_uri

{defi_state_querier-0.5.18 → defi_state_querier-0.5.20}/src/defi_services/jobs/processors/ton_state_processor.py

@@ -1,18 +1,19 @@
 import logging
 
+from defi_services.constants.chain_constant import Chain
 from defi_services.constants.ton_decimals_constant import TonTokens
-from defi_services.constants.network_constants import Chains, NATIVE_TOKENS
+from defi_services.constants.network_constants import NATIVE_TOKENS
 from defi_services.jobs.queriers.ton_state_querier import TonStateQuerier
 
 logger = logging.getLogger("CosmosStateProcessor")
 
+
 class TonStateProcessor:
-    def __init__(self, provider_uri: str, chain_id: str = Chains.ton):
+    def __init__(self, provider_uri: str, chain_id: str = Chain.ton):
         self.chain_id = chain_id
         self.provider_uri = provider_uri
         self.state_querier = TonStateQuerier(self.provider_uri)
 
-
     def get_token_balance(self, address, tokens):
         result = {}
         if NATIVE_TOKENS[self.chain_id] in tokens:

defi_state_querier-0.5.20/src/defi_services/jobs/tcv.py

@@ -0,0 +1,144 @@
+from collections import defaultdict
+
+from defi_services.constants.entities.dex_constant import Dex
+from defi_services.constants.query_constant import Query
+from defi_services.jobs.processors.state_processor import StateProcessor
+
+
+class TCV:
+    def __init__(self, provider_uri, chain_id):
+        self.state_processor = StateProcessor(provider_uri, chain_id)
+
+    def get_tvl_info(
+            self,
+            address,
+            reserves_info,
+            block_number: int = "latest",
+    ):
+        lp_token_dict = {information["pool"]: information["poolInfo"] for information in reserves_info.values()}
+        tcv_liquidity_user, dex_lp_info = self.get_tcv_liquidity_user_and_lp_token_info(
+            wallet=address,
+            dex_protocol=Dex.uniswap_v3, lp_token_list=lp_token_dict,
+            block_number=block_number
+        )
+
+        tcv_nfts = {}
+        for vault_address, liquidity_info in tcv_liquidity_user.items():
+            # For optimize
+            liquidity_user = liquidity_info.get('liquidity_user')
+            if not liquidity_user:
+                liquidity_info.update({'tvl': {}})
+                continue
+
+            vault_nft = self.get_user_nft(vault_address, Dex.uniswap_v3, block_number=block_number)
+            tcv_nfts.update(vault_nft)
+
+        nfts_info = self.get_nfts_info(address, Dex.uniswap_v3, tcv_nfts, block_number=block_number)
+        user_balance = self.get_user_token_balance(address, Dex.uniswap_v3, nfts_info, dex_lp_info, block_number=block_number)
+
+        for token_id, info in user_balance.items():
+            pool_address = info['pool_address']
+            addresses = [vault_address_ for vault_address_, info in reserves_info.items() if info['pool'] == pool_address]
+            vault_address = addresses[0] if addresses else None
+
+            if (not vault_address) or (vault_address not in tcv_liquidity_user):
+                continue
+
+            if tcv_liquidity_user[vault_address].get('tvl') is None:
+                tcv_liquidity_user[vault_address]['tvl'] = defaultdict(lambda: 0)
+
+            tcv_liquidity_user[vault_address]['tvl'][info['token0']] += info['token0_amount']
+            tcv_liquidity_user[vault_address]['tvl'][info['token1']] += info['token1_amount']
+
+        return tcv_liquidity_user
+
+    def get_user_nft(self, wallet, dex_protocol, block_number: int = 'latest'):
+        queries = [
+            {
+                'query_id': f'{dex_protocol}_{Query.dex_user_nft}',
+                "entity_id": dex_protocol,
+                'query_type': Query.dex_user_nft
+            }
+        ]
+
+        res = self.state_processor.run(
+            wallet, queries, block_number=block_number,
+            batch_size=100, max_workers=8, ignore_error=True
+        )
+        user_nfts = res[0][Query.dex_user_nft]
+        return user_nfts
+
+    def get_nfts_info(self, wallet, dex_protocol, user_nfts, block_number: int = 'latest'):
+        queries = [
+            {
+                'query_id': f'{dex_protocol}_{Query.dex_user_info}',
+                "entity_id": dex_protocol,
+                'query_type': Query.dex_user_info,
+                'supplied_data': {
+                    'user_data': user_nfts,
+                }
+            }
+        ]
+
+        res = self.state_processor.run(
+            wallet, queries, block_number=block_number,
+            batch_size=100, max_workers=8, ignore_error=True
+        )
+        nfts_info = res[0][Query.dex_user_info]
+        return nfts_info
+
+    def get_user_token_balance(self, wallet, dex_protocol, nfts_info, lp_token_info, block_number: int = 'latest'):
+        queries = [
+            {
+                'query_id': f'{dex_protocol}_{Query.dex_user_token_balance}',
+                "entity_id": dex_protocol,
+                'query_type': Query.dex_user_token_balance,
+                'supplied_data': {
+                    'user_data': nfts_info,
+                    'lp_token_info': lp_token_info
+                }
+            }
+        ]
+
+        res = self.state_processor.run(
+            wallet, queries, block_number=block_number,
+            batch_size=100, max_workers=8, ignore_error=True
+        )
+        user_balance = res[0][Query.dex_user_token_balance]
+        return user_balance
+
+    def get_tcv_liquidity_user_and_lp_token_info(self, wallet, dex_protocol, lp_token_list, block_number: int = 'latest'):
+        queries = [
+            {
+                "query_id": f"tcv-vault_{Query.staking_reward}",
+                "entity_id": "tcv-vault",
+                "query_type": Query.staking_reward
+            },
+            {
+                'query_id': f'{dex_protocol}_{Query.lp_token_info}',
+                "entity_id": dex_protocol,
+                'query_type': Query.lp_token_info,
+                'supplied_data': {
+                    'lp_token_info': lp_token_list
+                }
+            },
+            # {
+            #     'query_id': f'{dex_protocol}_{Query.token_pair_balance}',
+            #     "entity_id": dex_protocol,
+            #     'query_type': Query.token_pair_balance,
+            #     'supplied_data': {
+            #         'lp_token_info': lp_token_list
+            #     }
+            # }
+        ]
+        res = self.state_processor.run(
+            address=wallet, queries=queries,
+            block_number=block_number,
+            batch_size=100, max_workers=8,
+            ignore_error=True
+        )
+        data = {r['query_id']: r for r in res}
+
+        tcv_liquidity_user = data.get(f'tcv-vault_{Query.staking_reward}', {}).get(Query.staking_reward)
+        lp_token_info = data.get(f'{dex_protocol}_{Query.lp_token_info}', {}).get(Query.lp_token_info)
+        return tcv_liquidity_user, lp_token_info

{defi_state_querier-0.5.18 → defi_state_querier-0.5.20}/src/defi_services/services/lending/aave_v2_services.py

@@ -3,9 +3,9 @@ import time
 
 from web3 import Web3
 
-from defi_services.abis.lending.aave_v2_and_forlks.aave_v2_incentives_abi import AAVE_V2_INCENTIVES_ABI
-from defi_services.abis.lending.aave_v2_and_forlks.lending_pool_abi import LENDING_POOL_ABI
-from defi_services.abis.lending.aave_v2_and_forlks.oracle_abi import ORACLE_ABI
+from defi_services.abis.lending.aave_v2_and_forks.aave_v2_incentives_abi import AAVE_V2_INCENTIVES_ABI
+from defi_services.abis.lending.aave_v2_and_forks.lending_pool_abi import LENDING_POOL_ABI
+from defi_services.abis.lending.aave_v2_and_forks.oracle_abi import ORACLE_ABI
 from defi_services.abis.token.erc20_abi import ERC20_ABI
 from defi_services.constants.chain_constant import Chain
 from defi_services.constants.db_constant import DBConst

{defi_state_querier-0.5.18 → defi_state_querier-0.5.20}/src/defi_services/services/lending/granary_services.py

@@ -3,9 +3,9 @@ import time
 
 from web3 import Web3
 
-from defi_services.abis.lending.aave_v2_and_forlks.aave_v2_incentives_abi import AAVE_V2_INCENTIVES_ABI
-from defi_services.abis.lending.aave_v2_and_forlks.lending_pool_abi import LENDING_POOL_ABI
-from defi_services.abis.lending.aave_v2_and_forlks.oracle_abi import ORACLE_ABI
+from defi_services.abis.lending.aave_v2_and_forks.aave_v2_incentives_abi import AAVE_V2_INCENTIVES_ABI
+from defi_services.abis.lending.aave_v2_and_forks.lending_pool_abi import LENDING_POOL_ABI
+from defi_services.abis.lending.aave_v2_and_forks.oracle_abi import ORACLE_ABI
 from defi_services.abis.lending.granary.granary_rewarder_abi import GRANARY_REWARDER_ABI
 from defi_services.abis.token.erc20_abi import ERC20_ABI
 from defi_services.constants.chain_constant import Chain

{defi_state_querier-0.5.18 → defi_state_querier-0.5.20}/src/defi_services/services/lending/morpho_aave_v2_services.py

@@ -3,9 +3,9 @@ import time
 
 from web3 import Web3
 
-from defi_services.abis.lending.aave_v2_and_forlks.aave_v2_incentives_abi import AAVE_V2_INCENTIVES_ABI
-from defi_services.abis.lending.aave_v2_and_forlks.lending_pool_abi import LENDING_POOL_ABI
-from defi_services.abis.lending.aave_v2_and_forlks.oracle_abi import ORACLE_ABI
+from defi_services.abis.lending.aave_v2_and_forks.aave_v2_incentives_abi import AAVE_V2_INCENTIVES_ABI
+from defi_services.abis.lending.aave_v2_and_forks.lending_pool_abi import LENDING_POOL_ABI
+from defi_services.abis.lending.aave_v2_and_forks.oracle_abi import ORACLE_ABI
 from defi_services.abis.lending.morpho.morpho_aave_v2_comptroller_abi import MORPHO_AAVE_V2_COMPTROLLER
 from defi_services.abis.lending.morpho.morpho_aave_v2_lens_abi import MORPHO_AAVE_V2_LENS_ABI
 from defi_services.abis.token.erc20_abi import ERC20_ABI

{defi_state_querier-0.5.18 → defi_state_querier-0.5.20}/src/defi_services/services/lending/morpho_aave_v3_services.py

@@ -3,8 +3,8 @@ import time
 
 from web3 import Web3
 
-from defi_services.abis.lending.aave_v2_and_forlks.aave_v2_incentives_abi import AAVE_V2_INCENTIVES_ABI
-from defi_services.abis.lending.aave_v2_and_forlks.oracle_abi import ORACLE_ABI
+from defi_services.abis.lending.aave_v2_and_forks.aave_v2_incentives_abi import AAVE_V2_INCENTIVES_ABI
+from defi_services.abis.lending.aave_v2_and_forks.oracle_abi import ORACLE_ABI
 from defi_services.abis.lending.aave.aave_v3.aave_v3_lending_pool_abi import AAVE_V3_LENDING_POOL_ABI
 from defi_services.abis.lending.morpho.morpho_aave_v3_comptroller_abi import MORPHO_AAVE_V3_COMPTROLLER_ABI
 from defi_services.abis.token.erc20_abi import ERC20_ABI

{defi_state_querier-0.5.18 → defi_state_querier-0.5.20}/src/defi_services/services/lending/trava_services.py

@@ -3,8 +3,8 @@ import time
 
 from web3 import Web3
 
-from defi_services.abis.lending.aave_v2_and_forlks.oracle_abi import ORACLE_ABI
-from defi_services.abis.lending.aave_v2_and_forlks.staked_incentives_abi import STAKED_INCENTIVES_ABI
+from defi_services.abis.lending.aave_v2_and_forks.oracle_abi import ORACLE_ABI
+from defi_services.abis.lending.aave_v2_and_forks.staked_incentives_abi import STAKED_INCENTIVES_ABI
 from defi_services.abis.lending.trava.trava_lending_pool_abi import TRAVA_LENDING_POOL_ABI
 from defi_services.abis.token.erc20_abi import ERC20_ABI
 from defi_services.constants.chain_constant import Chain

{defi_state_querier-0.5.18 → defi_state_querier-0.5.20}/src/defi_services/services/lending/uwu_services.py

@@ -3,9 +3,9 @@ import time
 
 from web3 import Web3
 
-from defi_services.abis.lending.aave_v2_and_forlks.lending_pool_abi import LENDING_POOL_ABI
-from defi_services.abis.lending.aave_v2_and_forlks.oracle_abi import ORACLE_ABI
-from defi_services.abis.lending.aave_v2_and_forlks.uwu_incentives_abi import UWU_INCENTIVES_ABI
+from defi_services.abis.lending.aave_v2_and_forks.lending_pool_abi import LENDING_POOL_ABI
+from defi_services.abis.lending.aave_v2_and_forks.oracle_abi import ORACLE_ABI
+from defi_services.abis.lending.aave_v2_and_forks.uwu_incentives_abi import UWU_INCENTIVES_ABI
 from defi_services.abis.token.erc20_abi import ERC20_ABI
 from defi_services.constants.chain_constant import Chain
 from defi_services.constants.entities.lending_constant import Lending

{defi_state_querier-0.5.18 → defi_state_querier-0.5.20}/src/defi_services/services/lending/valas_services.py

@@ -3,8 +3,8 @@ import time
 
 from web3 import Web3
 
-from defi_services.abis.lending.aave_v2_and_forlks.lending_pool_abi import LENDING_POOL_ABI
-from defi_services.abis.lending.aave_v2_and_forlks.oracle_abi import ORACLE_ABI
+from defi_services.abis.lending.aave_v2_and_forks.lending_pool_abi import LENDING_POOL_ABI
+from defi_services.abis.lending.aave_v2_and_forks.oracle_abi import ORACLE_ABI
 from defi_services.abis.lending.valas.chef_incentives_controller import CHEF_INCENTIVES_CONTROLLER
 from defi_services.abis.lending.valas.valas_multi_fee_distribution import VALAS_MULTI_FEE_DISTRIBUTION
 from defi_services.abis.token.erc20_abi import ERC20_ABI

defi_state_querier-0.5.20/src/defi_services/services/multicall/multicall_v2.py

@@ -0,0 +1,179 @@
+from collections import defaultdict
+from typing import Tuple, List, Union, Any, Optional, Dict
+
+from query_state_lib.base.utils.decoder import decode_eth_call_data
+from web3 import Web3, contract
+
+from defi_services.abis.multicall_v3_abi import MULTICALL_V3_ABI
+from defi_services.services.multicall.batch_queries_service import add_rpc_call, decode_data_response, \
+    decode_data_response_ignore_error
+from defi_services.utils.dict_utils import all_equal
+from defi_services.utils.logger_utils import get_logger
+
+logger = get_logger('Multicall V2')
+
+w3 = Web3()
+
+
+def get_fn_abi(abi, fn_name):
+    for abi_ in abi:
+        if abi_.get('type') == 'function' and abi_.get('name') == fn_name:
+            return abi_
+
+    return None
+
+
+def _unpack_aggregate_outputs(outputs: Any) -> Tuple[Tuple[Union[None, bool], bytes], ...]:
+    return tuple((success, output) for success, output in outputs)
+
+
+class W3Multicall:
+    """
+    Interface for multicall3.sol contract
+    """
+
+    class Call:
+
+        def __init__(self, address, abi, fn_name, fn_paras=None, block_number: Union[int, str] = 'latest', key=None):
+            if key:
+                self.id = key
+            elif fn_paras is not None:
+                self.id = f"{fn_name}_{address}_{fn_paras}_{block_number}".lower()
+            else:
+                self.id = f"{fn_name}_{address}_{block_number}".lower()
+
+            self.address = Web3.to_checksum_address(address)
+            self.fn_name = fn_name
+            self.fn_abi = get_fn_abi(abi=abi, fn_name=fn_name)
+            self.block_number = block_number
+
+            args = []
+            if fn_paras is not None:
+                if type(fn_paras) is list:
+                    for item in fn_paras:
+                        if Web3.is_address(item):
+                            args.append(Web3.to_checksum_address(item))
+                        else:
+                            args.append(item)
+                else:
+                    if Web3.is_address(fn_paras):
+                        fn_paras = Web3.to_checksum_address(fn_paras)
+                    args = [fn_paras]
+
+            c = contract.Contract
+            c.w3 = w3
+            c.abi = abi
+
+            self.data = c.encodeABI(fn_name=fn_name, args=args)
+
+    def __init__(self, web3, address='0xcA11bde05977b3631167028862bE2a173976CA11', calls: Dict[str, 'W3Multicall.Call'] = None, require_success: bool = False):
+        """
+        :param web3: Web3 instance
+        :param address: (optional) address of the multicall3.sol contract
+        :param calls: (optional) list of W3Multicall.Call to perform
+        """
+        self.web3 = web3
+        self.address = address
+        self.calls: Dict[str, 'W3Multicall.Call'] = {} if calls is None else calls.copy()
+
+        self.require_success = require_success
+
+    def add(self, call: 'W3Multicall.Call'):
+        self.calls[call.id] = call
+
+    def get_params(self, calls: Optional[Dict[str, Call]] = None) -> List[Union[bool, List[List[Any]]]]:
+        args = self._get_args(calls=calls)
+        return args
+
+    def decode(self, aggregated, calls: Optional[Dict[str, Call]] = None, ignore_error=True):
+        if calls is None:
+            calls = self.calls
+
+        unpacked = _unpack_aggregate_outputs(aggregated)
+
+        outputs = {}
+        for (call_id, call), (success, output) in zip(calls.items(), unpacked):
+            if not success:
+                logger.warning(f'Fail to query {call_id}')
+                continue
+
+            try:
+                call_output = '0x' + output.hex()
+                decoded_data = decode_eth_call_data([call.fn_abi], call.fn_name, call_output)
+            except OverflowError:
+                bytes_array = bytearray.fromhex(output.hex())
+                bytes32 = '0x' + bytes_array.hex().rstrip("0")
+                if len(bytes32) % 2 != 0:
+                    bytes32 += '0'
+                decoded_data = decode_eth_call_data([call.fn_abi], call.fn_name, bytes32)
+            except Exception as ex:
+                logger.error(f"An exception when decode data from provider: {ex}")
+                if ignore_error:
+                    continue
+
+                raise ex
+
+            if len(decoded_data) == 1:
+                decoded_data = decoded_data[0]
+
+            outputs[call_id] = decoded_data
+
+        return outputs
+
+    def _get_args(self, calls: Optional[Dict[str, Call]] = None) -> List[Union[bool, List[List[Any]]]]:
+        if calls is None:
+            calls = self.calls
+
+        block_numbers = [call.block_number for call in calls.values()]
+        if not all_equal(block_numbers):
+            raise ValueError('All calls must be queried at the same block number')
+
+        return [self.require_success, [[call.address, call.data] for call in calls.values()]]
+
+    def batch_calls_iterator(self, batch_size=2000):
+        calls_by_block_number = defaultdict(lambda: {})
+        for call_id, call in self.calls.items():
+            block_number = call.block_number
+            calls_by_block_number[block_number][call_id] = call
+
+        for block_number, calls in calls_by_block_number.items():
+            batch = {}
+
+            for call_id, call in calls.items():
+                batch[call_id] = call
+                if len(batch) >= batch_size:
+                    yield block_number, batch
+                    batch = {}
+
+            if len(batch) > 0:
+                yield block_number, batch
+
+
+def add_rpc_multicall(w3_multicall: W3Multicall, list_rpc_call=None, list_call_id=None, batch_size=2000):
+    batch_idx = 0
+    for block_number, batch_calls in w3_multicall.batch_calls_iterator(batch_size=batch_size):
+        inputs = w3_multicall.get_params(calls=batch_calls)
+        add_rpc_call(
+            fn_name="tryAggregate", fn_paras=inputs, block_number=block_number,
+            abi=MULTICALL_V3_ABI, contract_address=w3_multicall.address,
+            list_call_id=list_call_id, list_rpc_call=list_rpc_call, call_id=f'{batch_idx}_{block_number}'
+        )
+        batch_idx += 1
+
+
+def decode_multical_response(w3_multicall: W3Multicall, data_responses, list_call_id, ignore_error=True, batch_size=2000):
+    if ignore_error:
+        decoded_data = decode_data_response_ignore_error(data_responses=data_responses, list_call_id=list_call_id)
+    else:
+        decoded_data = decode_data_response(data_responses=data_responses, list_call_id=list_call_id)
+
+    batch_idx = 0
+    results = {}
+    for block_number, batch_calls in w3_multicall.batch_calls_iterator(batch_size=batch_size):
+        multicall_data = decoded_data.get(f'{batch_idx}_{block_number}')
+        decode_multicall_data = w3_multicall.decode(multicall_data, calls=batch_calls, ignore_error=ignore_error)
+        results.update(decode_multicall_data)
+
+        batch_idx += 1
+
+    return results

{defi_state_querier-0.5.18 → defi_state_querier-0.5.20}/src/defi_services/services/vault/tcv_vault_services.py

@@ -94,7 +94,6 @@ class TCVVaultStateService(ProtocolServices):
             }
         return result
 
-
     # REWARDS BALANCE
     def get_rewards_balance_function_info(
             self,
@@ -106,4 +105,4 @@ class TCVVaultStateService(ProtocolServices):
 
     def calculate_rewards_balance(
             self, wallet: str, reserves_info: dict, decoded_data: dict, block_number: int = "latest"):
-        pass
+        pass

{defi_state_querier-0.5.18 → defi_state_querier-0.5.20}/src/defi_services/services/vault/vault_info/arbitrum/tcv_arb.py

@@ -7,7 +7,7 @@ TCV_VAULT_ARBITRUM = {
             "vaultName": "eth/usdc",
             "tokenIn": "0xe467db55710cf35e2dc0402104e23221f0e12e66",
             "pool": '0xc6962004f452be9203591991d15f6b388e09e8d0',
-            "poolInfo":{
+            "poolInfo": {
                 "token0": "0x82af49447d8a07e3bd95bd0d56f35241523fbab1",
                 "token1": "0xaf88d065e77c8cc2239327c5edb3a432268e5831",
                 "fee": 500
@@ -17,7 +17,7 @@ TCV_VAULT_ARBITRUM = {
             "vaultName": "eth/usdt",
             "tokenIn": "0x9403be93fddedf88a3ed7d11bfb643b13e5cbc27",
             "pool": '0x641c00a822e8b671738d32a431a4fb6074e5c79d',
-            "poolInfo":{
+            "poolInfo": {
                 "token0": "0x82af49447d8a07e3bd95bd0d56f35241523fbab1",
                 "token1": "0xfd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb9",
                 "fee": 500
@@ -28,7 +28,7 @@ TCV_VAULT_ARBITRUM = {
             "vaultName": "eth/arb",
             "tokenIn": "0xae83866e6b48e29b225a10bc236f2665cc4f081e",
             "pool": '0xc6f780497a95e246eb9449f5e4770916dcd6396a',
-            "poolInfo":{
+            "poolInfo": {
                 "token0": "0x82af49447d8a07e3bd95bd0d56f35241523fbab1",
                 "token1": "0x912ce59144191c1204e64559fe8253a0e49e6548",
                 "fee": 500
@@ -38,7 +38,7 @@ TCV_VAULT_ARBITRUM = {
             "vaultName": "eth/usdc(bridgeusdc)",
             "tokenIn": "0xaae3866f0233aec20580c21a3c10791afd38c8c1",
             "pool": '0xc31e54c7a869b9fcbecc14363cf510d1c41fa443',
-            "poolInfo":{
+            "poolInfo": {
                 "token0": "0x82af49447d8a07e3bd95bd0d56f35241523fbab1",
                 "token1": "0xff970a61a04b1ca14834a43f5de4533ebddb5cc8",
                 "fee": 500
@@ -48,11 +48,11 @@ TCV_VAULT_ARBITRUM = {
             "vaultName": "eth/usdc",
             "tokenIn": "0xa02d1ecbe8eefaf7d64871ee0ae6404318df9702",
             "pool": '0xc473e2aee3441bf9240be85eb122abb059a3b57c',
-            "poolInfo":{
+            "poolInfo": {
                 "token0": "0x82af49447d8a07e3bd95bd0d56f35241523fbab1",
                 "token1": "0xaf88d065e77c8cc2239327c5edb3a432268e5831",
                 "fee": 3000
             }
         }
     }
-}
+}

{defi_state_querier-0.5.18 → defi_state_querier-0.5.20}/src/defi_state_querier.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: defi-state-querier
-Version: 0.5.18
+Version: 0.5.20
 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.5.18 → defi_state_querier-0.5.20}/src/defi_state_querier.egg-info/SOURCES.txt

@@ -77,13 +77,13 @@ src/defi_services/abis/lending/aave/gho/gho_discount_rate_strategy.py
 src/defi_services/abis/lending/aave/gho/gho_flash_minter.py
 src/defi_services/abis/lending/aave/gho/gho_token.py
 src/defi_services/abis/lending/aave/gho/gho_variable_debt_token.py
-src/defi_services/abis/lending/aave_v2_and_forlks/__init__.py
-src/defi_services/abis/lending/aave_v2_and_forlks/aave_v2_event_abi.py
-src/defi_services/abis/lending/aave_v2_and_forlks/aave_v2_incentives_abi.py
-src/defi_services/abis/lending/aave_v2_and_forlks/lending_pool_abi.py
-src/defi_services/abis/lending/aave_v2_and_forlks/oracle_abi.py
-src/defi_services/abis/lending/aave_v2_and_forlks/staked_incentives_abi.py
-src/defi_services/abis/lending/aave_v2_and_forlks/uwu_incentives_abi.py
+src/defi_services/abis/lending/aave_v2_and_forks/__init__.py
+src/defi_services/abis/lending/aave_v2_and_forks/aave_v2_event_abi.py
+src/defi_services/abis/lending/aave_v2_and_forks/aave_v2_incentives_abi.py
+src/defi_services/abis/lending/aave_v2_and_forks/lending_pool_abi.py
+src/defi_services/abis/lending/aave_v2_and_forks/oracle_abi.py
+src/defi_services/abis/lending/aave_v2_and_forks/staked_incentives_abi.py
+src/defi_services/abis/lending/aave_v2_and_forks/uwu_incentives_abi.py
 src/defi_services/abis/lending/aave_v3_forks/__init__.py
 src/defi_services/abis/lending/aave_v3_forks/aave_v3_incentives_abi.py
 src/defi_services/abis/lending/aave_v3_forks/aave_v3_lending_pool_abi.py

defi_state_querier-0.5.18/src/defi_services/__init__.py

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