defi-state-querier 0.3.1__tar.gz → 0.3.4__tar.gz

{defi-state-querier-0.3.1 → defi-state-querier-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: defi-state-querier
-Version: 0.3.1
+Version: 0.3.4
 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.3.4/src/defi_services/__init__.py

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

{defi-state-querier-0.3.1 → defi-state-querier-0.3.4}/src/defi_services/constants/entities/lending_services.py

@@ -78,7 +78,8 @@ class LendingServices:
     polygon = {
         Lending.aave_v2: AaveV2StateService,
         Lending.aave_v3: AaveV3StateService,
-        Lending.wepiggy: WepiggyStateService
+        Lending.wepiggy: WepiggyStateService,
+        Lending.compound_v3: CompoundV3StateService
     }
 
     optimism = {
@@ -93,7 +94,8 @@ class LendingServices:
         Lending.aave_v3: AaveV3StateService,
         Lending.wepiggy: WepiggyStateService,
         Lending.granary: GranaryStateService,
-        Lending.silo: SiloStateService
+        Lending.silo: SiloStateService,
+        Lending.compound_v3: CompoundV3StateService
     }
 
     tron = {

{defi-state-querier-0.3.1 → defi-state-querier-0.3.4}/src/defi_services/services/lending/compound_v3_services.py

@@ -8,12 +8,16 @@ from defi_services.constants.time_constant import TimeConstants
 from defi_services.constants.token_constant import Token
 from defi_services.jobs.queriers.state_querier import StateQuerier
 from defi_services.services.lending.compound_service import CompoundStateService
+from defi_services.services.lending.lending_info.arbitrum.compound_v3_arbitrum import COMPOUND_V3_ARBITRUM
 from defi_services.services.lending.lending_info.ethereum.compound_v3_eth import COMPOUND_V3_ETH
+from defi_services.services.lending.lending_info.polygon.compound_v3_polygon import COMPOUND_V3_POLYGON
 
 
 class CompoundV3Info:
     mapping = {
-        Chain.ethereum: COMPOUND_V3_ETH
+        Chain.ethereum: COMPOUND_V3_ETH,
+        Chain.polygon: COMPOUND_V3_POLYGON,
+        Chain.arbitrum: COMPOUND_V3_ARBITRUM
     }
 
 

defi-state-querier-0.3.4/src/defi_services/services/lending/lending_info/arbitrum/compound_v3_arbitrum.py

@@ -0,0 +1,61 @@
+COMPOUND_V3_ARBITRUM = {
+    "name": "Compound V3 Lending Pool",
+    "rewardToken": "0x354a6da3fcde098f8389cad84b0182725c6c91de",
+    "rewardAddress": "0x88730d254a2f7e6ac8388c3198afd694ba9f7fae",
+    "factoryAddress": "0xe2aa5194e45b043afdd6e98f467c0b1c13484ae9",
+    "poolToken": "0x354a6da3fcde098f8389cad84b0182725c6c91de",
+    "type": "LENDING_POOL",
+    "forked": "compound-v3",
+    "reservesList": {
+        "0xff970a61a04b1ca14834a43f5de4533ebddb5cc8": {
+            "comet": "0xa5edbdd9646f8dff606d7448e414884c7d905dca",
+            "assets": {
+                "0x912ce59144191c1204e64559fe8253a0e49e6548": {
+                    "priceFeed": "0xb2a824043730fe05f3da2efafa1cbbe83fa548d6",
+                    "loanToValue": 0.55,
+                    "liquidationThreshold": 0.6
+                },
+                "0xfc5a1a6eb076a2c7ad06ed22c90d7e710e35ad0a": {
+                    "priceFeed": "0xdb98056fecfff59d032ab628337a4887110df3db",
+                    "loanToValue": 0.4,
+                    "liquidationThreshold": 0.45
+                },
+                "0x82af49447d8a07e3bd95bd0d56f35241523fbab1": {
+                    "priceFeed": "0x639fe6ab55c921f74e7fac1ee960c0b6293ba612",
+                    "loanToValue": 0.78,
+                    "liquidationThreshold": 0.85
+                },
+                "0x2f2a2543b76a4166549f7aab2e75bef0aefc5b0f": {
+                    "priceFeed": "0xd0c7101eacbb49f3decccc166d238410d6d46d57",
+                    "loanToValue": 0.7,
+                    "liquidationThreshold": 0.77
+                }
+            }
+        },
+        "0xaf88d065e77c8cc2239327c5edb3a432268e5831": {
+            "comet": "0x9c4ec768c28520b50860ea7a15bd7213a9ff58bf",
+            "assets": {
+                "0x912ce59144191c1204e64559fe8253a0e49e6548": {
+                    "priceFeed": "0xb2a824043730fe05f3da2efafa1cbbe83fa548d6",
+                    "loanToValue": 0.55,
+                    "liquidationThreshold": 0.6
+                },
+                "0xfc5a1a6eb076a2c7ad06ed22c90d7e710e35ad0a": {
+                    "priceFeed": "0xdb98056fecfff59d032ab628337a4887110df3db",
+                    "loanToValue": 0.4,
+                    "liquidationThreshold": 0.45
+                },
+                "0x82af49447d8a07e3bd95bd0d56f35241523fbab1": {
+                    "priceFeed": "0x639fe6ab55c921f74e7fac1ee960c0b6293ba612",
+                    "loanToValue": 0.78,
+                    "liquidationThreshold": 0.85
+                },
+                "0x2f2a2543b76a4166549f7aab2e75bef0aefc5b0f": {
+                    "priceFeed": "0xd0c7101eacbb49f3decccc166d238410d6d46d57",
+                    "loanToValue": 0.7,
+                    "liquidationThreshold": 0.77
+                }
+            }
+        }
+    }
+}

defi-state-querier-0.3.4/src/defi_services/services/lending/lending_info/polygon/compound_v3_polygon.py

@@ -0,0 +1,41 @@
+COMPOUND_V3_POLYGON = {
+    "name": "Compound V3 Lending Pool",
+    "rewardToken": "0x8505b9d2254a7ae468c0e9dd10ccea3a837aef5c",
+    "rewardAddress": "0x45939657d1ca34a8fa39a924b71d28fe8431e581",
+    "factoryAddress": "0x2f9e3953b2ef89fa265f2a32ed9f80d00229125b",
+    "poolToken": "0x8505b9d2254a7ae468c0e9dd10ccea3a837aef5c",
+    "type": "LENDING_POOL",
+    "forked": "compound-v3",
+    "reservesList": {
+        "0x2791bca1f2de4661ed88a30c99a7a9449aa84174": {
+            "comet": "0xf25212e676d1f7f89cd72ffee66158f541246445",
+            "assets": {
+                "0x7ceb23fd6bc0add59e62ac25578270cff1b9f619": {
+                    "priceFeed": "0xf9680d99d6c9589e2a93a78a04a279e509205945",
+                    "loanToValue": 0.775,
+                    "liquidationThreshold": 0.825
+                },
+                "0x1bfd67037b42cf73acf2047067bd4f2c47d9bfd6": {
+                    "priceFeed": "0xde31f8bfbd8c84b5360cfacca3539b938dd78ae6",
+                    "loanToValue": 0.7,
+                    "liquidationThreshold": 0.75
+                },
+                "0x0d500b1d8e8ef31e21c99d1db9a6444d3adf1270": {
+                    "priceFeed": "0xab594600376ec9fd91f8e885dadf0ce036862de0",
+                    "loanToValue": 0.65,
+                    "liquidationThreshold": 0.7
+                },
+                "0xfa68fb4628dff1028cfec22b4162fccd0d45efb6": {
+                    "priceFeed": "0x5d37e4b374e6907de8fc7fb33ee3b0af403c7403",
+                    "loanToValue": 0.55,
+                    "liquidationThreshold": 0.6
+                },
+                "0x3a58a54c066fdc0f2d55fc9c89f0415c92ebf3c4": {
+                    "priceFeed": "0x97371df4492605486e23da797fa68e55fc38a13f",
+                    "loanToValue": 0.6,
+                    "liquidationThreshold": 0.65
+                }
+            }
+        }
+    }
+}

{defi-state-querier-0.3.1 → defi-state-querier-0.3.4}/src/defi_services/services/lending/onyx_service.py

@@ -180,8 +180,6 @@ class OnyxStateService(CompoundStateService):
 
         for token, value in reserves_info.items():
             underlying = token
-            ctoken = value.get('cToken')
-            ctokens.append(Web3.toChecksumAddress(ctoken))
 
             if token == Token.native_token:
                 underlying = Token.wrapped_token.get(self.chain_id)
@@ -191,9 +189,9 @@ class OnyxStateService(CompoundStateService):
             rpc_calls[underlying_decimals_key] = self.state_service.get_function_info(
                 underlying, ERC20_ABI, "decimals", [], block_number
             )
-        key = f"oTokenBalancesAll_{self.name}_{wallet}_{block_number}".lower()
-        rpc_calls[key] = self.get_lens_function_info(
-            "oTokenBalancesAll", [ctokens, Web3.toChecksumAddress(wallet)])
+            key = f"oTokenBalances_{self.name}_{wallet}_{token}_{block_number}".lower()
+            rpc_calls[key] = self.get_lens_function_info(
+                "oTokenBalances", [value.get("cToken"), Web3.toChecksumAddress(wallet)])
         return rpc_calls
 
     def calculate_wallet_deposit_borrow_balance(
@@ -210,14 +208,9 @@ class OnyxStateService(CompoundStateService):
             token_prices = {}
         result = {}
         total_borrow, total_collateral = 0, 0
-        key = f"oTokenBalancesAll_{self.name}_{wallet}_{block_number}".lower()
-        ctoken_balance = {}
-        for item in decoded_data.get(key):
-            ctoken_balance[item[0]] = {
-                "borrow": item[2],
-                "supply": item[3]
-            }
         for token, value in reserves_info.items():
+            key = f"oTokenBalances_{self.name}_{wallet}_{token}_{block_number}".lower()
+            ctoken_balance = decoded_data.get(key)
             data = {}
             underlying = token
             ctoken = value.get("cToken")
@@ -226,12 +219,8 @@ class OnyxStateService(CompoundStateService):
 
             get_decimals_id = f"decimals_{underlying}_{block_number}".lower()
             decimals = decoded_data.get(get_decimals_id, 0)
-            if decimals:
-                deposit_amount = ctoken_balance[ctoken]["supply"] / 10 ** decimals
-                borrow_amount = ctoken_balance[ctoken]["borrow"] / 10 ** decimals
-            else:
-                deposit_amount = ctoken_balance[ctoken]["supply"]
-                borrow_amount = ctoken_balance[ctoken]["borrow"]
+            deposit_amount = ctoken_balance[3] / 10 ** decimals
+            borrow_amount = ctoken_balance[2] / 10 ** decimals
             data[token] = {
                 "borrow_amount": borrow_amount,
                 "deposit_amount": deposit_amount,

{defi-state-querier-0.3.1 → defi-state-querier-0.3.4}/src/defi_state_querier.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: defi-state-querier
-Version: 0.3.1
+Version: 0.3.4
 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.3.1 → defi-state-querier-0.3.4}/src/defi_state_querier.egg-info/SOURCES.txt

@@ -159,6 +159,7 @@ src/defi_services/services/lending/wepiggy_services.py
 src/defi_services/services/lending/lending_info/__init__.py
 src/defi_services/services/lending/lending_info/arbitrum/__init__.py
 src/defi_services/services/lending/lending_info/arbitrum/aave_v3_arbitrum.py
+src/defi_services/services/lending/lending_info/arbitrum/compound_v3_arbitrum.py
 src/defi_services/services/lending/lending_info/arbitrum/granary_arbitrum.py
 src/defi_services/services/lending/lending_info/arbitrum/radiant_arbitrum.py
 src/defi_services/services/lending/lending_info/arbitrum/silo_arbitrum.py
@@ -211,6 +212,7 @@ src/defi_services/services/lending/lending_info/optimism/wepiggy_optimism.py
 src/defi_services/services/lending/lending_info/polygon/__init__.py
 src/defi_services/services/lending/lending_info/polygon/aave_v2_polygon.py
 src/defi_services/services/lending/lending_info/polygon/aave_v3_polygon.py
+src/defi_services/services/lending/lending_info/polygon/compound_v3_polygon.py
 src/defi_services/services/lending/lending_info/polygon/wepiggy_polygon.py
 src/defi_services/services/lending/lending_info/tron/__init__.py
 src/defi_services/services/lending/lending_info/tron/justlend_tron.py

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

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