defi-state-querier 0.4.2__tar.gz → 0.4.3__tar.gz

{defi-state-querier-0.4.2 → defi-state-querier-0.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: defi-state-querier
-Version: 0.4.2
+Version: 0.4.3
 Summary: Calculate apy, apr, and wallet information,... in decentralized applications.
 Home-page: https://github.com/Centic-io/defi-state-querier
 Author: Viet-Bang Pham

defi-state-querier-0.4.3/src/defi_services/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.4.3"

defi-state-querier-0.4.3/src/defi_services/constants/entities/vault_constant.py

@@ -0,0 +1,5 @@
+class Vault:
+    # service
+    trava_vault = "trava-vault"
+
+    all = [trava_vault]

defi-state-querier-0.4.3/src/defi_services/constants/entities/vault_services.py

@@ -0,0 +1,24 @@
+from defi_services.constants.chain_constant import Chain
+from defi_services.constants.entities.vault_constant import Vault
+from defi_services.services.vault.trava_vault_services import TravaVaultStateService
+
+
+class VaultServices:
+    # chain
+    bsc = {
+        Vault.trava_vault: TravaVaultStateService
+    }
+
+    ethereum = {
+        Vault.trava_vault: TravaVaultStateService
+    }
+
+    fantom = {
+        Vault.trava_vault: TravaVaultStateService
+    }
+
+    mapping = {
+        Chain.bsc: bsc,
+        Chain.ethereum: ethereum,
+        Chain.fantom: fantom
+    }

{defi-state-querier-0.4.2 → defi-state-querier-0.4.3}/src/defi_services/constants/query_constant.py

@@ -10,6 +10,7 @@ class Query:
     token_balance = 'token_balance'
     nft_balance = 'nft_balance'
     deposit_borrow = 'deposit_borrow'
+    staking_reward = 'staking_reward'
     protocol_reward = 'protocol_reward'
     protocol_apy = 'protocol_apy'
     health_factor = 'health_factor'

{defi-state-querier-0.4.2 → defi-state-querier-0.4.3}/src/defi_services/jobs/processors/state_processor.py

@@ -4,12 +4,13 @@ from web3 import Web3
 
 from defi_services.constants.chain_constant import Chain
 from defi_services.constants.entities.lending_services import LendingServices
+from defi_services.constants.entities.vault_services import VaultServices
 from defi_services.constants.query_constant import Query
 from defi_services.jobs.queriers.state_querier import StateQuerier
 from defi_services.services.nft_services import NFTServices
 from defi_services.services.protocol_services import ProtocolServices
 from defi_services.services.token_services import TokenServices
-from defi_services.utils.convert_address import base58_to_hex, convert_address_dict
+from defi_services.utils.convert_address import base58_to_hex
 from defi_services.utils.init_services import init_services
 
 logger = logging.getLogger("StateProcessor")
@@ -23,6 +24,7 @@ class StateProcessor:
         self.token_service = TokenServices(self.state_querier, chain_id)
         self.nft_service = NFTServices(self.state_querier, chain_id)
         self.lending_services = LendingServices.mapping.get(chain_id)
+        self.vault_services = VaultServices.mapping.get(chain_id, {})
 
     def get_service_info(self):
         info = self.nft_service.get_service_info()
@@ -104,7 +106,7 @@ class StateProcessor:
                 if Query.nft_balance == query_type:
                     data = self.nft_service.get_data(wallet, entity, entity_value, block_number)
 
-            elif entity in self.lending_services:
+            elif (entity in self.lending_services) or (entity in self.vault_services):
                 entity_service: ProtocolServices = self.services.get(entity)
                 data = entity_service.get_data(
                     [query_type], wallet, entity_value, block_number, **kwargs)

{defi-state-querier-0.4.2 → defi-state-querier-0.4.3}/src/defi_services/services/lending/aave_v2_services.py

@@ -438,7 +438,7 @@ class AaveV2StateService(ProtocolServices):
         return rpc_calls
 
     def calculate_rewards_balance(
-            self, decoded_data: dict, wallet: str, block_number: int = "latest"):
+            self, wallet: str, reserves_info: dict, decoded_data: dict, block_number: int = "latest"):
         reward_token = self.pool_info['rewardToken']
         key = f"getRewardsBalance_{self.name}_{wallet}_{block_number}".lower()
         rewards = decoded_data.get(key) / 10 ** 18

{defi-state-querier-0.4.2 → defi-state-querier-0.4.3}/src/defi_services/services/lending/aave_v3_services.py

@@ -299,7 +299,7 @@ class AaveV3StateService(AaveV2StateService):
         return rpc_calls
 
     def calculate_rewards_balance(
-            self, decoded_data: dict, wallet: str, block_number: int = "latest"):
+            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))

{defi-state-querier-0.4.2 → defi-state-querier-0.4.3}/src/defi_services/services/lending/apeswap_services.py

@@ -116,7 +116,7 @@ class ApeSwapStateService(CompoundStateService):
         return {}
 
     def calculate_rewards_balance(
-            self, decoded_data: dict, wallet: str, block_number: int = "latest"):
+            self, wallet: str, reserves_info: dict, decoded_data: dict, block_number: int = "latest"):
         return {}
 
     def get_ctoken_function_info(self, ctoken: str, fn_name: str, fn_paras: list = None, block_number: int = "latest"):

{defi-state-querier-0.4.2 → defi-state-querier-0.4.3}/src/defi_services/services/lending/compound_service.py

@@ -282,7 +282,7 @@ class CompoundStateService(ProtocolServices):
         get_reward_id = f"getCompBalanceMetadataExt_{self.name}_{wallet}_{block_number}".lower()
         return {get_reward_id: rpc_call}
 
-    def calculate_rewards_balance(self, decoded_data: dict, wallet: str, block_number: int = "latest"):
+    def calculate_rewards_balance(self, wallet: str, reserves_info: dict, decoded_data: dict, block_number: int = "latest"):
         get_reward_id = f"getCompBalanceMetadataExt_{self.name}_{wallet}_{block_number}".lower()
         rewards = decoded_data.get(get_reward_id)[-1] / 10 ** 18
         reward_token = self.pool_info.get("rewardToken")

{defi-state-querier-0.4.2 → defi-state-querier-0.4.3}/src/defi_services/services/lending/compound_v3_services.py

@@ -258,10 +258,7 @@ class CompoundV3StateService(CompoundStateService):
         return result
 
     def calculate_rewards_balance(
-            self,
-            decoded_data: dict,
-            wallet: str,
-            block_number: int = "latest"):
+            self, wallet: str, reserves_info: dict, decoded_data: dict, block_number: int = "latest"):
         reward_amount = 0
         reward_address = self.pool_info.get("rewardAddress")
         for token, value in self.pool_info.get("reservesList").items():

{defi-state-querier-0.4.2 → defi-state-querier-0.4.3}/src/defi_services/services/lending/flux_services.py

@@ -89,10 +89,7 @@ class FluxStateService(CompoundStateService):
         return {get_reward_id: rpc_call}
 
     def calculate_rewards_balance(
-            self,
-            decoded_data: dict,
-            wallet: str,
-            block_number: int = "latest"):
+            self, wallet: str, reserves_info: dict, decoded_data: dict, block_number: int = "latest"):
         get_reward_id = f"compAccrued_{self.name}_{wallet}_{block_number}".lower()
         rewards = decoded_data.get(get_reward_id) / 10 ** 18
         reward_token = self.pool_info.get("rewardToken")

{defi-state-querier-0.4.2 → defi-state-querier-0.4.3}/src/defi_services/services/lending/granary_services.py

@@ -331,10 +331,7 @@ class GranaryStateService(ProtocolServices):
         return rpc_calls
 
     def calculate_rewards_balance(
-            self,
-            decoded_data: dict,
-            wallet: str,
-            block_number: int = "latest"):
+            self, wallet: str, reserves_info: dict, decoded_data: dict, block_number: int = "latest"):
         reward_tokens = self.pool_info.get("rewardToken")
         if not reward_tokens:
             return {}

{defi-state-querier-0.4.2 → defi-state-querier-0.4.3}/src/defi_services/services/lending/iron_bank_service.py

@@ -153,10 +153,7 @@ class IronBankStateService(CompoundStateService):
         return {get_reward_id: rpc_call}
 
     def calculate_rewards_balance(
-            self,
-            decoded_data: dict,
-            wallet: str,
-            block_number: int = "latest"):
+            self, wallet: str, reserves_info: dict, decoded_data: dict, block_number: int = "latest"):
         if self.chain_id in [Chain.optimism, Chain.avalanche]:
             return {}
         get_reward_id = f"compAccrued_{self.name}_{wallet}_{block_number}".lower()

{defi-state-querier-0.4.2 → defi-state-querier-0.4.3}/src/defi_services/services/lending/justlend_service.py

@@ -92,17 +92,17 @@ class JustLendStateService(CompoundStateService):
     # REWARDS BALANCE
     def get_rewards_balance_function_info(
             self,
-            wallets: str,
+            wallet: str,
             reserves_info: dict = None,
             block_number: int = "latest",
     ):
-        rpc_call = self.get_comptroller_function_info("compAccrued", [wallets])
-        get_reward_id = f"compAccrued_{self.name}_{wallets}_{block_number}".lower()
+        rpc_call = self.get_comptroller_function_info("compAccrued", [wallet])
+        get_reward_id = f"compAccrued_{self.name}_{wallet}_{block_number}".lower()
         return {get_reward_id: rpc_call}
 
-    def calculate_rewards_balance(self, decoded_data: dict, wallets: str,
-                                  block_number: int = "latest"):
-        get_reward_id = f"compAccrued_{self.name}_{wallets}_{block_number}".lower()
+    def calculate_rewards_balance(
+            self, wallet: str, reserves_info: dict, decoded_data: dict, block_number: int = "latest"):
+        get_reward_id = f"compAccrued_{self.name}_{wallet}_{block_number}".lower()
         rewards = decoded_data.get(get_reward_id) / 10 ** 18
         reward_token = self.pool_info.get("rewardToken")
         result = {

defi-state-querier-0.4.3/src/defi_services/services/lending/lending_info/bsc/liqee_bsc.py

@@ -0,0 +1,157 @@
+LIQEE_BSC = {
+  "comptrollerAddress": "",
+  "controllerAddress": "0x0b53e608bd058bb54748c35148484fd627e6dc0a",
+  "forked": "compound",
+  "lendingDataAddress": "0xeb92b72272e66be56b74392519cf81e150bfae0e",
+  "lensAddress": "",
+  "name": "Liqee Lending Pool",
+  "poolToken": "0x4a9a2b2b04549c3927dd2c9668a5ef3fca473623",
+  "reservesList": {
+    "0xe9e7cea3dedca5984780bafc599bd69add087d56": {
+      "cToken": "0x5511b64ae77452c7130670c79298dec978204a47",
+      "exchangeRate": 1.0727907490506678,
+      "liquidationThreshold": 0.75,
+      "loanToValue": 0.75
+    },
+    "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d": {
+      "cToken": "0xaf9c10b341f55465e8785f0f81dbb52a9bfe005d",
+      "exchangeRate": 1.0915276103263118,
+      "liquidationThreshold": 0.85,
+      "loanToValue": 0.85
+    },
+    "0x55d398326f99059ff775485246999027b3197955": {
+      "cToken": "0x0bf8c72d618b5d46b055165e21d661400008fa0f",
+      "exchangeRate": 1.107541263208309,
+      "liquidationThreshold": 0.85,
+      "loanToValue": 0.85
+    },
+    "0x1af3f329e8be154074d8769d1ffa4ee058b1dbc3": {
+      "cToken": "0xad5ec11426970c32da48f58c92b1039bc50e5492",
+      "exchangeRate": 1.090369296984632,
+      "liquidationThreshold": 0.85,
+      "loanToValue": 0.85
+    },
+    "0x4a9a2b2b04549c3927dd2c9668a5ef3fca473623": {
+      "cToken": "0xec3fd540a2dee6f479be539d64da593a59e12d08",
+      "exchangeRate": 1.023706366745555,
+      "liquidationThreshold": 0.6,
+      "loanToValue": 0.6
+    },
+    "0xa05478b34fad86cc86f07eb6698c69ea60b266e3": {
+      "cToken": "0xc35acaeedb814f42b2214378d8950f8555b2d670",
+      "exchangeRate": 1,
+      "liquidationThreshold": 0.8,
+      "loanToValue": 0.8
+    },
+    "0x7130d2a12b9bcbfae4f2634d864a1ee1ce3ead9c": {
+      "cToken": "0x0b66a250dadf3237ddb38d485082a7bfe400356e",
+      "exchangeRate": 1.0008955018668733,
+      "liquidationThreshold": 0.8,
+      "loanToValue": 0.8
+    },
+    "0x2170ed0880ac9a755fd29b2688956bd959f933f8": {
+      "cToken": "0x390bf37355e9df6ea2e16eed5686886da6f47669",
+      "exchangeRate": 1.0180063558704127,
+      "liquidationThreshold": 0.8,
+      "loanToValue": 0.8
+    },
+    "0xbf5140a22578168fd562dccf235e5d43a02ce9b1": {
+      "cToken": "0xee9099c1318cf960651b3196747640eb84b8806b",
+      "exchangeRate": 1.0014743731623101,
+      "liquidationThreshold": 0.7,
+      "loanToValue": 0.7
+    },
+    "0x0eb3a705fc54725037cc9e008bdede697f62f335": {
+      "cToken": "0x55012ad2f0a50195aef44f403536df2465009ef7",
+      "exchangeRate": 1.0253052659477702,
+      "liquidationThreshold": 0.7,
+      "loanToValue": 0.7
+    },
+    "0x7083609fce4d1d8dc0c979aab8c869ea2c873402": {
+      "cToken": "0x9ab060ba568b86848bf19577226184db6192725b",
+      "exchangeRate": 1.0615419244367703,
+      "liquidationThreshold": 0.7,
+      "loanToValue": 0.7
+    },
+    "0x0d8ce2a99bb6e3b7db580ed848240e4a0f9ae153": {
+      "cToken": "0xd739a569ec254d6a20ecf029f024816be58fb810",
+      "exchangeRate": 1.0066415558494175,
+      "liquidationThreshold": 0.7,
+      "loanToValue": 0.7
+    },
+    "0x3ee2200efb3400fabb9aacf31297cbdd1d435d47": {
+      "cToken": "0xfc5bb1e8c29b100ef8f12773f972477bcab68862",
+      "exchangeRate": 1.0138756837775817,
+      "liquidationThreshold": 0.7,
+      "loanToValue": 0.7
+    },
+    "0x0000000000000000000000000000000000000000": {
+      "cToken": "0xd57e1425837567f74a35d07669b23bfb67aa4a93",
+      "exchangeRate": 1.1026774278138651,
+      "liquidationThreshold": 0.8,
+      "loanToValue": 0.8
+    },
+    "0xb5102cee1528ce2c760893034a4603663495fd72": {
+      "cToken": "0x36f4c36d1f6e8418ecb2402f896b2a8fedde0991",
+      "exchangeRate": 1,
+      "liquidationThreshold": 0.7,
+      "loanToValue": 0.7
+    },
+    "0x367c17d19fcd0f7746764455497d63c8e8b2bba3": {
+      "cToken": "0xb22ef996c0a2d262a19db2a66a256067f51511eb",
+      "exchangeRate": 1,
+      "liquidationThreshold": 0.7,
+      "loanToValue": 0.7
+    },
+    "0x20ecc92f0a33e16e8cf0417dfc3f586cf597f3a9": {
+      "cToken": "0x6e42423e1bcb6a093a58e203b5eb6e8a8023b4e5",
+      "exchangeRate": 1,
+      "liquidationThreshold": 0.7,
+      "loanToValue": 0.7
+    },
+    "0x463e3d1e01d048fdf872710f7f3745b5cdf50d0e": {
+      "cToken": "0x6ac0a0b3959c1e5fcbd09b59b09abf7c53c72346",
+      "exchangeRate": 1,
+      "liquidationThreshold": 0.7,
+      "loanToValue": 0.7
+    },
+    "0x1d2f0da169ceb9fc7b3144628db156f3f6c60dbe": {
+      "cToken": "0x6d64effe3af8697336fc57efd5a7517ad526dd6d",
+      "exchangeRate": 1.0095313806387172,
+      "liquidationThreshold": 0.7,
+      "loanToValue": 0.7
+    },
+    "0x4338665cbb7b2485a8855a139b75d5e34ab0db94": {
+      "cToken": "0xd957bea67aadb8a72061ce94d033c631d1c1e6ac",
+      "exchangeRate": 1.009766921268889,
+      "liquidationThreshold": 0.7,
+      "loanToValue": 0.7
+    },
+    "0xf8a0bf9cf54bb92f17374d9e9a321e6a111a51bd": {
+      "cToken": "0x50e894894809f642de1e11b4076451734c963087",
+      "exchangeRate": 1.0113349577900335,
+      "liquidationThreshold": 0.7,
+      "loanToValue": 0.7
+    },
+    "0x0e09fabb73bd3ade0a17ecc321fd13a19e81ce82": {
+      "cToken": "0xefae8f7af4bada590d4e707d900258fc72194d73",
+      "exchangeRate": 1.3218997732331732,
+      "liquidationThreshold": 0.7,
+      "loanToValue": 0.7
+    },
+    "0x8ff795a6f4d97e7887c79bea79aba5cc76444adf": {
+      "cToken": "0x9747e26c5ad01d3594ea49ccf00790f564193c15",
+      "exchangeRate": 1.086362444236688,
+      "liquidationThreshold": 0.7,
+      "loanToValue": 0.7
+    },
+    "0x16939ef78684453bfdfb47825f8a5f714f12623a": {
+      "cToken": "0x8be8cd81737b282c909f1911f3f0ade630c335aa",
+      "exchangeRate": 1.0046816669180731,
+      "liquidationThreshold": 0.7,
+      "loanToValue": 0.7
+    }
+  },
+  "rewardToken": "0x4a9a2b2b04549c3927dd2c9668a5ef3fca473623",
+  "type": "LENDING_POOL"
+}

defi-state-querier-0.4.3/src/defi_services/services/lending/lending_info/ethereum/liqee_eth.py

@@ -0,0 +1,163 @@
+LIQEE_ETH = {
+  "comptrollerAddress": "",
+  "controllerAddress": "0x8b53ab2c0df3230ea327017c91eb909f815ad113",
+  "forked": "compound",
+  "lendingDataAddress": "0x4b30c26d61be2f76bc7d9f2c5edbacba84982358",
+  "lensAddress": "",
+  "name": "Liqee Lending Pool",
+  "poolToken": "0x431ad2ff6a9c365805ebad47ee021148d6f7dbe0",
+  "reservesList": {
+    "0x2260fac5e5542a773aa44fbcfedf7c193bc2c599": {
+      "cToken": "0x5812fcf91adc502a765e5707ebb3f36a07f63c02",
+      "exchangeRate": 1.000012067974307,
+      "liquidationThreshold": 0.8,
+      "loanToValue": 0.8
+    },
+    "0x0000000000000000000000000000000000000000": {
+      "cToken": "0x5acd75f21659a59ffab9aebaf350351a8bfaabc0",
+      "exchangeRate": 1.0092559004684867,
+      "liquidationThreshold": 0.85,
+      "loanToValue": 0.85
+    },
+    "0xdac17f958d2ee523a2206206994597c13d831ec7": {
+      "cToken": "0x1180c114f7fadcb6957670432a3cf8ef08ab5354",
+      "exchangeRate": 1.0653006831932572,
+      "liquidationThreshold": 0.85,
+      "loanToValue": 0.85
+    },
+    "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48": {
+      "cToken": "0x2f956b2f801c6dad74e87e7f45c94f6283bf0f45",
+      "exchangeRate": 1.0618162566733447,
+      "liquidationThreshold": 0.85,
+      "loanToValue": 0.85
+    },
+    "0x6b175474e89094c44da98b954eedeac495271d0f": {
+      "cToken": "0x298f243ad592b6027d4717fbe9decda668e3c3a8",
+      "exchangeRate": 1.0671526314936417,
+      "liquidationThreshold": 0.85,
+      "loanToValue": 0.85
+    },
+    "0x4fabb145d64652a948d72533023f6e7a623c7c53": {
+      "cToken": "0x24677e213dec0ea53a430404cf4a11a6dc889fce",
+      "exchangeRate": 1.000000000000008,
+      "liquidationThreshold": 0.75,
+      "loanToValue": 0.75
+    },
+    "0x0316eb71485b0ab14103307bf65a021042c6d380": {
+      "cToken": "0x47566acd7af49d2a192132314826ed3c3c5f3698",
+      "exchangeRate": 1,
+      "liquidationThreshold": 0.8,
+      "loanToValue": 0.8
+    },
+    "0x431ad2ff6a9c365805ebad47ee021148d6f7dbe0": {
+      "cToken": "0xb3dc7425e63e1855eb41107134d471dd34d7b239",
+      "exchangeRate": 1.0001004296452365,
+      "liquidationThreshold": 0.6,
+      "loanToValue": 0.6
+    },
+    "0x355c665e101b9da58704a8fddb5feef210ef20c0": {
+      "cToken": "0x164315ea59169d46359baa4bcc6479bb421764b6",
+      "exchangeRate": 1,
+      "liquidationThreshold": 0.8,
+      "loanToValue": 0.8
+    },
+    "0x1f9840a85d5af5bf1d1762f925bdaddc4201f984": {
+      "cToken": "0xbec9a824d6da8d0f923fd9fbec4faa949d396320",
+      "exchangeRate": 1,
+      "liquidationThreshold": 0.7,
+      "loanToValue": 0.7
+    },
+    "0x0a5e677a6a24b2f1a2bf4f3bffc443231d2fdec8": {
+      "cToken": "0xd1254d280e7504836e1b0e36535ebff248483cee",
+      "exchangeRate": 1,
+      "liquidationThreshold": 0.7,
+      "loanToValue": 0.7
+    },
+    "0xb986f3a2d91d3704dc974a24fb735dcc5e3c1e70": {
+      "cToken": "0x591595bfae3f5d51a820ecd20a1e3fbb6638f34b",
+      "exchangeRate": 1,
+      "liquidationThreshold": 0.7,
+      "loanToValue": 0.7
+    },
+    "0x527ec46ac094b399265d1d71eff7b31700aa655d": {
+      "cToken": "0xfa2e831c674b61475c175b2206e81a5938b298dd",
+      "exchangeRate": 1,
+      "liquidationThreshold": 0.7,
+      "loanToValue": 0.7
+    },
+    "0x8d2cb35893c01fa8b564c84bd540c5109d9d278e": {
+      "cToken": "0x028db7a9d133301bd49f27b5e41f83f56ab0faa6",
+      "exchangeRate": 1,
+      "liquidationThreshold": 0.7,
+      "loanToValue": 0.7
+    },
+    "0x514910771af9ca656af840dff83e8264ecf986ca": {
+      "cToken": "0xa3068aa78611ed29d381e640bb2c02abcf3ca7de",
+      "exchangeRate": 1,
+      "liquidationThreshold": 0.7,
+      "loanToValue": 0.7
+    },
+    "0x9f8f72aa9304c8b593d555f12ef6589cc3a579a2": {
+      "cToken": "0x039e7ef6a674f3ec1d88829b8215ed45385c24bc",
+      "exchangeRate": 1,
+      "liquidationThreshold": 0.7,
+      "loanToValue": 0.7
+    },
+    "0x0000000000085d4780b73119b644ae5ecd22b376": {
+      "cToken": "0x6e6a689a5964083dff9fd7a0f788baf620ea2dbe",
+      "exchangeRate": 1,
+      "liquidationThreshold": 0,
+      "loanToValue": 0
+    },
+    "0x7f39c581f595b53c5cb19bd0b3f8da6c935e2ca0": {
+      "cToken": "0xbfd291da8a403daaf7e5e9dc1ec0aceacd4848b9",
+      "exchangeRate": 1,
+      "liquidationThreshold": 0.825,
+      "loanToValue": 0.825
+    },
+    "0x853d955acef822db058eb8505911ed77f175b99e": {
+      "cToken": "0x71173e3c6999c2c72ccf363f4ae7b67bcc7e8f63",
+      "exchangeRate": 1.000056097645922,
+      "liquidationThreshold": 0,
+      "loanToValue": 0
+    },
+    "0x956f47f50a910163d8bf957cf5846d573e7f87ca": {
+      "cToken": "0x47c19a2ab52da26551a22e2b2aeed5d19ef4022f",
+      "exchangeRate": 1,
+      "liquidationThreshold": 0,
+      "loanToValue": 0
+    },
+    "0x7fc66500c84a76ad7e9c93437bfc5ac33e2ddae9": {
+      "cToken": "0x3e5cb932d7a1c0ca096b71cc486b2ad7e0dc3d0e",
+      "exchangeRate": 1,
+      "liquidationThreshold": 0.7,
+      "loanToValue": 0.7
+    },
+    "0xd533a949740bb3306d119cc777fa900ba034cd52": {
+      "cToken": "0xe39672dfa87c824bcb3b38aa480ef684687cbc09",
+      "exchangeRate": 1,
+      "liquidationThreshold": 0.65,
+      "loanToValue": 0.65
+    },
+    "0xd5147bc8e386d91cc5dbe72099dac6c9b99276f5": {
+      "cToken": "0x59055220e00da46c891283ea1d79363c769158b9",
+      "exchangeRate": 1,
+      "liquidationThreshold": 0,
+      "loanToValue": 0
+    },
+    "0x83f20f44975d03b1b09e64809b757c47f942beea": {
+      "cToken": "0x5f02fb5f1203a502c701a12fd409548993f795ba",
+      "exchangeRate": 1,
+      "liquidationThreshold": 0.85,
+      "loanToValue": 0.85
+    },
+    "0xae78736cd615f374d3085123a210448e74fc6393": {
+      "cToken": "0x33b5edc15e05d3dac27fccad77cf550c5f3f02aa",
+      "exchangeRate": 1,
+      "liquidationThreshold": 0.7,
+      "loanToValue": 0.7
+    }
+  },
+  "rewardToken": "0x431ad2ff6a9c365805ebad47ee021148d6f7dbe0",
+  "type": "LENDING_POOL"
+}

{defi-state-querier-0.4.2 → defi-state-querier-0.4.3}/src/defi_services/services/lending/liqee_service.py

@@ -187,7 +187,7 @@ class LiqeeStateService(CompoundStateService):
         get_reward_id = f"getAccountRewardAmount_{self.name}_{wallet}_{block_number}".lower()
         return {get_reward_id: rpc_call}
 
-    def calculate_rewards_balance(self, decoded_data: dict, wallet: str,  block_number: int = "latest"):
+    def calculate_rewards_balance(self, wallet: str, reserves_info: dict, decoded_data: dict, block_number: int = "latest"):
         get_reward_id = f"getAccountRewardAmount_{self.name}_{wallet}_{block_number}".lower()
         rewards = decoded_data.get(get_reward_id) / 10 ** 18
         reward_token = self.pool_info.get("rewardToken")

{defi-state-querier-0.4.2 → defi-state-querier-0.4.3}/src/defi_services/services/lending/morpho_aave_v2_services.py

@@ -180,7 +180,7 @@ class MorphoAaveV2StateService(MorphoCompoundStateService):
     ):
         return {}
 
-    def calculate_rewards_balance(self, decoded_data: dict, wallet: str, block_number: int = "latest"):
+    def calculate_rewards_balance(self, wallet: str, reserves_info: dict, decoded_data: dict, block_number: int = "latest"):
         return {}
 
     def get_function_lending_pool_info(self, fn_name: str, fn_paras=None, block_number: int = 'latest'):

{defi-state-querier-0.4.2 → defi-state-querier-0.4.3}/src/defi_services/services/lending/morpho_aave_v3_services.py

@@ -111,10 +111,7 @@ class MorphoAaveV3StateService(MorphoCompoundStateService):
         return {}
 
     def calculate_rewards_balance(
-            self,
-            decoded_data: dict,
-            wallet: str,
-            block_number: int = "latest"):
+            self, wallet: str, reserves_info: dict, decoded_data: dict, block_number: int = "latest"):
         return {}
 
     # WALLET DEPOSIT BORROW BALANCE

{defi-state-querier-0.4.2 → defi-state-querier-0.4.3}/src/defi_services/services/lending/morpho_compound_services.py

@@ -204,11 +204,7 @@ class MorphoCompoundStateService(ProtocolServices):
         return {get_reward_id: rpc_call}
 
     def calculate_rewards_balance(
-            self,
-            decoded_data: dict,
-            wallet: str,
-            block_number: int = "latest"
-    ):
+            self, wallet: str, reserves_info: dict, decoded_data: dict, block_number: int = "latest"):
         get_reward_id = f"getUserUnclaimedRewards_{self.name}_{wallet}_{block_number}".lower()
         rewards = decoded_data.get(get_reward_id) / 10 ** 18
         reward_token = self.pool_info.get("rewardToken")

{defi-state-querier-0.4.2 → defi-state-querier-0.4.3}/src/defi_services/services/lending/onyx_service.py

@@ -161,10 +161,7 @@ class OnyxStateService(CompoundStateService):
         return {get_reward_id: rpc_call}
 
     def calculate_rewards_balance(
-            self,
-            decoded_data: dict,
-            wallet: str,
-            block_number: int = "latest"):
+            self, wallet: str, reserves_info: dict, decoded_data: dict, block_number: int = "latest"):
         get_reward_id = f"xcnAccrued_{self.name}_{wallet}_{block_number}".lower()
         rewards = decoded_data.get(get_reward_id) / 10 ** 18
         reward_token = self.pool_info.get("rewardToken")

{defi-state-querier-0.4.2 → defi-state-querier-0.4.3}/src/defi_services/services/lending/radiant_v2_services.py

@@ -72,10 +72,7 @@ class RadiantStateService(ValasStateService):
         return rpc_calls
 
     def calculate_rewards_balance(
-            self,
-            decoded_data: dict,
-            wallet: str,
-            block_number: int = "latest"):
+            self, wallet: str, reserves_info: dict, decoded_data: dict, block_number: int = "latest"):
         reward_token = self.pool_info['rewardToken']
         key = f"allPendingRewards_{self.name}_{wallet}_{block_number}".lower()
         rewards = decoded_data.get(key) / 10 ** 18

{defi-state-querier-0.4.2 → defi-state-querier-0.4.3}/src/defi_services/services/lending/silo_services.py

@@ -240,7 +240,7 @@ class SiloStateService(ProtocolServices):
         decimals_id = f"decimals_{self.name}_{reward_token}_{block_number}".lower()
         return {get_reward_id: rpc_call, decimals_id: decimals_call}
 
-    def calculate_rewards_balance(self, decoded_data: dict, wallet: str, block_number: int = "latest"):
+    def calculate_rewards_balance(self, wallet: str, reserves_info: dict, decoded_data: dict, block_number: int = "latest"):
         reward_token = self.pool_info.get("rewardToken")
         get_reward_id = f"getUserUnclaimedRewards_{self.name}_{wallet}_{block_number}".lower()
         decimals_id = f"decimals_{self.name}_{reward_token}_{block_number}".lower()

{defi-state-querier-0.4.2 → defi-state-querier-0.4.3}/src/defi_services/services/lending/strike_service.py

@@ -123,7 +123,7 @@ class StrikeStateService(CompoundStateService):
         return {get_reward_id: rpc_call}
 
     def calculate_rewards_balance(
-            self, decoded_data: dict, wallet: str, block_number: int = "latest"):
+            self, wallet: str, reserves_info: dict, decoded_data: dict, block_number: int = "latest"):
         get_reward_id = f"strikeAccrued_{self.name}_{wallet}_{block_number}".lower()
         rewards = decoded_data.get(get_reward_id) / 10 ** 18
         reward_token = self.pool_info.get("rewardToken")

{defi-state-querier-0.4.2 → defi-state-querier-0.4.3}/src/defi_services/services/lending/trava_services.py

@@ -388,7 +388,7 @@ class TravaStateService(ProtocolServices):
     # REWARDS BALANCE
     def get_rewards_balance_function_info(
             self,
-            wallet_address,
+            wallet,
             reserves_info: dict = None,
             block_number: int = "latest"
     ):
@@ -397,16 +397,16 @@ class TravaStateService(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"getRewardsBalance_{self.name}_{wallet_address}_{block_number}".lower()
+        key = f"getRewardsBalance_{self.name}_{wallet}_{block_number}".lower()
         rpc_calls[key] = self.get_function_incentive_info(
-            "getRewardsBalance", [tokens, wallet_address], block_number)
+            "getRewardsBalance", [tokens, wallet], block_number)
 
         return rpc_calls
 
     def calculate_rewards_balance(
-            self, decoded_data: dict, wallet_address: str, block_number: int = "latest"):
+            self, wallet: str, reserves_info: dict, decoded_data: dict, block_number: int = "latest"):
         reward_token = self.pool_info['rewardToken']
-        key = f"getRewardsBalance_{self.name}_{wallet_address}_{block_number}".lower()
+        key = f"getRewardsBalance_{self.name}_{wallet}_{block_number}".lower()
         rewards = decoded_data.get(key) / 10 ** 18
         result = {
             reward_token: {"amount": rewards}