defi-state-querier 0.0.6__py3-none-any.whl → 0.0.9__py3-none-any.whl

defi_services/services/lending/aave_v3_services.py

@@ -5,11 +5,13 @@ from web3 import Web3
 from defi_services.abis.lending.aave_v3.aave_v3_incentives_abi import AAVE_V3_INCENTIVES_ABI
 from defi_services.abis.lending.aave_v3.aave_v3_lending_pool_abi import AAVE_V3_LENDING_POOL_ABI
 from defi_services.abis.lending.aave_v3.aave_v3_oracle_abi import AAVE_V3_ORACLE_ABI
+from defi_services.abis.lending.morpho.morpho_aave_v3_comptroller_abi import MORPHO_AAVE_V3_COMPTROLLER_ABI
 from defi_services.abis.token.erc20_abi import ERC20_ABI
 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.time_constant import TimeConstants
-from defi_services.jobs.state_querier import StateQuerier
+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
@@ -21,7 +23,7 @@ from defi_services.services.lending.lending_info.polygon.aave_v3_polygon import
 logger = logging.getLogger("Aave V3 Lending Pool State Service")
 
 
-class AaveInfo:
+class AaveV3Info:
     mapping = {
         Chain.ethereum: AAVE_V3_ETH,
         Chain.polygon: AAVE_V3_POLYGON,
@@ -35,17 +37,18 @@ class AaveInfo:
 class AaveV3StateService(AaveV2StateService):
     def __init__(self, state_service: StateQuerier, chain_id: str = "0x1"):
         super().__init__(state_service, chain_id)
-        self.name = f"{chain_id}_aave-v3"
+        self.name = f"{chain_id}_{Lending.aave_v3}"
         self.chain_id = chain_id
-        self.pool_info = AaveInfo.mapping.get(chain_id)
+        self.pool_info = AaveV3Info.mapping.get(chain_id)
         self.lending_abi = AAVE_V3_LENDING_POOL_ABI
         self.incentive_abi = AAVE_V3_INCENTIVES_ABI
         self.oracle_abi = AAVE_V3_ORACLE_ABI
+        self.comptroller_abi = MORPHO_AAVE_V3_COMPTROLLER_ABI
         self.state_service = state_service
 
     def get_service_info(self):
         info = {
-            "aave-v3": {
+            Lending.aave_v3: {
                 "chain_id": self.chain_id,
                 "type": "lending",
                 "protocol_info": self.pool_info
@@ -89,7 +92,7 @@ class AaveV3StateService(AaveV2StateService):
                 "getAssetsPrices", list(reserves_info.keys()), block_number)
         reward_tokens = self.pool_info.get("rewardTokensList")
         for token_address, value in reserves_info.items():
-            reserve_key = f"getReserveData_{token_address}_{block_number}".lower()
+            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()
@@ -200,7 +203,7 @@ class AaveV3StateService(AaveV2StateService):
     ):
         reserves_data = {}
         for token in reserves_info:
-            get_reserve_data_call_id = f'getReserveData_{token}_{block_number}'.lower()
+            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 = {}, {}, {}, {}, {}, {}
@@ -270,13 +273,13 @@ class AaveV3StateService(AaveV2StateService):
         tokens = []
         for key, value in reserves_info.items():
             tokens += [Web3.toChecksumAddress(value["tToken"]), Web3.toChecksumAddress(value["dToken"])]
-        key = f"getAllUserRewards_{wallet_address}_{block_number}".lower()
+        key = f"getAllUserRewards_{self.name}_{wallet_address}_{block_number}".lower()
         rpc_calls[key] = self.get_function_incentive_info("getAllUserRewards", [tokens, Web3.toChecksumAddress(wallet_address)], block_number)
         return rpc_calls
 
     def calculate_all_rewards_balance(
             self, decoded_data: dict, wallet_address: str, block_number: int = "latest"):
-        key = f"getAllUserRewards_{wallet_address}_{block_number}".lower()
+        key = f"getAllUserRewards_{self.name}_{wallet_address}_{block_number}".lower()
         rewards = decoded_data.get(key)
         result = dict(zip(*rewards))
         for key, value in result.items():

defi_services/services/lending/compound_service.py

@@ -9,9 +9,10 @@ from defi_services.abis.token.ctoken_abi import CTOKEN_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.query_constant import Query
 from defi_services.constants.token_constant import ContractAddresses, Token
-from defi_services.jobs.state_querier import StateQuerier
+from defi_services.jobs.queriers.state_querier import StateQuerier
 from defi_services.services.lending.lending_info.ethereum.compound_eth import COMPOUND_ETH
 from defi_services.services.protocol_services import ProtocolServices
 
@@ -26,7 +27,7 @@ class CompoundInfo:
 
 class CompoundStateService(ProtocolServices):
     def __init__(self, state_service: StateQuerier, chain_id: str = "0x1"):
-        self.name = f"{chain_id}_compound"
+        self.name = f"{chain_id}_{Lending.compound}"
         self.chain_id = chain_id
         self.pool_info = CompoundInfo.mapping.get(chain_id)
         self.state_service = state_service
@@ -36,7 +37,7 @@ class CompoundStateService(ProtocolServices):
     # BASIC FUNCTIONS
     def get_service_info(self):
         info = {
-            "compound": {
+            Lending.compound: {
                 "chain_id": self.chain_id,
                 "type": "lending",
                 "protocol_info": self.pool_info
@@ -105,7 +106,7 @@ class CompoundStateService(ProtocolServices):
             ))
 
         if Query.protocol_reward in query_types and wallet:
-            result.update(self.calculate_rewards_balance(
+            result.update(self.calculate_claimable_rewards_balance(
                 wallet, decoded_data, block_number
             ))
 
@@ -138,7 +139,7 @@ class CompoundStateService(ProtocolServices):
             rpc_calls.update(self.get_apy_lending_pool_function_info(reserves_info, block_number, is_oracle_price))
 
         if Query.protocol_reward in query_types and wallet:
-            rpc_calls.update(self.get_rewards_balance_function_info(wallet, block_number))
+            rpc_calls.update(self.get_claimable_rewards_balance_function_info(wallet, block_number))
 
         logger.info(f"Get encoded rpc calls in {time.time() - begin}s")
         return rpc_calls
@@ -155,10 +156,10 @@ class CompoundStateService(ProtocolServices):
             ctoken = value.get("ctoken")
             speed_key = f"compSpeeds_{ctoken}_{block_number}".lower()
             mint_key = f"mintGuardianPaused_{ctoken}_{block_number}".lower()
-            borrow_key = f"borrowGuardianPaused_{token}_{block_number}".lower()
-            metadata_key = f"cTokenMetadata_{token}_{block_number}".lower()
+            borrow_key = f"borrowGuardianPaused_{ctoken}_{block_number}".lower()
+            metadata_key = f"cTokenMetadata_{ctoken}_{block_number}".lower()
             if is_price_oracle:
-                price_key = f"cTokenUnderlyingPrice_{token}_{block_number}".lower()
+                price_key = f"cTokenUnderlyingPrice_{ctoken}_{block_number}".lower()
                 rpc_calls[price_key] = self.get_comptroller_function_info('cTokenUnderlyingPrice', [ctoken],
                                                                           block_number)
             rpc_calls[speed_key] = self.get_comptroller_function_info('compSpeeds', [ctoken], block_number)
@@ -303,6 +304,24 @@ class CompoundStateService(ProtocolServices):
         }
 
     # REWARDS BALANCE
+    def get_claimable_rewards_balance_function_info(
+            self,
+            wallet_address: str,
+            block_number: int = "latest",
+    ):
+        rpc_call = self.get_comptroller_function_info("compAccrued", [wallet_address], block_number)
+        get_reward_id = f"compAccrued_{self.name}_{wallet_address}_{block_number}".lower()
+        return {get_reward_id: rpc_call}
+
+    def calculate_claimable_rewards_balance(self, wallet_address: str, decoded_data: dict, block_number: int = "latest"):
+        get_reward_id = f"compAccrued_{self.name}_{wallet_address}_{block_number}".lower()
+        rewards = decoded_data.get(get_reward_id) / 10 ** 18
+        reward_token = self.pool_info.get("rewardToken")
+        result = {
+            reward_token: {"amount": rewards}
+        }
+        return result
+
     def get_rewards_balance_function_info(
             self,
             wallet_address: str,
@@ -313,11 +332,11 @@ class CompoundStateService(ProtocolServices):
                     Web3.toChecksumAddress(self.pool_info.get("comptrollerAddress")),
                     Web3.toChecksumAddress(wallet_address)]
         rpc_call = self.get_lens_function_info("getCompBalanceMetadataExt", fn_paras, block_number)
-        get_reward_id = f"getCompBalanceMetadataExt_{wallet_address}_{block_number}".lower()
+        get_reward_id = f"getCompBalanceMetadataExt_{self.name}_{wallet_address}_{block_number}".lower()
         return {get_reward_id: rpc_call}
 
     def calculate_rewards_balance(self, wallet_address: str, decoded_data: dict, block_number: int = "latest"):
-        get_reward_id = f"getCompBalanceMetadataExt_{wallet_address}_{block_number}".lower()
+        get_reward_id = f"getCompBalanceMetadataExt_{self.name}_{wallet_address}_{block_number}".lower()
         rewards = decoded_data.get(get_reward_id)[-1] / 10 ** 18
         reward_token = self.pool_info.get("rewardToken")
         result = {

defi_services/services/lending/cream_services.py

@@ -3,7 +3,8 @@ import logging
 from web3 import Web3
 
 from defi_services.constants.chain_constant import Chain
-from defi_services.jobs.state_querier import StateQuerier
+from defi_services.constants.entities.lending_constant import Lending
+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.bsc.cream_bsc import CREAM_BSC
 
@@ -19,13 +20,13 @@ class CreamInfo:
 class CreamStateService(CompoundStateService):
     def __init__(self, state_service: StateQuerier, chain_id: str = "0x1"):
         super().__init__(state_service, chain_id)
-        self.name = f"{chain_id}_cream-lending"
+        self.name = f"{chain_id}_{Lending.cream}"
         self.chain_id = chain_id
         self.pool_info = CreamInfo.mapping.get(chain_id)
 
     def get_service_info(self):
         info = {
-            "cream-lending": {
+            Lending.cream: {
                 "chain_id": self.chain_id,
                 "type": "lending",
                 "protocol_info": self.pool_info
@@ -43,6 +44,6 @@ class CreamStateService(CompoundStateService):
                     Web3.toChecksumAddress(self.pool_info.get("comptrollerImplementationAddress")),
                     Web3.toChecksumAddress(wallet_address)]
         rpc_call = self.get_lens_function_info("getCompBalanceMetadataExt", fn_paras, block_number)
-        get_reward_id = f"getCompBalanceMetadataExt_{wallet_address}_{block_number}".lower()
+        get_reward_id = f"getCompBalanceMetadataExt_{self.name}_{wallet_address}_{block_number}".lower()
         return {get_reward_id: rpc_call}
 

defi_services/services/lending/flux_services.py

@@ -8,10 +8,10 @@ from defi_services.abis.lending.cream.cream_lens_abi import CREAM_LENS_ABI
 from defi_services.abis.token.ctoken_abi import CTOKEN_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.query_constant import Query
 from defi_services.constants.token_constant import ContractAddresses, Token
-from defi_services.jobs.state_querier import StateQuerier
+from defi_services.jobs.queriers.state_querier import StateQuerier
 from defi_services.services.lending.lending_info.ethereum.flux_eth import FLUX_ETH
 from defi_services.services.protocol_services import ProtocolServices
 
@@ -26,10 +26,9 @@ class FluxInfo:
 
 class FluxStateService(ProtocolServices):
     def __init__(self, state_service: StateQuerier, chain_id: str = "0x1"):
-        self.name = f"{chain_id}_flux-finance"
-        self.name = f"{chain_id}_flux"
+        self.name = f"{chain_id}_{Lending.flux}"
         self.chain_id = chain_id
-        self.flux_info = FluxInfo.mapping.get(chain_id)
+        self.pool_info = FluxInfo.mapping.get(chain_id)
         self.state_service = state_service
         self.lens_abi = CREAM_LENS_ABI
         self.comptroller_abi = CREAM_COMPTROLLER_ABI
@@ -37,10 +36,10 @@ class FluxStateService(ProtocolServices):
     # BASIC FUNCTIONS
     def get_service_info(self):
         info = {
-            "flux-finance": {
+            Lending.flux: {
                 "chain_id": self.chain_id,
                 "type": "lending",
-                "protocol_info": self.flux_info
+                "protocol_info": self.pool_info
             }
         }
         return info
@@ -50,7 +49,7 @@ class FluxStateService(ProtocolServices):
             block_number: int = "latest"):
         _w3 = self.state_service.get_w3()
         comptroller_contract = _w3.eth.contract(
-            address=_w3.toChecksumAddress(self.flux_info.get("comptrollerAddress")), abi=self.comptroller_abi)
+            address=_w3.toChecksumAddress(self.pool_info.get("comptrollerAddress")), abi=self.comptroller_abi)
         ctokens = []
         for token in comptroller_contract.functions.getAllMarkets().call(block_identifier=block_number):
             if token in [ContractAddresses.LUNA.lower(), ContractAddresses.UST.lower(), ContractAddresses.LUNA,
@@ -59,7 +58,7 @@ class FluxStateService(ProtocolServices):
             ctokens.append(token)
 
         lens_contract = _w3.eth.contract(
-            address=Web3.toChecksumAddress(self.flux_info.get("lensAddress")), abi=self.lens_abi
+            address=Web3.toChecksumAddress(self.pool_info.get("lensAddress")), abi=self.lens_abi
         )
         tokens = [Web3.toChecksumAddress(i) for i in ctokens]
         metadata = lens_contract.functions.cTokenMetadataAll(tokens).call(block_identifier=block_number)
@@ -76,8 +75,8 @@ class FluxStateService(ProtocolServices):
 
     def get_token_list(self):
         begin = time.time()
-        tokens = [self.flux_info.get('rewardToken'), self.flux_info.get("poolToken")]
-        for token in self.flux_info.get("reservesList"):
+        tokens = [self.pool_info.get('rewardToken'), self.pool_info.get("poolToken")]
+        for token in self.pool_info.get("reservesList"):
             if token == Token.native_token:
                 tokens.append(Token.wrapped_token.get(self.chain_id))
                 continue
@@ -94,7 +93,7 @@ class FluxStateService(ProtocolServices):
             **kwargs
     ):
         begin = time.time()
-        reserves_info = kwargs.get("reserves_info", self.flux_info.get("reservesList"))
+        reserves_info = kwargs.get("reserves_info", self.pool_info.get("reservesList"))
         token_prices = kwargs.get("token_prices", {})
         wrapped_native_token_price = token_prices.get(Token.wrapped_token.get(self.chain_id), 1)
         pool_decimals = kwargs.get("pool_decimals", 18)
@@ -105,7 +104,7 @@ class FluxStateService(ProtocolServices):
             ))
 
         if Query.protocol_reward in query_types and wallet:
-            result.update(self.calculate_rewards_balance(
+            result.update(self.calculate_claimable_rewards_balance(
                 wallet, decoded_data, block_number
             ))
 
@@ -123,7 +122,7 @@ class FluxStateService(ProtocolServices):
         reserves_info = kwargs.get("reserves_info", {})
         is_oracle_price = kwargs.get("is_oracle_price", False)  # get price by oracle
         if not reserves_info:
-            reserves_info = self.flux_info['reservesList']
+            reserves_info = self.pool_info['reservesList']
         rpc_calls = {}
         if Query.deposit_borrow in query_types and wallet:
             rpc_calls.update(self.get_wallet_deposit_borrow_balance_function_info(
@@ -131,21 +130,30 @@ class FluxStateService(ProtocolServices):
             ))
 
         if Query.protocol_reward in query_types and wallet:
-            rpc_calls.update(self.get_rewards_balance_function_info(wallet, block_number))
+            rpc_calls.update(self.get_claimable_rewards_balance_function_info(wallet, block_number))
 
         logger.info(f"Get encoded rpc calls in {time.time() - begin}s")
         return rpc_calls
 
     # REWARDS BALANCE
-    def get_rewards_balance_function_info(
+    def get_claimable_rewards_balance_function_info(
             self,
             wallet_address: str,
             block_number: int = "latest",
     ):
-        return {}
-
-    def calculate_rewards_balance(self, wallet_address: str, decoded_data: dict, block_number: int = "latest"):
-        return {}
+        rpc_call = self.get_comptroller_function_info("compAccrued", [wallet_address], block_number)
+        get_reward_id = f"compAccrued_{self.name}_{wallet_address}_{block_number}".lower()
+        return {get_reward_id: rpc_call}
+
+    def calculate_claimable_rewards_balance(self, wallet_address: str, decoded_data: dict,
+                                            block_number: int = "latest"):
+        get_reward_id = f"compAccrued_{self.name}_{wallet_address}_{block_number}".lower()
+        rewards = decoded_data.get(get_reward_id) / 10 ** 18
+        reward_token = self.pool_info.get("rewardToken")
+        result = {
+            reward_token: {"amount": rewards}
+        }
+        return result
 
     # WALLET DEPOSIT BORROW BALANCE
     def get_wallet_deposit_borrow_balance_function_info(
@@ -292,15 +300,14 @@ class FluxStateService(ProtocolServices):
                 result[token]['deposit_amount_in_usd'] += deposit_amount_in_usd
         return result
 
-
     def get_lens_function_info(self, fn_name: str, fn_paras: list, block_number: int = "latest"):
         return self.state_service.get_function_info(
-            self.flux_info['lensAddress'], self.lens_abi, fn_name, fn_paras, block_number
+            self.pool_info['lensAddress'], self.lens_abi, fn_name, fn_paras, block_number
         )
 
     def get_comptroller_function_info(self, fn_name: str, fn_paras: list, block_number: int = "latest"):
         return self.state_service.get_function_info(
-            self.flux_info['comptrollerAddress'], self.comptroller_abi, fn_name, fn_paras, block_number
+            self.pool_info['comptrollerAddress'], self.comptroller_abi, fn_name, fn_paras, block_number
         )
 
     def get_ctoken_function_info(self, ctoken: str, fn_name: str, fn_paras: list, block_number: int = "latest"):
@@ -314,7 +321,7 @@ class FluxStateService(ProtocolServices):
             block_number: int = "latest"
     ):
         tokens = [Web3.toChecksumAddress(value['cToken']) for key, value in reserves_info.items()]
-        key = f"cTokenMetadataAll_{self.flux_info.get('lensAddress')}_{block_number}".lower()
+        key = f"cTokenMetadataAll_{self.pool_info.get('lensAddress')}_{block_number}".lower()
         return {
             key: self.get_lens_function_info("cTokenMetadataAll", tokens, block_number)
         }
@@ -322,14 +329,14 @@ class FluxStateService(ProtocolServices):
     def ctoken_underlying_price_all(
             self, reserves_info, block_number: int = 'latest'):
         tokens = [Web3.toChecksumAddress(value['cToken']) for key, value in reserves_info.items()]
-        key = f"cTokenUnderlyingPriceAll_{self.flux_info.get('lensAddress')}_{block_number}".lower()
+        key = f"cTokenUnderlyingPriceAll_{self.pool_info.get('lensAddress')}_{block_number}".lower()
         return {
             key: self.get_lens_function_info("cTokenUnderlyingPriceAll", tokens, block_number)
         }
 
     def get_all_markets(
             self, block_number: int = 'latest'):
-        key = f"getAllMarkets_{self.flux_info.get('comptrollerAddress')}_{block_number}".lower()
+        key = f"getAllMarkets_{self.pool_info.get('comptrollerAddress')}_{block_number}".lower()
         return {
             key: self.get_comptroller_function_info("getAllMarkets", [], block_number)
-        }
+        }

defi_services/services/lending/geist_services.py

@@ -1,7 +1,8 @@
 import logging
 
 from defi_services.constants.chain_constant import Chain
-from defi_services.jobs.state_querier import StateQuerier
+from defi_services.constants.entities.lending_constant import Lending
+from defi_services.jobs.queriers.state_querier import StateQuerier
 from defi_services.services.lending.lending_info.fantom.geist_ftm import GEIST_ETH
 from defi_services.services.lending.valas_services import ValasStateService
 
@@ -17,12 +18,12 @@ class GeistInfo:
 class GeistStateService(ValasStateService):
     def __init__(self, state_service: StateQuerier, chain_id: str = "0xfa"):
         super().__init__(state_service, chain_id)
-        self.name = f"{chain_id}_geist-finance"
+        self.name = f"{chain_id}_{Lending.geist}"
         self.pool_info = GeistInfo.mapping.get(chain_id)
 
     def get_service_info(self):
         info = {
-            "geist-finance": {
+            Lending.geist: {
                 "chain_id": self.chain_id,
                 "type": "lending",
                 "protocol_info": self.pool_info

defi_services/services/lending/granary_v1_services.py

@@ -8,11 +8,10 @@ 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
-from defi_services.constants.db_constant import DBConst
+from defi_services.constants.entities.lending_constant import Lending
 from defi_services.constants.query_constant import Query
-from defi_services.constants.time_constant import TimeConstants
 from defi_services.constants.token_constant import Token
-from defi_services.jobs.state_querier import StateQuerier
+from defi_services.jobs.queriers.state_querier import StateQuerier
 from defi_services.services.lending.lending_info.ethereum.granary_v1_eth import GRANARY_V1_ETH
 from defi_services.services.protocol_services import ProtocolServices
 
@@ -27,7 +26,7 @@ class GranaryV1Info:
 
 class GranaryV1StateService(ProtocolServices):
     def __init__(self, state_service: StateQuerier, chain_id: str = "0x1"):
-        self.name = f"{chain_id}_granary-finance"
+        self.name = f"{chain_id}_{Lending.granary}"
         self.chain_id = chain_id
         self.pool_info = GranaryV1Info.mapping.get(chain_id)
         self.lending_abi = LENDING_POOL_ABI
@@ -39,7 +38,7 @@ class GranaryV1StateService(ProtocolServices):
     # BASIC FUNCTION
     def get_service_info(self):
         info = {
-            "granary-finance": {
+            Lending.granary: {
                 "chain_id": self.chain_id,
                 "type": "lending",
                 "protocol_info": self.pool_info
@@ -244,7 +243,7 @@ class GranaryV1StateService(ProtocolServices):
         for token, value in reserves_info.items():
             atoken, debt_token = Web3.toChecksumAddress(value['tToken']), Web3.toChecksumAddress(value['dToken'])
             tokens += [atoken, debt_token]
-        key = f"getAllUserRewardsBalance_{wallet_address}_{block_number}".lower()
+        key = f"getAllUserRewardsBalance_{self.name}_{wallet_address}_{block_number}".lower()
         rpc_calls[key] = self.get_function_rewarder_info(
             "getAllUserRewardsBalance", [tokens, wallet_address], block_number)
 
@@ -253,7 +252,7 @@ class GranaryV1StateService(ProtocolServices):
     def calculate_all_rewards_balance(
             self, decoded_data: dict, wallet_address: str, block_number: int = "latest"):
 
-        key = f"getAllUserRewardsBalance_{wallet_address}_{block_number}".lower()
+        key = f"getAllUserRewardsBalance_{self.name}_{wallet_address}_{block_number}".lower()
         reward_token = decoded_data.get(key)[0][0]
         rewards = decoded_data.get(key)[-1][0] / 10 ** 18
         result = {

defi_services/services/lending/iron_bank_service.py

@@ -4,15 +4,14 @@ import time
 from web3 import Web3
 
 from defi_services.abis.lending.cream.cream_comptroller_abi import CREAM_COMPTROLLER_ABI
-from defi_services.abis.lending.cream.cream_lens_abi import CREAM_LENS_ABI
 from defi_services.abis.lending.iron_bank.iron_lens_abi import IRON_LENS_ABI
 from defi_services.abis.token.ctoken_abi import CTOKEN_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.query_constant import Query
 from defi_services.constants.token_constant import ContractAddresses, Token
-from defi_services.jobs.state_querier import StateQuerier
+from defi_services.jobs.queriers.state_querier import StateQuerier
 from defi_services.services.lending.lending_info.ethereum.iron_bank_eth import IRON_BANK_ETH
 from defi_services.services.protocol_services import ProtocolServices
 
@@ -27,7 +26,7 @@ class IronBankInfo:
 
 class IronBankStateService(ProtocolServices):
     def __init__(self, state_service: StateQuerier, chain_id: str = "0x1"):
-        self.name = f"{chain_id}_iron-bank"
+        self.name = f"{chain_id}_{Lending.iron_bank}"
         self.chain_id = chain_id
         self.iron_bank_info = IronBankInfo.mapping.get(chain_id)
         self.state_service = state_service
@@ -37,7 +36,7 @@ class IronBankStateService(ProtocolServices):
     # BASIC FUNCTIONS
     def get_service_info(self):
         info = {
-            "iron-bank": {
+            Lending.iron_bank: {
                 "chain_id": self.chain_id,
                 "type": "lending",
                 "protocol_info": self.iron_bank_info
@@ -107,7 +106,7 @@ class IronBankStateService(ProtocolServices):
             ))
 
         if Query.protocol_reward in query_types and wallet:
-            result.update(self.calculate_rewards_balance(
+            result.update(self.calculate_claimable_rewards_balance(
                 wallet, decoded_data, block_number
             ))
 
@@ -140,22 +139,30 @@ class IronBankStateService(ProtocolServices):
         #     rpc_calls.update(self.get_apy_lending_pool_function_info(reserves_info, block_number, is_oracle_price))
 
         if Query.protocol_reward in query_types and wallet:
-            rpc_calls.update(self.get_rewards_balance_function_info(wallet, reserves_info, block_number))
+            rpc_calls.update(self.get_claimable_rewards_balance_function_info(wallet, block_number))
 
         logger.info(f"Get encoded rpc calls in {time.time() - begin}s")
         return rpc_calls
 
     # REWARDS BALANCE
-    def get_rewards_balance_function_info(
+    def get_claimable_rewards_balance_function_info(
             self,
             wallet_address: str,
-            reserves_info: dict,
             block_number: int = "latest",
     ):
-        return {}
-
-    def calculate_rewards_balance(self, wallet_address: str, decoded_data: dict, block_number: int = "latest"):
-        return {}
+        rpc_call = self.get_comptroller_function_info("compAccrued", [wallet_address], block_number)
+        get_reward_id = f"compAccrued_{self.name}_{wallet_address}_{block_number}".lower()
+        return {get_reward_id: rpc_call}
+
+    def calculate_claimable_rewards_balance(self, wallet_address: str, decoded_data: dict,
+                                            block_number: int = "latest"):
+        get_reward_id = f"compAccrued_{self.name}_{wallet_address}_{block_number}".lower()
+        rewards = decoded_data.get(get_reward_id) / 10 ** 18
+        reward_token = self.iron_bank_info.get("rewardToken")
+        result = {
+            reward_token: {"amount": rewards}
+        }
+        return result
 
     # WALLET DEPOSIT BORROW BALANCE
     def get_wallet_deposit_borrow_balance_function_info(

defi_services/services/lending/lending_info/aave_v2_services.py

@@ -11,7 +11,7 @@ from defi_services.constants.db_constant import DBConst
 from defi_services.constants.query_constant import Query
 from defi_services.constants.time_constant import TimeConstants
 from defi_services.constants.token_constant import Token
-from defi_services.jobs.state_querier import StateQuerier
+from defi_services.jobs.queriers.state_querier import StateQuerier
 from defi_services.services.lending.lending_info.ethereum.aave_v2_eth import AAVE_V2_ETH
 from defi_services.services.lending.lending_info.polygon.aave_v2_polygon import AAVE_V2_POLYGON
 from defi_services.services.protocol_services import ProtocolServices
@@ -75,7 +75,7 @@ class AaveV2StateService(ProtocolServices):
         logger.info(f"Get token list related in {time.time()-begin}s")
         return tokens
 
-    def ≈(
+    def get_data(
             self,
             query_types: list,
             wallet: str,

defi_services/services/lending/lending_info/ethereum/morpho_aave_v2_eth.py

@@ -0,0 +1,53 @@
+MORPHO_AAVE_V2_ETH = {
+    "name": "Compound Lending Pool",
+    "rewardToken": "0x4da27a545c0c5b758a6ba100e3a049001de870f5",
+    "comptrollerAddress": "0x777777c9898d384f785ee44acfe945efdff5f3e0",
+    "lensAddress": "0x507fa343d0a90786d86c7cd885f5c49263a91ff4",
+    "poolToken": "0x9994e35db50125e0df82e4c2dde62496ce330999",
+    "type": "LENDING_POOL",
+    "forked": "morpho",
+    "reservesList": {
+        "0x6b175474e89094c44da98b954eedeac495271d0f": {
+            "tToken": "0x028171bca77440897b824ca71d1c56cac55b68a3",
+            "dToken": "0x6c3c78838c761c6ac7be9f59fe808ea2a6e4379d",
+            "sdToken": "0x778a13d3eeb110a4f7bb6529f99c000119a08e92",
+            "liquidationThreshold": 0.87
+        },
+        "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2": {
+            "tToken": "0x030ba81f1c18d280636f32af80b9aad02cf0854e",
+            "dToken": "0xf63b34710400cad3e044cffdcab00a0f32e33ecf",
+            "sdToken": "0x4e977830ba4bd783c0bb7f15d3e243f73ff57121",
+            "liquidationThreshold": 0.86
+        },
+        "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48": {
+            "tToken": "0xbcca60bb61934080951369a648fb03df4f96263c",
+            "dToken": "0x619beb58998ed2278e08620f97007e1116d5d25b",
+            "sdToken": "0xe4922afab0bbadd8ab2a88e0c79d884ad337fca6",
+            "liquidationThreshold": 0.875
+        },
+        "0xdac17f958d2ee523a2206206994597c13d831ec7": {
+            "tToken": "0x3ed3b47dd13ec9a98b44e6204a523e766b225811",
+            "dToken": "0x531842cebbdd378f8ee36d171d6cc9c4fcf475ec",
+            "sdToken": "0xe91d55ab2240594855abd11b3faae801fd4c4687",
+            "liquidationThreshold": 0.0
+        },
+        "0x2260fac5e5542a773aa44fbcfedf7c193bc2c599": {
+            "tToken": "0x9ff58f4ffb29fa2266ab25e75e2a8b3503311656",
+            "dToken": "0x9c39809dec7f95f5e0713634a4d0701329b3b4d2",
+            "sdToken": "0x51b039b9afe64b78758f8ef091211b5387ea717c",
+            "liquidationThreshold": 0.82
+        },
+        "0xae7ab96520de3a18e5e111b5eaab095312d7fe84": {
+            "tToken": "0x1982b2f5814301d4e9a8b0201555376e62f82428",
+            "dToken": "0xa9deac9f00dc4310c35603fcd9d34d1a750f81db",
+            "sdToken": "0x66457616dd8489df5d0afd8678f4a260088aaf55",
+            "liquidationThreshold": 0.83
+        },
+        "0xd533a949740bb3306d119cc777fa900ba034cd52": {
+            "tToken": "0x8dae6cb04688c62d939ed9b68d32bc62e49970b1",
+            "dToken": "0x00ad8ebf64f141f1c81e9f8f792d3d1631c6c684",
+            "sdToken": "0x9288059a74f589c919c7cf1db433251cdfeb874b",
+            "liquidationThreshold": 0.58
+        },
+    }
+}