defi-state-querier 0.5.17__py3-none-any.whl → 0.5.19__py3-none-any.whl

defi_services/__init__.py

@@ -1 +1 @@
-__version__ = "0.5.17"
+__version__ = "0.5.19"

defi_services/jobs/tcv.py

@@ -1,7 +1,9 @@
+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
-from defi_services.services.vault.vault_info.arbitrum.tcv_arb import TCV_VAULT_ARBITRUM
+
 
 class TCV:
     def __init__(self, provider_uri, chain_id):
@@ -13,98 +15,130 @@ class TCV:
             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": "tcv-vault",
-                "entity_id": "tcv-vault",
-                "query_type": Query.staking_reward
-            },
-        ]
-        res = self.state_processor.run(address, queries, block_number)
-        result = res[0].get("staking_reward")
-        for token, information in reserves_info.items():
-            pool = information.get("pool")
-            lp_token_dict = {
-                pool: reserves_info[token]["poolInfo"]
-            }
-            dex_lp_info = self.get_lp_token_info(token, Dex.uniswap_v3, lp_token_dict)
-            token_nfts = self.get_user_nft(token, Dex.uniswap_v3)
-            token_info = self.get_user_info(token, Dex.uniswap_v3, token_nfts)
-            token_balance = self.get_user_token_balance(token, Dex.uniswap_v3, token_info, dex_lp_info)
-            tvl = {}
-            for balance_info in token_balance:
-                for token_id, info in balance_info['dex_user_token_balance'].items():
-                    if info['token0'] not in tvl:
-                        tvl[info['token0']] = 0
-                    if info['token1'] not in tvl:
-                        tvl[info['token1']] = 0
-                    tvl[info['token0']] += info['token0_amount']
-                    tvl[info['token1']] += info['token1_amount']
-            result[token].update({"tvl": tvl})
-        return result
-
-    def get_user_nft(self, wallet, dex_protocol):
-        queries = [
-            {
-                'query_id': f'{dex_protocol}_usernft',
+                '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, batch_size=100, max_workers=8, ignore_error=True)
-        return res
+        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_user_info(self, wallet, dex_protocol, user_nfts):
+    def get_nfts_info(self, wallet, dex_protocol, user_nfts, block_number: int = 'latest'):
         queries = [
             {
-                'query_id': f'{dex_protocol}_userinfo',
+                '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[0][Query.dex_user_nft],
+                    'user_data': user_nfts,
                 }
             }
         ]
 
-        res = self.state_processor.run(wallet, queries, batch_size=100, max_workers=8, ignore_error=True)
-        return res
+        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, user_info, dex_lp_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}_usertokenbalance',
+                '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': user_info[0][Query.dex_user_info],
-                    'lp_token_info': dex_lp_info[0][Query.lp_token_info]
-
+                    'user_data': nfts_info,
+                    'lp_token_info': lp_token_info
                 }
             }
         ]
 
-        res = self.state_processor.run(wallet, queries, batch_size=100, max_workers=8, ignore_error=True)
-        return res
+        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_lp_token_info(self, wallet, dex_protocol, lp_token_list):
+    def get_tcv_liquidity_user_and_lp_token_info(self, wallet, dex_protocol, lp_token_list, block_number: int = 'latest'):
         queries = [
             {
-                'query_id': f'{dex_protocol}_lptokeninfo',
-                "entity_id": dex_protocol,
-                'query_type': Query.lp_token_info,
-                'supplied_data': {
-                    'lp_token_info': lp_token_list}
+                "query_id": f"tcv-vault_{Query.staking_reward}",
+                "entity_id": "tcv-vault",
+                "query_type": Query.staking_reward
             },
             {
-                'query_id': f'{dex_protocol}_lptokenbalance',
+                'query_id': f'{dex_protocol}_{Query.lp_token_info}',
                 "entity_id": dex_protocol,
-                'query_type': Query.token_pair_balance,
+                'query_type': Query.lp_token_info,
                 'supplied_data': {
-                    'lp_token_info': lp_token_list}
-            }
+                    '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(wallet, queries, batch_size=100, max_workers=8, ignore_error=True)
-        return res
-
+        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_services/services/vault/tcv_vault_services.py

@@ -20,7 +20,7 @@ class TCVVaultInfo:
 class TCVVaultStateService(ProtocolServices):
     def __init__(self, state_service: StateQuerier, chain_id: str = "0xa4b1"):
         super().__init__()
-        self.name = f"{chain_id}_{Vault.trava_vault}"
+        self.name = f"{chain_id}_{Vault.tcv_vault}"
         self.chain_id = chain_id
         self.pool_info = TCVVaultInfo.mapping.get(chain_id)
         self.vault_abi = TCV_ABI
@@ -29,7 +29,7 @@ class TCVVaultStateService(ProtocolServices):
     # BASIC FUNCTION
     def get_service_info(self):
         info = {
-            Vault.trava_vault: {
+            Vault.tcv_vault: {
                 "chain_id": self.chain_id,
                 "type": "vault",
                 "protocol_info": self.pool_info
@@ -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_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.17.dist-info → defi_state_querier-0.5.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: defi-state-querier
-Version: 0.5.17
+Version: 0.5.19
 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.17.dist-info → defi_state_querier-0.5.19.dist-info}/RECORD

@@ -1,4 +1,4 @@
-defi_services/__init__.py,sha256=eTYwDNLzKHSbjCHVWroT3O32gupVQHi6Yycx9Qc9Thg,23
+defi_services/__init__.py,sha256=InrFJaBUb_cLi70n_bBjGRkMOAWxGUgFDIAObAjB4_M,23
 defi_services/abis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 defi_services/abis/multicall_v3_abi.py,sha256=0aPxjrJJFU17fODjvYFRDn5Y5J1yi_AJKc8v1uohNGY,12352
 defi_services/abis/dex/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -313,7 +313,7 @@ defi_services/constants/entities/lending_services.py,sha256=EeCRUi-K4O3MlB6m5f9Q
 defi_services/constants/entities/vault_constant.py,sha256=XaFp2VpmePfym42Gn-5IeT8qnQBq1JcRNrH7r2_tWxo,122
 defi_services/constants/entities/vault_services.py,sha256=uwcvxwnyXNU3_3mcI6PGWyvGe40tzHmTrmigotLWeMM,752
 defi_services/jobs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-defi_services/jobs/tcv.py,sha256=b-Gd_w3dMyljHXVS0__dk1HSaLZBksyhaCtEo9KgBKc,4245
+defi_services/jobs/tcv.py,sha256=Ngp6VWcH2n2ZCMTPu0TySxXQn_O6C2FDbvzVltEmH5Y,5707
 defi_services/jobs/processors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 defi_services/jobs/processors/call_state_processor.py,sha256=WseX0OaMA5D_ANYofrz7W2BooSMdHlGRay4NuiABmM4,436
 defi_services/jobs/processors/cosmos_state_processor.py,sha256=eVAs_-dSjlR7ijHAG9ytAysGesiyQYyK-sAMg8rUPYw,1898
@@ -450,11 +450,11 @@ defi_services/services/multicall/batch_queries_service.py,sha256=HzgKOdkP6kpjR7g
 defi_services/services/multicall/multicall_v2.py,sha256=5JAqb3Jn5Z-23-Gwz5lMa5DokES-Pf7WtigHMGlG-7k,18695
 defi_services/services/multicall/state_query_service.py,sha256=1Ob5NX0tXmVUrSB1_mOvFBkOUA8KZJPwH2DMiHwlGhI,23709
 defi_services/services/vault/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-defi_services/services/vault/tcv_vault_services.py,sha256=AijdbNloHqsod1_YEsUtZgQVsRjB08p-nLa-0AMFqqs,3831
+defi_services/services/vault/tcv_vault_services.py,sha256=RPqp0jHviH0PY4AC5Eswowza_VL7YSovqADQT3WBzLk,3827
 defi_services/services/vault/trava_vault_services.py,sha256=9Sj5W6o7o478MKu7ZOUdqkTtPUzT59eS9yBcU8O4UrM,7705
 defi_services/services/vault/vault_info/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 defi_services/services/vault/vault_info/arbitrum/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-defi_services/services/vault/vault_info/arbitrum/tcv_arb.py,sha256=7e4oAi_EFaLwlpyLmFARbG3iRfNu2yQKcH82lq2bqRo,2467
+defi_services/services/vault/vault_info/arbitrum/tcv_arb.py,sha256=aN3L78Q6sCUvb2oa5RUtqCthCA88qsADVkU13sjtN-g,2473
 defi_services/services/vault/vault_info/bsc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 defi_services/services/vault/vault_info/bsc/trava_bsc.py,sha256=v1Nv5SmjDYLvCke_H5ZtgdjNXo0_9X-P5OQldezP0XM,1586
 defi_services/services/vault/vault_info/ethereum/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -475,8 +475,8 @@ defi_services/utils/memory_storage.py,sha256=BOT8laB0iVSCGE-oDlpWJQLbSC6X2blKX4z
 defi_services/utils/sqrt_price_math.py,sha256=9lgUeWFT4wjl3Vq3b7-jZ2bGvvZx7dDBSfVnM3lsZ8o,5575
 defi_services/utils/thread_proxy.py,sha256=5Z8biAyEReUkh3vfJSvEv7GwMe3CsE5M8CbghkQtePw,2951
 defi_services/utils/ton_decode_address.py,sha256=EWKwmC7KtbXpdKgiNK-5j-5lX7fCr17I4EWYs9b43eU,443
-defi_state_querier-0.5.17.dist-info/LICENSE,sha256=6jmfxa8nUIwfKnzZUxAHJSJ_IS7h7mpbJq26cWjoo-o,1063
-defi_state_querier-0.5.17.dist-info/METADATA,sha256=A43EptJRlxIi09CXdxGYXuz9xPeTaZDP83mNshTDTuw,4413
-defi_state_querier-0.5.17.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-defi_state_querier-0.5.17.dist-info/top_level.txt,sha256=C-OTxHK6MknKK-nAbEzCPDUl1M6pktRhgJrmsozdf6g,14
-defi_state_querier-0.5.17.dist-info/RECORD,,
+defi_state_querier-0.5.19.dist-info/LICENSE,sha256=6jmfxa8nUIwfKnzZUxAHJSJ_IS7h7mpbJq26cWjoo-o,1063
+defi_state_querier-0.5.19.dist-info/METADATA,sha256=G826RV8D7COoB1D8_oB55GicrBaB4NG7ii-_l0eoTbI,4413
+defi_state_querier-0.5.19.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+defi_state_querier-0.5.19.dist-info/top_level.txt,sha256=C-OTxHK6MknKK-nAbEzCPDUl1M6pktRhgJrmsozdf6g,14
+defi_state_querier-0.5.19.dist-info/RECORD,,