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

defi_services/jobs/queriers/state_querier.py

@@ -26,9 +26,6 @@ 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/services/dex/dex_info/uniswap_info.py

@@ -7,6 +7,7 @@ UNISWAP_ETH_INFO = {
     'factory_address': '0x5c69bee701ef814a2b6a3edd4b1652cb9cc5aa6f',
     'factory_abi': UNISWAP_FACTORY_ABI,
     'forked': 'uniswap-v2'
+
 }
 
 UNISWAP_V3_ETH_INFO = {
@@ -17,34 +18,5 @@ 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,8 +5,7 @@ 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, UNISWAP_V3_ARBITRUM_INFO, \
-    UNISWAP_V3_ZKSYNC_INFO, UNISWAP_V3_BASE_INFO
+from defi_services.services.dex.dex_info.uniswap_info import UNISWAP_V3_ETH_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
@@ -16,10 +15,7 @@ logger = logging.getLogger("UniSwap V3 State Service")
 
 class UniswapV3Info:
     mapping = {
-        Chain.ethereum: UNISWAP_V3_ETH_INFO,
-        Chain.arbitrum: UNISWAP_V3_ARBITRUM_INFO,
-        Chain.zksync: UNISWAP_V3_ZKSYNC_INFO,
-        Chain.base: UNISWAP_V3_BASE_INFO
+        Chain.ethereum: UNISWAP_V3_ETH_INFO
     }
 
 

defi_services/services/lending/aave_v2_services.py

@@ -3,14 +3,13 @@ import time
 
 from web3 import Web3
 
-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.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.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
@@ -84,20 +83,19 @@ 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
@@ -175,23 +173,18 @@ 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()
-            data = {
+            sdebt_token_total_supply_key = f'totalSupply_{sdebt_token}_{block_number}'.lower()
+
+            reserve_tokens_info.append({
                 '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]
-            }
-            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)
+                'borrow_apy': reserve_data[4],
+                'stable_borrow_apy': reserve_data[5]
+            })
 
         return reserve_tokens_info
 
@@ -215,19 +208,19 @@ class AaveV2StateService(ProtocolServices):
 
     @classmethod
     def _calculate_interest_rates(cls, token_info: dict):
-        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_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_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.get('supply_apy', 0)) / 10 ** 27
+        supply_apr = float(token_info['supply_apy']) / 10 ** 27
         supply_apy = apr_to_apy(supply_apr)
-        borrow_apr = float(token_info.get('borrow_apy', 0)) / 10 ** 27
+        borrow_apr = float(token_info['borrow_apy']) / 10 ** 27
         borrow_apy = apr_to_apy(borrow_apr)
-        stable_borrow_apr = float(token_info.get('stable_borrow_apy', 0)) / 10 ** 27
+        stable_borrow_apr = float(token_info['stable_borrow_apy']) / 10 ** 27
         stable_borrow_apy = apr_to_apy(stable_borrow_apr)
 
         return {
@@ -267,23 +260,21 @@ 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)
-            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
-
+            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:
@@ -312,19 +303,17 @@ 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))
 
@@ -386,12 +375,8 @@ 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,19 +10,15 @@ 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.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.ethereum.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")
 
@@ -34,10 +30,7 @@ class AaveV3Info:
         Chain.avalanche: AAVE_V3_AVALANCHE,
         Chain.fantom: AAVE_V3_FTM,
         Chain.optimism: AAVE_V3_OPTIMISM,
-        Chain.arbitrum: AAVE_V3_ARB,
-        Chain.base: AAVE_V3_BASE,
-        Chain.zksync: AAVE_V3_ZKSYNC,
-        Chain.bsc: AAVE_V3_BSC
+        Chain.arbitrum: AAVE_V3_ARB
     }
 
 
@@ -95,33 +88,25 @@ 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 = reserve_data[9].lower()
+            sdebt_token_total_supply_key = f'totalSupply_{sdebt_token}_{block_number}'.lower()
 
-
-            data = {
+            reserve_tokens_info.append({
                 '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],
-
-            }
-            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)
+                'stable_borrow_apy': reserve_data[5]
+            })
 
         return reserve_tokens_info
 
@@ -136,17 +121,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)
-                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(
+                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])
@@ -154,14 +139,11 @@ 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(
@@ -258,32 +240,29 @@ 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] = {}
-            if sdebt_token != NATIVE_TOKEN:
-                asset_data_tokens[sdebt_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)
-            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)
+            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,9 +9,7 @@ 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
 
 
@@ -19,9 +17,7 @@ class CompoundV3Info:
     mapping = {
         Chain.ethereum: COMPOUND_V3_ETH,
         Chain.polygon: COMPOUND_V3_POLYGON,
-        Chain.arbitrum: COMPOUND_V3_ARBITRUM,
-        Chain.base: COMPOUND_V3_BASE,
-        Chain.optimism: COMPOUND_V3_OPTIMISM
+        Chain.arbitrum: COMPOUND_V3_ARBITRUM
     }
 
 
@@ -29,7 +25,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
@@ -51,7 +47,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:
@@ -189,7 +185,7 @@ class CompoundV3StateService(CompoundStateService):
 
             assets = {
                 underlying_token: {
-                    'deposit_apy': asset_info['deposit_apy'],
+                    'deposit_apy': 0,
                     'borrow_apy': asset_info['borrow_apy'],
                     'total_deposit': 0,
                     'total_borrow': asset_info['total_borrow'],
@@ -207,7 +203,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_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.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.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,7 +14,6 @@ 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
@@ -32,8 +31,7 @@ class GranaryV1Info:
         Chain.optimism: GRANARY_OPTIMISM,
         Chain.fantom: GRANARY_FTM,
         Chain.avalanche: GRANARY_AVALANCHE,
-        Chain.arbitrum: GRANARY_ARBITRUM,
-        Chain.base: GRANARY_BASE
+        Chain.arbitrum: GRANARY_ARBITRUM
     }
 
 

defi_services/services/lending/justlend_service.py

@@ -2,7 +2,7 @@ from web3 import Web3
 
 from defi_services.abis.lending.justlend.just_token_abi import JUST_TOKEN_ABI
 from defi_services.abis.lending.justlend.justlend_comptroller_abi import JUSTLEND_COMPTROLLER_ABI
-from defi_services.abis.token.trc20_abi import TRC20_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
 from defi_services.constants.token_constant import Token
@@ -74,9 +74,8 @@ class JustLendStateService(CompoundStateService):
             liquidation_threshold = decoded_data.get(markets)[1] / 10 ** 18
 
             if underlying != Token.native_token:
-                underlying_contract = _w3.eth.contract(address=Web3.to_checksum_address(underlying), abi=TRC20_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)
             exchange_rate_query_id = f'exchangeRateStored_{token}_{block_number}'
@@ -140,7 +139,7 @@ class JustLendStateService(CompoundStateService):
             rpc_calls[underlying_balance_key] = self.get_ctoken_function_info(
                 ctoken, "balanceOfUnderlying", [wallet])
             rpc_calls[underlying_decimals_key] = self.state_service.get_function_info(
-                underlying, TRC20_ABI, "decimals", []
+                underlying, ERC20_ABI, "decimals", []
             )
 
         return rpc_calls

defi_services/services/lending/lending_info/arbitrum/aave_v3_arbitrum.py

@@ -1,6 +1,6 @@
 AAVE_V3_ARB = {
     "address": "0x794a61358d6845594f94dc1db02a252b5b4814ad",
-    "name": "AAVE Lending Pool",
+    "name": "Radiant Lending Pool",
     "stakedIncentiveAddress": '0x929ec64c34a17401f460460d4b9390518e5b473e',
     "oracleAddress": "0xb56c2F0B653B2e0b10C9b928C8580Ac5Df02C7C7",
     "rewardTokensList": [],

defi_services/services/lending/lending_info/arbitrum/compound_v3_arbitrum.py

@@ -37,113 +37,23 @@ COMPOUND_V3_ARBITRUM = {
             "assets": {
                 "0x912ce59144191c1204e64559fe8253a0e49e6548": {
                     "priceFeed": "0xb2a824043730fe05f3da2efafa1cbbe83fa548d6",
-                    "loanToValue": 0.7,
-                    "liquidationThreshold": 0.8
+                    "loanToValue": 0.55,
+                    "liquidationThreshold": 0.6
                 },
                 "0xfc5a1a6eb076a2c7ad06ed22c90d7e710e35ad0a": {
                     "priceFeed": "0xdb98056fecfff59d032ab628337a4887110df3db",
-                    "loanToValue": 0.6,
-                    "liquidationThreshold": 0.75
-                },
-                "0x82af49447d8a07e3bd95bd0d56f35241523fbab1": {
-                    "priceFeed": "0x639fe6ab55c921f74e7fac1ee960c0b6293ba612",
-                    "loanToValue": 0.83,
-                    "liquidationThreshold": 0.9
-                },
-                "0x2f2a2543b76a4166549f7aab2e75bef0aefc5b0f": {
-                    "priceFeed": "0xd0c7101eacbb49f3decccc166d238410d6d46d57",
-                    "loanToValue": 0.75,
-                    "liquidationThreshold": 0.85
-                },
-                "0x5979d7b546e38e414f7e9822514be443a4800529": {
-                    "priceFeed": "0xe165155c34fe4cbfc55fc554437907bdb1af7e3e",
-                    "loanToValue": 0.8,
-                    "liquidationThreshold": 0.85
-                },
-                "0x2416092f143378750bb29b79ed961ab195cceea5": {
-                    "priceFeed": "0xc49399814452b41da8a7cd76a159f5515cb3e493",
-                    "loanToValue": 0.8,
-                    "liquidationThreshold": 0.85
-                },
-                "0x57f5e098cad7a3d1eed53991d4d66c45c9af7812": {
-                    "priceFeed": "0x13cdfb7db5e2f58e122b2e789b59de13645349c4",
-                    "loanToValue": 0.88,
-                    "liquidationThreshold": 0.9
-                }
-            }
-        },
-        "0x82af49447d8a07e3bd95bd0d56f35241523fbab1": {
-            "comet": "0x6f7d514bbd4aff3bcd1140b7344b32f063dee486",
-            "assets": {
-                "0x35751007a407ca6feffe80b3cb397736d2cf4dbe": {
-                    "priceFeed": "0xd3cf278f135d9831d2bf28f6672a4575906ca724",
-                    "loanToValue": 0.9,
-                    "liquidationThreshold": 0.93
-                },
-                "0xec70dcb4a1efa46b8f2d97c310c9c4790ba5ffa8": {
-                    "priceFeed": "0x970ffd8e335b8fa4cd5c869c7cac3a90671d5dc3",
-                    "loanToValue": 0.9,
-                    "liquidationThreshold": 0.93
-                },
-                "0x5979d7b546e38e414f7e9822514be443a4800529": {
-                    "priceFeed": "0x6c987dde50db1dcdd32cd4175778c2a291978e2a",
-                    "loanToValue": 0.88,
-                    "liquidationThreshold": 0.93
-                },
-                "0x2f2a2543b76a4166549f7aab2e75bef0aefc5b0f": {
-                    "priceFeed": "0xfa454de61b317b6535a0c462267208e8fdb89f45",
-                    "loanToValue": 0.8,
-                    "liquidationThreshold": 0.85
-                },
-                "0x4186bfc76e2e237523cbc30fd220fe055156b41f": {
-                    "priceFeed": "0x3870fac3de911c12a57e5a2532d15ad8ca275a60",
-                    "loanToValue": 0.88,
-                    "liquidationThreshold": 0.91
-                },
-                "0xfd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb9": {
-                    "priceFeed": "0x84e93ec6170ed630f5ebd89a1aae72d4f63f2713",
-                    "loanToValue": 0.8,
-                    "liquidationThreshold": 0.85
-                },
-                "0xaf88d065e77c8cc2239327c5edb3a432268e5831": {
-                    "priceFeed": "0x443ea0340cb75a160f31a440722dec7b5bc3c2e9",
-                    "loanToValue": 0.8,
-                    "liquidationThreshold": 0.85
-                },
-                "0x2416092f143378750bb29b79ed961ab195cceea5": {
-                    "priceFeed": "0x72e9b6f907365d76c6192ad49c0c5ba356b7fa48",
-                    "loanToValue": 0.88,
-                    "liquidationThreshold": 0.91
-                }
-            }
-        },
-        "0xfd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb9": {
-            "comet": "0xd98be00b5d27fc98112bde293e487f8d4ca57d07",
-            "assets": {
-                "0x912ce59144191c1204e64559fe8253a0e49e6548": {
-                    "priceFeed": "0xb2a824043730fe05f3da2efafa1cbbe83fa548d6",
-                    "loanToValue": 0.7,
-                    "liquidationThreshold": 0.8
+                    "loanToValue": 0.4,
+                    "liquidationThreshold": 0.45
                 },
                 "0x82af49447d8a07e3bd95bd0d56f35241523fbab1": {
                     "priceFeed": "0x639fe6ab55c921f74e7fac1ee960c0b6293ba612",
-                    "loanToValue": 0.85,
-                    "liquidationThreshold": 0.9
-                },
-                "0x5979d7b546e38e414f7e9822514be443a4800529": {
-                    "priceFeed": "0xe165155c34fe4cbfc55fc554437907bdb1af7e3e",
-                    "loanToValue": 0.8,
+                    "loanToValue": 0.78,
                     "liquidationThreshold": 0.85
                 },
                 "0x2f2a2543b76a4166549f7aab2e75bef0aefc5b0f": {
                     "priceFeed": "0xd0c7101eacbb49f3decccc166d238410d6d46d57",
                     "loanToValue": 0.7,
-                    "liquidationThreshold": 0.8
-                },
-                "0xfc5a1a6eb076a2c7ad06ed22c90d7e710e35ad0a": {
-                    "priceFeed": "0xdb98056fecfff59d032ab628337a4887110df3db",
-                    "loanToValue": 0.6,
-                    "liquidationThreshold": 0.7
+                    "liquidationThreshold": 0.77
                 }
             }
         }