defi-state-querier 0.5.28__py3-none-any.whl → 0.5.29__py3-none-any.whl

defi_services/jobs/queriers/state_querier.py

@@ -26,6 +26,9 @@ class StateQuerier:
     def get_client_querier(self):
         return self.client_querier
 
+    def get_provider(self):
+        return self.provider_uri
+
     @staticmethod
     def get_function_info(address: str, abi: list, fn_name: str, fn_paras: list = None, block_number: int = 'latest'):
         if fn_paras is None:

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_services/services/dex/dex_info/uniswap_info.py

@@ -7,7 +7,6 @@ UNISWAP_ETH_INFO = {
     'factory_address': '0x5c69bee701ef814a2b6a3edd4b1652cb9cc5aa6f',
     'factory_abi': UNISWAP_FACTORY_ABI,
     'forked': 'uniswap-v2'
-
 }
 
 UNISWAP_V3_ETH_INFO = {
@@ -18,5 +17,34 @@ UNISWAP_V3_ETH_INFO = {
     'NFT_manager_abi': UNISWAP_V3_NFT_TOKEN_MANGAGER_ABI,
     'pool_abi': UNISWAP_V3_POOL_ABI,
     'forked': 'uniswap-v3'
+}
+
+UNISWAP_V3_ARBITRUM_INFO = {
+    'factory_address': '0x1f98431c8ad98523631ae4a59f267346ea31f984',
+    'factory_abi': UNISWAP_V3_FACTORY_ABI,
+    'staker_address': '0xe34139463ba50bd61336e0c446bd8c0867c6fe65',
+    'NFT_manager_address': '0xc36442b4a4522e871399cd717abdd847ab11fe88',
+    'NFT_manager_abi': UNISWAP_V3_NFT_TOKEN_MANGAGER_ABI,
+    'pool_abi': UNISWAP_V3_POOL_ABI,
+    'forked': 'uniswap-v3'
+}
+
+UNISWAP_V3_BASE_INFO = {
+    'factory_address': '0x33128a8fC17869897dcE68Ed026d694621f6FDfD',
+    'factory_abi': UNISWAP_V3_FACTORY_ABI,
+    'staker_address': '0x42bE4D6527829FeFA1493e1fb9F3676d2425C3C1',
+    'NFT_manager_address': '0x03a520b32C04BF3bEEf7BEb72E919cf822Ed34f1',
+    'NFT_manager_abi': UNISWAP_V3_NFT_TOKEN_MANGAGER_ABI,
+    'pool_abi': UNISWAP_V3_POOL_ABI,
+    'forked': 'uniswap-v3'
+}
 
+UNISWAP_V3_ZKSYNC_INFO = {
+    'factory_address': '0x8FdA5a7a8dCA67BBcDd10F02Fa0649A937215422',
+    'factory_abi': UNISWAP_V3_FACTORY_ABI,
+    'staker_address': '0xf84268FA8EB857c2e4298720C1C617178F5e78e1',
+    'NFT_manager_address': '0x0616e5762c1E7Dc3723c50663dF10a162D690a86',
+    'NFT_manager_abi': UNISWAP_V3_NFT_TOKEN_MANGAGER_ABI,
+    'pool_abi': UNISWAP_V3_POOL_ABI,
+    'forked': 'uniswap-v3'
 }

defi_services/services/dex/uniswap_v3_service.py

@@ -5,7 +5,8 @@ from defi_services.abis.token.erc20_abi import ERC20_ABI
 from defi_services.constants.chain_constant import Chain
 from defi_services.constants.entities.dex_constant import Dex
 from defi_services.jobs.queriers.state_querier import StateQuerier
-from defi_services.services.dex.dex_info.uniswap_info import UNISWAP_V3_ETH_INFO
+from defi_services.services.dex.dex_info.uniswap_info import UNISWAP_V3_ETH_INFO, UNISWAP_V3_ARBITRUM_INFO, \
+    UNISWAP_V3_ZKSYNC_INFO, UNISWAP_V3_BASE_INFO
 from defi_services.services.dex_protocol_services import DexProtocolServices
 from defi_services.utils.get_fees import get_fees
 from defi_services.utils.sqrt_price_math import get_token_amount_of_user, get_token_amount_of_pool
@@ -15,7 +16,10 @@ logger = logging.getLogger("UniSwap V3 State Service")
 
 class UniswapV3Info:
     mapping = {
-        Chain.ethereum: UNISWAP_V3_ETH_INFO
+        Chain.ethereum: UNISWAP_V3_ETH_INFO,
+        Chain.arbitrum: UNISWAP_V3_ARBITRUM_INFO,
+        Chain.zksync: UNISWAP_V3_ZKSYNC_INFO,
+        Chain.base: UNISWAP_V3_BASE_INFO
     }
 
 

defi_services/services/lending/aave_v2_services.py

@@ -3,13 +3,14 @@ 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
 from defi_services.constants.entities.lending_constant import Lending
+from defi_services.constants.network_constants import NATIVE_TOKEN
 from defi_services.constants.time_constant import TimeConstants
 from defi_services.jobs.queriers.state_querier import StateQuerier
 from defi_services.services.lending.lending_info.avalanche.aave_v2_avalanche import AAVE_V2_AVALANCHE
@@ -83,19 +84,20 @@ class AaveV2StateService(ProtocolServices):
             reserve_key = f"getReserveData_{self.name}_{token_address}_{block_number}".lower()
             atoken_total_supply_key = f'totalSupply_{value["tToken"]}_{block_number}'.lower()
             debt_token_total_supply_key = f'totalSupply_{value["dToken"]}_{block_number}'.lower()
-            sdebt_token_total_supply_key = f'totalSupply_{value["sdToken"]}_{block_number}'.lower()
             decimals_key = f"decimals_{token_address}_{block_number}".lower()
-
             rpc_calls[reserve_key] = self.get_function_lending_pool_info("getReserveData", [token_address])
             rpc_calls[atoken_total_supply_key] = self.state_service.get_function_info(
                 value["tToken"], ERC20_ABI, "totalSupply", block_number=block_number)
             rpc_calls[debt_token_total_supply_key] = self.state_service.get_function_info(
                 value["dToken"], ERC20_ABI, "totalSupply", block_number=block_number)
-            rpc_calls[sdebt_token_total_supply_key] = self.state_service.get_function_info(
-                value["sdToken"], ERC20_ABI, "totalSupply", block_number=block_number)
             rpc_calls[decimals_key] = self.state_service.get_function_info(
                 token_address, ERC20_ABI, "decimals", block_number=block_number)
 
+            if value["sdToken"] != NATIVE_TOKEN:
+                sdebt_token_total_supply_key = f'totalSupply_{value["sdToken"]}_{block_number}'.lower()
+                rpc_calls[sdebt_token_total_supply_key] = self.state_service.get_function_info(
+                    value["sdToken"], ERC20_ABI, "totalSupply", block_number=block_number)
+
         return rpc_calls
 
     @staticmethod
@@ -173,18 +175,23 @@ class AaveV2StateService(ProtocolServices):
             decimals_call_id = f"decimals_{token_address}_{block_number}".lower()
             atoken_total_supply_key = f'totalSupply_{atoken}_{block_number}'.lower()
             debt_token_total_supply_key = f'totalSupply_{debt_token}_{block_number}'.lower()
-            sdebt_token_total_supply_key = f'totalSupply_{sdebt_token}_{block_number}'.lower()
-
-            reserve_tokens_info.append({
+            data = {
                 'underlying': token_address,
                 'underlying_decimals': decoded_data.get(decimals_call_id),
                 'a_token_supply': decoded_data.get(atoken_total_supply_key),
                 'd_token_supply': decoded_data.get(debt_token_total_supply_key),
-                'sd_token_supply': decoded_data.get(sdebt_token_total_supply_key),
                 'supply_apy': reserve_data[3],
-                'borrow_apy': reserve_data[4],
-                'stable_borrow_apy': reserve_data[5]
-            })
+                'borrow_apy': reserve_data[4]
+            }
+            if sdebt_token != NATIVE_TOKEN:
+                sdebt_token_total_supply_key = f'totalSupply_{sdebt_token}_{block_number}'.lower()
+                data['sd_token_supply'] = decoded_data.get(sdebt_token_total_supply_key)
+                data['stable_borrow_apy'] = reserve_data[5]
+            else:
+                data['sd_token_supply'] = 0
+                data['stable_borrow_apy'] = 0
+
+            reserve_tokens_info.append(data)
 
         return reserve_tokens_info
 
@@ -208,19 +215,19 @@ class AaveV2StateService(ProtocolServices):
 
     @classmethod
     def _calculate_interest_rates(cls, token_info: dict):
-        total_supply_t = token_info.get('a_token_supply')
-        total_supply_d = token_info.get('d_token_supply')
-        total_supply_sd = token_info.get('sd_token_supply')
+        total_supply_t = token_info.get('a_token_supply', 0)
+        total_supply_d = token_info.get('d_token_supply', 0)
+        total_supply_sd = token_info.get('sd_token_supply', 0)
         total_borrow = total_supply_d + total_supply_sd
 
         total_supply = total_supply_t / 10 ** token_info['underlying_decimals']
         total_borrow = total_borrow / 10 ** token_info['underlying_decimals']
 
-        supply_apr = float(token_info['supply_apy']) / 10 ** 27
+        supply_apr = float(token_info.get('supply_apy', 0)) / 10 ** 27
         supply_apy = apr_to_apy(supply_apr)
-        borrow_apr = float(token_info['borrow_apy']) / 10 ** 27
+        borrow_apr = float(token_info.get('borrow_apy', 0)) / 10 ** 27
         borrow_apy = apr_to_apy(borrow_apr)
-        stable_borrow_apr = float(token_info['stable_borrow_apy']) / 10 ** 27
+        stable_borrow_apr = float(token_info.get('stable_borrow_apy', 0)) / 10 ** 27
         stable_borrow_apy = apr_to_apy(stable_borrow_apr)
 
         return {
@@ -260,21 +267,23 @@ class AaveV2StateService(ProtocolServices):
             decimals_call_id = f"decimals_{token_address}_{block_number}".lower()
             atoken_assets_key = f"assets_{atoken}_{block_number}".lower()
             debt_token_assets_key = f"assets_{debt_token}_{block_number}".lower()
-            sdebt_token_assets_key = f"assets_{sdebt_token}_{block_number}".lower()
             atoken_total_supply_key = f'totalSupply_{atoken}_{block_number}'.lower()
             debt_token_total_supply_key = f'totalSupply_{debt_token}_{block_number}'.lower()
-            sdebt_token_total_supply_key = f'totalSupply_{sdebt_token}_{block_number}'.lower()
-
             atokens[lower_address] = atoken
             debt_tokens[lower_address] = debt_token
             sdebt_tokens[lower_address] = sdebt_token
             decimals[lower_address] = decoded_data.get(decimals_call_id)
             asset_data_tokens[atoken] = decoded_data.get(atoken_assets_key)
             asset_data_tokens[debt_token] = decoded_data.get(debt_token_assets_key)
-            asset_data_tokens[sdebt_token] = decoded_data.get(sdebt_token_assets_key)
             total_supply_tokens[atoken] = decoded_data.get(atoken_total_supply_key)
             total_supply_tokens[debt_token] = decoded_data.get(debt_token_total_supply_key)
-            total_supply_tokens[sdebt_token] = decoded_data.get(sdebt_token_total_supply_key)
+            if sdebt_token != NATIVE_TOKEN:
+                sdebt_token_assets_key = f"assets_{sdebt_token}_{block_number}".lower()
+                sdebt_token_total_supply_key = f'totalSupply_{sdebt_token}_{block_number}'.lower()
+                asset_data_tokens[sdebt_token] = decoded_data.get(sdebt_token_assets_key)
+                total_supply_tokens[sdebt_token] = decoded_data.get(sdebt_token_total_supply_key)
+                interest_rate[lower_address]['stable_borrow_apy'] = float(reserve_data[5]) / 10 ** 27
+
 
         asset_price_key = f"getAssetsPrices_{self.name}_{block_number}".lower()
         if not token_prices and asset_price_key in decoded_data:
@@ -303,17 +312,19 @@ class AaveV2StateService(ProtocolServices):
             value = reserves_info[token]
             atoken_balance_of_key = f'balanceOf_{value["tToken"]}_{wallet}_{block_number}'.lower()
             debt_token_balance_of_key = f'balanceOf_{value["dToken"]}_{wallet}_{block_number}'.lower()
-            sdebt_token_balance_of_key = f'balanceOf_{value["sdToken"]}_{wallet}_{block_number}'.lower()
             decimals_key = f"decimals_{token}_{block_number}".lower()
 
             rpc_calls[atoken_balance_of_key] = self.state_service.get_function_info(
                 value["tToken"], ERC20_ABI, "balanceOf", [wallet], block_number=block_number)
             rpc_calls[debt_token_balance_of_key] = self.state_service.get_function_info(
                 value["dToken"], ERC20_ABI, "balanceOf", [wallet], block_number=block_number)
-            rpc_calls[sdebt_token_balance_of_key] = self.state_service.get_function_info(
-                value["sdToken"], ERC20_ABI, "balanceOf", [wallet], block_number=block_number)
             rpc_calls[decimals_key] = self.state_service.get_function_info(
                 token, ERC20_ABI, "decimals", block_number=block_number)
+            if value["sdToken"] != NATIVE_TOKEN:
+                sdebt_token_balance_of_key = f'balanceOf_{value["sdToken"]}_{wallet}_{block_number}'.lower()
+                rpc_calls[sdebt_token_balance_of_key] = self.state_service.get_function_info(
+                value["sdToken"], ERC20_ABI, "balanceOf", [wallet], block_number=block_number)
+
         if health_factor:
             rpc_calls.update(self.get_health_factor_function_info(wallet, reserves_info, block_number))
 
@@ -375,8 +386,12 @@ class AaveV2StateService(ProtocolServices):
             get_decimals_id = f"decimals_{token}_{block_number}".lower()
             deposit_amount[token] = decoded_data.get(get_total_deposit_id)
             borrow_amount[token] = decoded_data.get(get_total_borrow_id)
-            stable_borrow_amount[token] = decoded_data.get(get_total_stable_borrow_id)
             decimals[token] = decoded_data.get(get_decimals_id)
+            if value['sdToken'] != NATIVE_TOKEN:
+                stable_borrow_amount[token] = decoded_data.get(get_total_stable_borrow_id)
+            else:
+                stable_borrow_amount[token] = 0
+
         data = self.get_wallet_deposit_borrow_balance(
                 reserves_info, token_prices, decimals, deposit_amount,
                 borrow_amount, stable_borrow_amount

defi_services/services/lending/aave_v3_services.py

@@ -10,15 +10,19 @@ 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
 from defi_services.constants.entities.lending_constant import Lending
+from defi_services.constants.network_constants import NATIVE_TOKEN
 from defi_services.constants.time_constant import TimeConstants
 from defi_services.jobs.queriers.state_querier import StateQuerier
 from defi_services.services.lending.aave_v2_services import AaveV2StateService
 from defi_services.services.lending.lending_info.arbitrum.aave_v3_arbitrum import AAVE_V3_ARB
 from defi_services.services.lending.lending_info.avalanche.aave_v3_avalanche import AAVE_V3_AVALANCHE
-from defi_services.services.lending.lending_info.ethereum.aave_v3_eth import AAVE_V3_ETH
+from defi_services.services.lending.lending_info.base.aave_v3_base import AAVE_V3_BASE
+from defi_services.services.lending.lending_info.bsc.aave_v3_bsc import AAVE_V3_BSC
+from defi_services.services.lending.lending_info.ethereum.old_aave_v3_eth import AAVE_V3_ETH
 from defi_services.services.lending.lending_info.fantom.aave_v3_ftm import AAVE_V3_FTM
 from defi_services.services.lending.lending_info.optimism.aave_v3_optimism import AAVE_V3_OPTIMISM
 from defi_services.services.lending.lending_info.polygon.aave_v3_polygon import AAVE_V3_POLYGON
+from defi_services.services.lending.lending_info.zksync.aave_v3_zksync import AAVE_V3_ZKSYNC
 
 logger = logging.getLogger("Aave V3 Lending Pool State Service")
 
@@ -30,7 +34,10 @@ class AaveV3Info:
         Chain.avalanche: AAVE_V3_AVALANCHE,
         Chain.fantom: AAVE_V3_FTM,
         Chain.optimism: AAVE_V3_OPTIMISM,
-        Chain.arbitrum: AAVE_V3_ARB
+        Chain.arbitrum: AAVE_V3_ARB,
+        Chain.base: AAVE_V3_BASE,
+        Chain.zksync: AAVE_V3_ZKSYNC,
+        Chain.bsc: AAVE_V3_BSC
     }
 
 
@@ -88,25 +95,33 @@ class AaveV3StateService(AaveV2StateService):
         for token_address, reserve_info in reserves_info.items():
             get_reserve_data_call_id = f'getReserveData_{self.name}_{token_address}_{block_number}'.lower()
             reserve_data = decoded_data.get(get_reserve_data_call_id)
-
             atoken = reserve_data[8].lower()
-            sdebt_token = reserve_data[9].lower()
             debt_token = reserve_data[10].lower()
             decimals_call_id = f"decimals_{token_address}_{block_number}".lower()
             atoken_total_supply_key = f'totalSupply_{atoken}_{block_number}'.lower()
             debt_token_total_supply_key = f'totalSupply_{debt_token}_{block_number}'.lower()
-            sdebt_token_total_supply_key = f'totalSupply_{sdebt_token}_{block_number}'.lower()
+            sdebt_token = reserve_data[9].lower()
 
-            reserve_tokens_info.append({
+
+            data = {
                 'underlying': token_address,
                 'underlying_decimals': decoded_data.get(decimals_call_id),
                 'a_token_supply': decoded_data.get(atoken_total_supply_key),
                 'd_token_supply': decoded_data.get(debt_token_total_supply_key),
-                'sd_token_supply': decoded_data.get(sdebt_token_total_supply_key),
+
                 'supply_apy': reserve_data[2],
                 'borrow_apy': reserve_data[4],
-                'stable_borrow_apy': reserve_data[5]
-            })
+
+            }
+            if sdebt_token != NATIVE_TOKEN:
+                sdebt_token_total_supply_key = f'totalSupply_{sdebt_token}_{block_number}'.lower()
+                data['sd_token_supply'] = decoded_data.get(sdebt_token_total_supply_key)
+                data['stable_borrow_apy'] = reserve_data[5]
+            else:
+                data['sd_token_supply'] = 0
+                data['stable_borrow_apy'] = 0
+
+            reserve_tokens_info.append(data)
 
         return reserve_tokens_info
 
@@ -121,17 +136,17 @@ class AaveV3StateService(AaveV2StateService):
             reserve_key = f"getReserveData_{self.name}_{token_address}_{block_number}".lower()
             atoken_total_supply_key = f'totalSupply_{value["tToken"]}_{block_number}'.lower()
             debt_token_total_supply_key = f'totalSupply_{value["dToken"]}_{block_number}'.lower()
-            sdebt_token_total_supply_key = f'totalSupply_{value["sdToken"]}_{block_number}'.lower()
             decimals_key = f"decimals_{token_address}_{block_number}".lower()
             for reward_token in reward_tokens:
                 atoken_assets_key = f"getRewardsData_{value['tToken']}_{reward_token}_{block_number}".lower()
                 debt_token_assets_key = f"getRewardsData_{value['dToken']}_{reward_token}_{block_number}".lower()
-                sdebt_token_assets_key = f"getRewardsData_{value['sdToken']}_{reward_token}_{block_number}".lower()
                 rpc_calls[atoken_assets_key] = self.get_function_incentive_info(
                     "getRewardsData", [value['tToken'], reward_token], block_number)
                 rpc_calls[debt_token_assets_key] = self.get_function_incentive_info(
                     "getRewardsData", [value['dToken'], reward_token], block_number)
-                rpc_calls[sdebt_token_assets_key] = self.get_function_incentive_info(
+                if value['sdToken'] != NATIVE_TOKEN:
+                    sdebt_token_assets_key = f"getRewardsData_{value['sdToken']}_{reward_token}_{block_number}".lower()
+                    rpc_calls[sdebt_token_assets_key] = self.get_function_incentive_info(
                     "getRewardsData", [value['sdToken'], reward_token], block_number)
 
             rpc_calls[reserve_key] = self.get_function_lending_pool_info("getReserveData", [token_address])
@@ -139,11 +154,14 @@ class AaveV3StateService(AaveV2StateService):
                 value["tToken"], ERC20_ABI, "totalSupply", block_number=block_number)
             rpc_calls[debt_token_total_supply_key] = self.state_service.get_function_info(
                 value["dToken"], ERC20_ABI, "totalSupply", block_number=block_number)
-            rpc_calls[sdebt_token_total_supply_key] = self.state_service.get_function_info(
-                value["sdToken"], ERC20_ABI, "totalSupply", block_number=block_number)
             rpc_calls[decimals_key] = self.state_service.get_function_info(
                 token_address, ERC20_ABI, "decimals", block_number=block_number)
 
+            if value['sdToken'] != NATIVE_TOKEN:
+                sdebt_token_total_supply_key = f'totalSupply_{value["sdToken"]}_{block_number}'.lower()
+                rpc_calls[sdebt_token_total_supply_key] = self.state_service.get_function_info(
+                    value["sdToken"], ERC20_ABI, "totalSupply", block_number=block_number)
+
         return rpc_calls
 
     def get_apy_lending_pool_deprecated(
@@ -240,29 +258,32 @@ class AaveV3StateService(AaveV2StateService):
             sdebt_token = reserve_data[8].lower()
             debt_token = reserve_data[9].lower()
             decimals_call_id = f"decimals_{token_address}_{block_number}".lower()
-
             atoken_total_supply_key = f'totalSupply_{atoken}_{block_number}'.lower()
             debt_token_total_supply_key = f'totalSupply_{debt_token}_{block_number}'.lower()
-            sdebt_token_total_supply_key = f'totalSupply_{sdebt_token}_{block_number}'.lower()
             asset_data_tokens[atoken] = {}
             asset_data_tokens[debt_token] = {}
-            asset_data_tokens[sdebt_token] = {}
+            if sdebt_token != NATIVE_TOKEN:
+                asset_data_tokens[sdebt_token] = {}
+
             total_supply_tokens[atoken] = {}
             for reward_token in reward_tokens:
                 atoken_assets_key = f"getRewardsData_{atoken}_{reward_token}_{block_number}".lower()
                 debt_token_assets_key = f"getRewardsData_{debt_token}_{reward_token}_{block_number}".lower()
-                sdebt_token_assets_key = f"getRewardsData_{sdebt_tokens}_{reward_token}_{block_number}".lower()
                 asset_data_tokens[atoken][reward_token] = decoded_data.get(atoken_assets_key)
                 asset_data_tokens[debt_token][reward_token] = decoded_data.get(debt_token_assets_key)
-                asset_data_tokens[sdebt_token][reward_token] = decoded_data.get(sdebt_token_assets_key)
                 total_supply_tokens[atoken][reward_token] = decoded_data.get(atoken_total_supply_key)
+                if sdebt_token != NATIVE_TOKEN:
+                    sdebt_token_assets_key = f"getRewardsData_{sdebt_tokens}_{reward_token}_{block_number}".lower()
+                    asset_data_tokens[sdebt_token][reward_token] = decoded_data.get(sdebt_token_assets_key)
 
             atokens[lower_address] = atoken
             debt_tokens[lower_address] = debt_token
             sdebt_tokens[lower_address] = sdebt_token
             decimals[lower_address] = decoded_data.get(decimals_call_id)
             total_supply_tokens[debt_token] = decoded_data.get(debt_token_total_supply_key)
-            total_supply_tokens[sdebt_token] = decoded_data.get(sdebt_token_total_supply_key)
+            if sdebt_token != NATIVE_TOKEN:
+                sdebt_token_total_supply_key = f'totalSupply_{sdebt_token}_{block_number}'.lower()
+                total_supply_tokens[sdebt_token] = decoded_data.get(sdebt_token_total_supply_key)
 
         asset_price_key = f"getAssetsPrices_{self.name}_{block_number}".lower()
         if not token_prices and asset_price_key in decoded_data:

defi_services/services/lending/compound_v3_services.py

@@ -9,7 +9,9 @@ from defi_services.constants.token_constant import Token
 from defi_services.jobs.queriers.state_querier import StateQuerier
 from defi_services.services.lending.compound_service import CompoundStateService
 from defi_services.services.lending.lending_info.arbitrum.compound_v3_arbitrum import COMPOUND_V3_ARBITRUM
+from defi_services.services.lending.lending_info.base.compound_v3_base import COMPOUND_V3_BASE
 from defi_services.services.lending.lending_info.ethereum.compound_v3_eth import COMPOUND_V3_ETH
+from defi_services.services.lending.lending_info.optimism.compound_v3_optimism import COMPOUND_V3_OPTIMISM
 from defi_services.services.lending.lending_info.polygon.compound_v3_polygon import COMPOUND_V3_POLYGON
 
 
@@ -17,7 +19,9 @@ class CompoundV3Info:
     mapping = {
         Chain.ethereum: COMPOUND_V3_ETH,
         Chain.polygon: COMPOUND_V3_POLYGON,
-        Chain.arbitrum: COMPOUND_V3_ARBITRUM
+        Chain.arbitrum: COMPOUND_V3_ARBITRUM,
+        Chain.base: COMPOUND_V3_BASE,
+        Chain.optimism: COMPOUND_V3_OPTIMISM
     }
 
 
@@ -25,7 +29,7 @@ class CompoundV3StateService(CompoundStateService):
     def __init__(self, state_service: StateQuerier, chain_id: str = "0x1"):
         super().__init__(state_service, chain_id)
         self.name = f"{chain_id}_{Lending.compound_v3}"
-        self.pool_info = CompoundV3Info.mapping.get(chain_id)
+        self.pool_info = CompoundV3Info.mapping.get(chain_id, {})
         self.comet_abi = COMET_ABI
         self.comet_ext = COMET_EXT_ABI
         self.reward_abi = REWARD_ABI
@@ -47,7 +51,7 @@ class CompoundV3StateService(CompoundStateService):
     ):
         result = {}
         w3 = self.state_service.get_w3()
-        pools = [value.get('comet') for key, value in self.pool_info.get('reservesList').items()]
+        pools = [value.get('comet') for key, value in self.pool_info.get('reservesList', {}).items()]
         if comets:
             pools += comets
         for pool in pools:
@@ -185,7 +189,7 @@ class CompoundV3StateService(CompoundStateService):
 
             assets = {
                 underlying_token: {
-                    'deposit_apy': 0,
+                    'deposit_apy': asset_info['deposit_apy'],
                     'borrow_apy': asset_info['borrow_apy'],
                     'total_deposit': 0,
                     'total_borrow': asset_info['total_borrow'],
@@ -203,7 +207,7 @@ class CompoundV3StateService(CompoundStateService):
                         'is_base': False
                     }
                 assets[collateral_address]['total_deposit'] += total_supply
-                assets[collateral_address]['deposit_apy'] = asset_info['deposit_apy']
+                # assets[collateral_address]['deposit_apy'] = asset_info['deposit_apy']
 
             comet = token_info['token']
             data[comet] = assets

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
@@ -14,6 +14,7 @@ from defi_services.constants.token_constant import Token
 from defi_services.jobs.queriers.state_querier import StateQuerier
 from defi_services.services.lending.lending_info.arbitrum.granary_arbitrum import GRANARY_ARBITRUM
 from defi_services.services.lending.lending_info.avalanche.granary_avalanche import GRANARY_AVALANCHE
+from defi_services.services.lending.lending_info.base.granary_base import GRANARY_BASE
 from defi_services.services.lending.lending_info.bsc.granary_bsc import GRANARY_BSC
 from defi_services.services.lending.lending_info.ethereum.granary_eth import GRANARY_V1_ETH
 from defi_services.services.lending.lending_info.fantom.granary_ftm import GRANARY_FTM
@@ -31,7 +32,8 @@ class GranaryV1Info:
         Chain.optimism: GRANARY_OPTIMISM,
         Chain.fantom: GRANARY_FTM,
         Chain.avalanche: GRANARY_AVALANCHE,
-        Chain.arbitrum: GRANARY_ARBITRUM
+        Chain.arbitrum: GRANARY_ARBITRUM,
+        Chain.base: GRANARY_BASE
     }