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

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
     }
 
 

defi_services/services/lending/ionic_service.py

@@ -0,0 +1,167 @@
+import logging
+
+from web3 import Web3
+
+from defi_services.abis.lending.ionic.ionic_ctoken_abi import IONIC_CTOKEN_ABI
+from defi_services.abis.lending.moonwell.moonwell_comptroller_abi import MOONWELL_COMPTROLLER_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
+from defi_services.jobs.queriers.state_querier import StateQuerier
+from defi_services.services.lending.lending_info.base.ionic_base import IONIC_BASE
+from defi_services.services.lending.venus_services import VenusStateService
+
+logger = logging.getLogger("Ionic Lending Pool State Service")
+
+
+class IonicInfo:
+    mapping = {
+        Chain.base: IONIC_BASE
+    }
+
+
+class IonicStateService(VenusStateService):
+    def __init__(self, state_service: StateQuerier, chain_id: str = "0x38"):
+        super().__init__(state_service, chain_id)
+        self.name = f"{chain_id}_{Lending.ionic}"
+        self.chain_id = chain_id
+        self.pool_info = IonicInfo.mapping.get(chain_id)
+        self.state_service = state_service
+        self.comptroller_abi = MOONWELL_COMPTROLLER_ABI
+        self.vtoken_abi = IONIC_CTOKEN_ABI
+
+    def get_service_info(self):
+        info = {
+            Lending.ionic: {
+                "chain_id": self.chain_id,
+                "type": "lending",
+                "protocol_info": self.pool_info
+            }
+        }
+        return info
+
+    def get_dapp_asset_info(self, block_number: int = "latest"):
+        _w3 = self.state_service.get_w3()
+        comptroller_contract = _w3.eth.contract(
+            address=_w3.to_checksum_address(self.pool_info.get("comptrollerAddress")), abi=self.comptroller_abi)
+        ctokens = []
+        for token in comptroller_contract.functions.getAllMarkets().call(block_identifier=block_number):
+            ctokens.append(token)
+
+        reserves_info = {}
+        tokens = [Web3.to_checksum_address(i) for i in ctokens]
+        queries = {}
+        for token in tokens:
+            key = f"underlying_{token}_{block_number}".lower()
+            queries[key] = {
+                "address": token, "abi": self.vtoken_abi, "params": [],
+                "function": "underlying", "block_number": block_number
+            }
+
+            exchange_rate_query_id = f'exchangeRateCurrent_{token}_{block_number}'
+            queries[exchange_rate_query_id] = self.get_ctoken_function_info(
+                ctoken=token, fn_name='exchangeRateCurrent', block_number=block_number)
+
+            markets = f"markets_{token}_{block_number}".lower()
+            queries[markets] = self.get_comptroller_function_info("markets", [token])
+
+        decoded_data = self.state_service.query_state_data(queries)
+        for token in tokens:
+            key = f"underlying_{token}_{block_number}".lower()
+            underlying = decoded_data.get(key).lower()
+            markets = f"markets_{token}_{block_number}".lower()
+            liquidation_threshold = decoded_data.get(markets)[1] / 10 ** 18
+            ltv = liquidation_threshold
+
+            exchange_rate_query_id = f'exchangeRateCurrent_{token}_{block_number}'
+            exchange_rate = decoded_data.get(exchange_rate_query_id) / 10 ** 18
+
+            reserves_info[underlying] = {
+                'cToken': token.lower(),
+                "exchangeRate": exchange_rate,
+                "liquidationThreshold": liquidation_threshold,
+                "loanToValue": ltv
+            }
+        return reserves_info
+
+    def get_apy_lending_pool_function_info(
+            self,
+            reserves_info: dict,
+            block_number: int = "latest"
+    ):
+        rpc_calls = {}
+        for token_address, reserve_info in reserves_info.items():
+            if token_address != Token.native_token:
+                query_id = f"decimals_{token_address}_{block_number}".lower()
+                rpc_calls[query_id] = self.state_service.get_function_info(token_address, ERC20_ABI, "decimals", [], block_number)
+
+            ctoken = reserve_info.get("cToken")
+            for fn_name in ['decimals', 'totalSupply', 'totalBorrows', 'supplyRatePerBlock', 'borrowRatePerBlock', 'exchangeRateCurrent']:
+                query_id = f"{fn_name}_{ctoken}_{block_number}".lower()
+                rpc_calls[query_id] = self.get_ctoken_function_info(
+                    ctoken=ctoken,
+                    fn_name=fn_name,
+                    block_number=block_number
+                )
+
+        return rpc_calls
+
+    def get_reserve_tokens_metadata(
+            self,
+            decoded_data: dict,
+            reserves_info: dict,
+            block_number: int = "latest"
+    ):
+        reserve_tokens_info = []
+        for token_address, reserve_info in reserves_info.items():
+            if token_address != Token.native_token:
+                underlying_decimals_query_id = f"decimals_{token_address}_{block_number}".lower()
+                underlying_decimals = decoded_data.get(underlying_decimals_query_id)
+            else:
+                underlying_decimals = Chain.native_decimals.get(self.chain_id, 18)
+
+            ctoken = reserve_info.get("cToken")
+            ctoken_decimals_query_id = f"decimals_{ctoken}_{block_number}".lower()
+            total_supply_query_id = f"totalSupply_{ctoken}_{block_number}".lower()
+            total_borrow_query_id = f"totalBorrows_{ctoken}_{block_number}".lower()
+            supply_rate_query_id = f"supplyRatePerBlock_{ctoken}_{block_number}".lower()
+            borrow_rate_query_id = f"borrowRatePerBlock_{ctoken}_{block_number}".lower()
+            exchange_rate_query_id = f"exchangeRateCurrent_{ctoken}_{block_number}".lower()
+
+            reserve_tokens_info.append({
+                "token": ctoken,
+                "token_decimals": decoded_data.get(ctoken_decimals_query_id),
+                "borrow_rate": decoded_data.get(borrow_rate_query_id),
+                "supply_rate": decoded_data.get(supply_rate_query_id),
+                "supply": decoded_data.get(total_supply_query_id),
+                "borrow": decoded_data.get(total_borrow_query_id),
+                "exchange_rate": decoded_data.get(exchange_rate_query_id),
+                "underlying_decimals": underlying_decimals,
+                "underlying": token_address
+            })
+        return reserve_tokens_info
+
+    @classmethod
+    def _calculate_interest_rates(
+            cls, token_info: dict, pool_decimals: int, apx_block_speed_in_seconds: float):
+        block_per_day = int(86400 / apx_block_speed_in_seconds)
+        exchange_rate = float(token_info["exchange_rate"]) / 10 ** 18
+
+        total_borrow = float(token_info["borrow"]) / 10 ** int(token_info["underlying_decimals"])
+        total_supply = float(token_info["supply"]) * exchange_rate / 10 ** int(token_info["token_decimals"])
+
+        supply_apy = ((token_info["supply_rate"] / 10 ** pool_decimals) * block_per_day + 1) ** 365 - 1
+        borrow_apy = ((token_info["borrow_rate"] / 10 ** pool_decimals) * block_per_day + 1) ** 365 - 1
+
+        return {
+            'deposit_apy': supply_apy,
+            'borrow_apy': borrow_apy,
+            'total_deposit': total_supply,
+            'total_borrow': total_borrow
+        }
+
+    def get_ctoken_function_info(self, ctoken: str, fn_name: str, fn_paras: list = None, block_number: int = "latest"):
+        return self.state_service.get_function_info(
+            ctoken, self.vtoken_abi, fn_name, fn_paras, block_number
+        )

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.erc20_abi import ERC20_ABI
+from defi_services.abis.token.trc20_abi import TRC20_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,8 +74,9 @@ 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=ERC20_ABI)
+                underlying_contract = _w3.eth.contract(address=Web3.to_checksum_address(underlying), abi=TRC20_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}'
@@ -139,7 +140,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, ERC20_ABI, "decimals", []
+                underlying, TRC20_ABI, "decimals", []
             )
 
         return rpc_calls

defi_services/services/lending/kinza_services.py

@@ -0,0 +1,315 @@
+import logging
+
+from web3 import Web3
+
+from defi_services.abis.lending.aave.aave_v3.aave_v3_oracle_abi import AAVE_V3_ORACLE_ABI
+from defi_services.abis.lending.kinza.kinza_incentive import KINZA_INCENTIVE_ABI
+from defi_services.abis.lending.kinza.kinza_lending_pool import KINZA_LENDING_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.aave_v2_services import AaveV2StateService
+from defi_services.services.lending.lending_info.bsc.kinza_bsc import KINZA_BSC
+from defi_services.services.lending.lending_info.ethereum.kinza_eth import KINZA_ETH
+
+logger = logging.getLogger("Kinza Lending Pool State Service")
+
+
+class KinzaInfo:
+    mapping = {
+        Chain.bsc: KINZA_BSC,
+        Chain.ethereum: KINZA_ETH
+    }
+
+
+class KinzaStateService(AaveV2StateService):
+    def __init__(self, state_service: StateQuerier, chain_id: str = "0x38"):
+        super().__init__(state_service, chain_id)
+        self.name = f"{chain_id}_{Lending.kinza}"
+        self.chain_id = chain_id
+        self.pool_info = KinzaInfo.mapping.get(chain_id)
+        self.lending_abi = KINZA_LENDING_ABI
+        self.incentive_abi = KINZA_INCENTIVE_ABI
+        self.oracle_abi = AAVE_V3_ORACLE_ABI
+        self.state_service = state_service
+
+    def get_service_info(self):
+        info = {
+            Lending.kinza: {
+                "chain_id": self.chain_id,
+                "type": "lending",
+                "protocol_info": self.pool_info
+            }
+        }
+        return info
+
+    def get_dapp_asset_info(self, block_number: int = 'latest'):
+        _w3 = self.state_service.get_w3()
+        pool_address = self.pool_info.get("address")
+        pool_contract = _w3.eth.contract(address=_w3.to_checksum_address(pool_address), abi=self.lending_abi)
+        reserve_list = pool_contract.functions.getReservesList().call(block_identifier=block_number)
+        reserves_info = {}
+        for token in reserve_list:
+            token = token.lower()
+            reserve_data = pool_contract.functions.getReserveData(
+                _w3.to_checksum_address(token)).call(block_identifier=block_number)
+            reserves_info[token] = {}
+            reserves_info[token]["tToken"] = reserve_data[8].lower()
+            reserves_info[token]["sdToken"] = reserve_data[9].lower()
+            reserves_info[token]["dToken"] = reserve_data[10].lower()
+
+            risk_param = bin(reserve_data[0][0])[2:]
+            reserves_info[token]["loanToValue"] = int(risk_param[-15:], 2) / 10 ** 4
+            reserves_info[token]["liquidationThreshold"] = int(risk_param[-31:-16], 2) / 10 ** 4
+
+        return reserves_info
+
+    # CALCULATE APY LENDING POOL
+    def get_reserve_tokens_metadata(
+            self,
+            decoded_data: dict,
+            reserves_info: dict,
+            block_number: int = "latest"
+    ):
+        reserve_tokens_info = []
+        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()
+            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()
+
+
+            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),
+
+                '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)
+
+        return reserve_tokens_info
+
+    def get_apy_lending_pool_function_info_deprecated(
+            self,
+            reserves_info: dict,
+            block_number: int = "latest",
+    ):
+        rpc_calls = {}
+        reward_tokens = self.pool_info.get("rewardTokensList")
+        for token_address, value in reserves_info.items():
+            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()
+            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()
+                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(
+                    "getRewardsData", [value['sdToken'], reward_token], block_number)
+
+            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[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(
+            self,
+            atokens: dict,
+            debt_tokens: dict,
+            decimals: dict,
+            reserves_info: dict,
+            asset_data_tokens: dict,
+            total_supply_tokens: dict,
+            interest_rate: dict,
+            token_prices: dict,
+            pool_token_price: float,
+            pool_decimals: int = 18,
+    ):
+        reward_tokens = self.pool_info.get("rewardTokensList")
+        for token_address in reserves_info:
+            atoken = atokens.get(token_address)
+            debt_token = debt_tokens.get(token_address)
+            decimal = decimals.get(token_address)
+            total_supply_t = total_supply_tokens.get(atoken, 0)
+            total_supply_d = total_supply_tokens.get(debt_token, 0)
+            # update deposit, borrow apy
+            total_supply_t = total_supply_t / 10 ** decimal
+            total_supply_d = total_supply_d / 10 ** decimal
+            token_price = token_prices.get(token_address)
+            interest_rate[token_address].update({
+                "utilization": total_supply_d / total_supply_t,
+            })
+            total_supply_t_in_usd = total_supply_t * token_price
+            total_supply_d_in_usd = total_supply_d * token_price
+            if reward_tokens:
+                interest_rate[token_address][DBConst.reward_deposit_apy] = {}
+                interest_rate[token_address][DBConst.reward_borrow_apy] = {}
+                asset_data_t = asset_data_tokens.get(atoken)
+                asset_data_d = asset_data_tokens.get(debt_token)
+                # update deposit, borrow apy
+                for reward_address in reward_tokens:
+                    eps_t = asset_data_t[reward_address][1] / 10 ** 18
+                    eps_d = asset_data_d[reward_address][1] / 10 ** 18
+                    if total_supply_t:
+                        deposit_apr = eps_t * TimeConstants.A_YEAR * pool_token_price / (
+                                total_supply_t * token_price)
+                    else:
+                        deposit_apr = 0
+                    if total_supply_d:
+                        borrow_apr = eps_d * TimeConstants.A_YEAR * pool_token_price / (
+                                total_supply_d * token_price)
+                    else:
+                        borrow_apr = 0
+                    interest_rate[token_address][DBConst.reward_deposit_apy].update({
+                        DBConst.reward_borrow_apy: deposit_apr}
+                    )
+                    interest_rate[token_address][DBConst.reward_borrow_apy].update({
+                        reward_address: borrow_apr}
+                    )
+            # update liquidity
+            liquidity_log = {
+                'total_borrow': {
+                    DBConst.amount: total_supply_d,
+                    DBConst.value_in_usd: total_supply_d_in_usd},
+                'total_deposit': {
+                    DBConst.amount: total_supply_t,
+                    DBConst.value_in_usd: total_supply_t_in_usd}
+            }
+            interest_rate[token_address].update({DBConst.liquidity_change_logs: liquidity_log})
+
+        return interest_rate
+
+    def calculate_apy_lending_pool_function_call_deprecated(
+            self,
+            reserves_info: dict,
+            decoded_data: dict,
+            token_prices: dict,
+            pool_token_price: float,
+            pool_decimals: int = 18,
+            block_number: int = 'latest',
+    ):
+        reserves_data = {}
+        for token in reserves_info:
+            get_reserve_data_call_id = f'getReserveData_{self.name}_{token}_{block_number}'.lower()
+            reserves_data[token.lower()] = decoded_data.get(get_reserve_data_call_id)
+        reward_tokens = self.pool_info.get("rewardTokensList")
+        interest_rate, atokens, debt_tokens, sdebt_tokens, decimals, asset_data_tokens = {}, {}, {}, {}, {}, {}
+        total_supply_tokens = {}
+        for token_address in reserves_info:
+            lower_address = token_address.lower()
+            reserve_data = reserves_data[lower_address]
+            interest_rate[lower_address] = {
+                'deposit_apy': float(reserve_data[3]) / 10 ** 27,
+                'borrow_apy': float(reserve_data[4]) / 10 ** 27,
+                'stable_borrow_apy': float(reserve_data[5]) / 10 ** 27}
+            atoken = reserve_data[7].lower()
+            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()
+            asset_data_tokens[atoken] = {}
+            asset_data_tokens[debt_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()
+                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)
+                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)
+
+        asset_price_key = f"getAssetsPrices_{self.name}_{block_number}".lower()
+        if not token_prices and asset_price_key in decoded_data:
+            token_prices = {}
+            prices = decoded_data.get(asset_price_key)
+            for pos in range(len(reserves_info.keys())):
+                token_prices[reserves_info[pos].lower()] = prices[pos] / 10 ** pool_decimals
+
+        data = self.get_apy_lending_pool_deprecated(
+            atokens, debt_tokens, decimals, reserves_info, asset_data_tokens, total_supply_tokens, interest_rate,
+            token_prices, pool_token_price, pool_decimals
+        )
+
+        return data
+
+    # REWARDS BALANCE
+    def get_rewards_balance_function_info(
+            self,
+            wallet,
+            reserves_info: dict = None,
+            block_number: int = "latest"
+    ):
+        rpc_calls = {}
+        reward_tokens = self.pool_info.get("rewardTokensList")
+        for reward_token in reward_tokens:
+            decimals_call_id = f"decimals_{reward_token}_{block_number}".lower()
+            rpc_calls[decimals_call_id] = self.state_service.get_function_info(
+                reward_token, ERC20_ABI, "decimals", block_number=block_number)
+        tokens = []
+        for key, value in reserves_info.items():
+            tokens += [Web3.to_checksum_address(value["tToken"]), Web3.to_checksum_address(value["dToken"])]
+        key = f"getAllUserRewards_{self.name}_{wallet}_{block_number}".lower()
+        rpc_calls[key] = self.get_function_incentive_info("getAllUserRewards", [tokens, Web3.to_checksum_address(wallet)], block_number)
+        return rpc_calls
+
+    def calculate_rewards_balance(
+            self, wallet: str, reserves_info: dict, decoded_data: dict, block_number: int = "latest"):
+        key = f"getAllUserRewards_{self.name}_{wallet}_{block_number}".lower()
+        rewards = decoded_data.get(key)
+        result = dict(zip(*rewards))
+        for key, value in result.items():
+            decimals_call_id = f"decimals_{key}_{block_number}".lower()
+            value /= 10 ** decoded_data.get(decimals_call_id, 18)
+            result[key] = {"amount": value}
+        return result

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

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

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

@@ -37,23 +37,113 @@ COMPOUND_V3_ARBITRUM = {
             "assets": {
                 "0x912ce59144191c1204e64559fe8253a0e49e6548": {
                     "priceFeed": "0xb2a824043730fe05f3da2efafa1cbbe83fa548d6",
-                    "loanToValue": 0.55,
-                    "liquidationThreshold": 0.6
+                    "loanToValue": 0.7,
+                    "liquidationThreshold": 0.8
                 },
                 "0xfc5a1a6eb076a2c7ad06ed22c90d7e710e35ad0a": {
                     "priceFeed": "0xdb98056fecfff59d032ab628337a4887110df3db",
-                    "loanToValue": 0.4,
-                    "liquidationThreshold": 0.45
+                    "loanToValue": 0.6,
+                    "liquidationThreshold": 0.75
                 },
                 "0x82af49447d8a07e3bd95bd0d56f35241523fbab1": {
                     "priceFeed": "0x639fe6ab55c921f74e7fac1ee960c0b6293ba612",
-                    "loanToValue": 0.78,
+                    "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
+                },
+                "0x82af49447d8a07e3bd95bd0d56f35241523fbab1": {
+                    "priceFeed": "0x639fe6ab55c921f74e7fac1ee960c0b6293ba612",
+                    "loanToValue": 0.85,
+                    "liquidationThreshold": 0.9
+                },
+                "0x5979d7b546e38e414f7e9822514be443a4800529": {
+                    "priceFeed": "0xe165155c34fe4cbfc55fc554437907bdb1af7e3e",
+                    "loanToValue": 0.8,
                     "liquidationThreshold": 0.85
                 },
                 "0x2f2a2543b76a4166549f7aab2e75bef0aefc5b0f": {
                     "priceFeed": "0xd0c7101eacbb49f3decccc166d238410d6d46d57",
                     "loanToValue": 0.7,
-                    "liquidationThreshold": 0.77
+                    "liquidationThreshold": 0.8
+                },
+                "0xfc5a1a6eb076a2c7ad06ed22c90d7e710e35ad0a": {
+                    "priceFeed": "0xdb98056fecfff59d032ab628337a4887110df3db",
+                    "loanToValue": 0.6,
+                    "liquidationThreshold": 0.7
                 }
             }
         }