defi-state-querier 0.5.31__py3-none-any.whl → 0.5.32__py3-none-any.whl

defi_services/__init__.py

@@ -1 +1 @@
-__version__ = "0.5.31"
+__version__ = "0.5.32"

defi_services/services/lending/compound_v3_services.py

@@ -87,7 +87,7 @@ class CompoundV3StateService(CompoundStateService):
 
             comet_address = reserve_info['comet']
             functions = [
-                'decimals', 'totalBorrow', 'getUtilization', 'borrowKink', 'borrowPerSecondInterestRateBase',
+                'decimals', 'totalSupply', 'totalBorrow', 'getUtilization', 'borrowKink', 'borrowPerSecondInterestRateBase',
                 'borrowPerSecondInterestRateSlopeHigh', 'borrowPerSecondInterestRateSlopeLow',
                 'supplyKink', 'supplyPerSecondInterestRateBase', 'supplyPerSecondInterestRateSlopeHigh',
                 'supplyPerSecondInterestRateSlopeLow'
@@ -130,6 +130,7 @@ class CompoundV3StateService(CompoundStateService):
 
             comet_address = reserve_info['comet']
             comet_decimals_query_id = f"decimals_{comet_address}_{block_number}".lower()
+            total_supply_query_id = f"totalSupply_{comet_address}_{block_number}".lower()
             total_borrow_query_id = f"totalBorrow_{comet_address}_{block_number}".lower()
             utilization_query_id = f"getUtilization_{comet_address}_{block_number}".lower()
 
@@ -137,6 +138,7 @@ class CompoundV3StateService(CompoundStateService):
                 "token": comet_address,
                 "token_decimals": decoded_data.get(comet_decimals_query_id),
                 "utilization": decoded_data.get(utilization_query_id),
+                'total_supply': decoded_data.get(total_supply_query_id),
                 'total_borrow': decoded_data.get(total_borrow_query_id),
                 "underlying_decimals": underlying_decimals,
                 "underlying": token_address
@@ -191,7 +193,7 @@ class CompoundV3StateService(CompoundStateService):
                 underlying_token: {
                     'deposit_apy': asset_info['deposit_apy'],
                     'borrow_apy': asset_info['borrow_apy'],
-                    'total_deposit': 0,
+                    'total_deposit': asset_info['total_deposit'],
                     'total_borrow': asset_info['total_borrow'],
                     'is_base': True
                 }
@@ -207,7 +209,6 @@ class CompoundV3StateService(CompoundStateService):
                         'is_base': False
                     }
                 assets[collateral_address]['total_deposit'] += total_supply
-                # assets[collateral_address]['deposit_apy'] = asset_info['deposit_apy']
 
             comet = token_info['token']
             data[comet] = assets
@@ -218,12 +219,12 @@ class CompoundV3StateService(CompoundStateService):
     def _calculate_interest_rates(
             cls, token_info: dict, pool_decimals: int, apx_block_speed_in_seconds: float):
 
+        total_supply = float(token_info["total_supply"]) / 10 ** int(token_info["underlying_decimals"])
         total_borrow = float(token_info["total_borrow"]) / 10 ** int(token_info["underlying_decimals"])
         collaterals = {}
         for asset_info in token_info['assets']:
             collateral_address = asset_info['underlying']
-            total_supply = float(asset_info["total_supply"]) / 10 ** int(asset_info["underlying_decimals"])
-            collaterals[collateral_address] = total_supply
+            collaterals[collateral_address] = float(asset_info["total_supply"]) / 10 ** int(asset_info["underlying_decimals"])
 
         utilization = token_info['utilization'] / 10 ** 18
         interests = {}
@@ -239,7 +240,7 @@ class CompoundV3StateService(CompoundStateService):
         return {
             'deposit_apy': interests['supply'],
             'borrow_apy': interests['borrow'],
-            'total_deposit': None,
+            'total_deposit': total_supply,
             'total_borrow': total_borrow,
             'collaterals': collaterals
         }

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

@@ -0,0 +1,12 @@
+YLDR_ETHEREUM = {
+    "address": "0x54ad657851b6ae95ba3380704996caad4b7751a3",
+    "name": "YLDR Lending Pool",
+    "stakedIncentiveAddress": '',
+    "oracleAddress": "0x2a61760f0413c7fc9e3120e3d51c961f6bb17452",
+    "rewardTokensList": [],
+    "type": "LENDING_POOL",
+    "poolToken": "",
+    "forked": "aave-v3",
+    "reservesList": {}
+
+}

defi_services/services/lending/lending_info/avalanche/benqi_avalanche.py

@@ -0,0 +1,12 @@
+COMPOUND_ETH = {
+    "name": "Compound Lending Pool",
+    "rewardToken": "",
+    "comptrollerAddress": "0xd7c4006d33da2a0a8525791ed212bbcd7aca763f",
+    "lensAddress": "",
+    "poolToken": "0x8729438eb15e2c8b576fcc6aecda6a148776c0f5",
+    "type": "LENDING_POOL",
+    "forked": "compound",
+    "reservesList": {
+
+    }
+}

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

@@ -0,0 +1,12 @@
+YLDR_ETHEREUM = {
+    "address": "0x6447c4390457cad03ec1baa4254cee1a3d9e1bbd",
+    "name": "YLDR Lending Pool",
+    "stakedIncentiveAddress": '',
+    "oracleAddress": "0xb58ce829f4fe67b4dc0a98ba7f6ac6e92e207790",
+    "rewardTokensList": [],
+    "type": "LENDING_POOL",
+    "poolToken": "",
+    "forked": "aave-v3",
+    "reservesList": {}
+
+}

{defi_state_querier-0.5.31.dist-info → defi_state_querier-0.5.32.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: defi-state-querier
-Version: 0.5.31
+Version: 0.5.32
 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.5.31.dist-info → defi_state_querier-0.5.32.dist-info}/RECORD

@@ -1,4 +1,4 @@
-defi_services/__init__.py,sha256=ARMz5Rl7GeMF49e55XYAcBGxehsgyCy4DCLgMKXkxVQ,23
+defi_services/__init__.py,sha256=zRBKyOU0DiJN_VNZQUawZ7-WJzZsLSLydzPhK6ijatA,23
 defi_services/abis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 defi_services/abis/multicall_v3_abi.py,sha256=0aPxjrJJFU17fODjvYFRDn5Y5J1yi_AJKc8v1uohNGY,12352
 defi_services/abis/dex/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -377,7 +377,7 @@ defi_services/services/lending/aave_v3_services.py,sha256=aGXhVSrQM2Eui5DH1Ghf-X
 defi_services/services/lending/apeswap_services.py,sha256=UrLhXVzGvim_xfs54hSJ1qeTH6ber4xh01j5PWFl4C8,4737
 defi_services/services/lending/avalon_services.py,sha256=M1H7JIGCrucr_5KiJUgYC4i6YO4UuvZjArRNPAl6AFU,1118
 defi_services/services/lending/compound_service.py,sha256=8r7pAs8KaaakDuHg4BUICW4zLD-ihm_DQETYwnAFc98,21917
-defi_services/services/lending/compound_v3_services.py,sha256=iLxaP0YpRAKrVw2dQLACTNS6oIfCvQ_-ZPKSiC3Q8bE,17448
+defi_services/services/lending/compound_v3_services.py,sha256=FBcazzTeOCSI6iMp5OfFPeuLiZvF3x2SYE5VXZ60sG0,17636
 defi_services/services/lending/cream_services.py,sha256=vtah0kMHAxztenWbJp4CxEcBMF0XUBglGRk6p9d-oiU,1644
 defi_services/services/lending/flux_services.py,sha256=C9WJ2MIBK4xTaXIHF3yBVu52xGCNzO4Ed5DWyxWTTeE,12617
 defi_services/services/lending/geist_services.py,sha256=UI5D-MbMqplrt7D4krSFdpaREKOT81k8boD_XhGGpUQ,1035
@@ -414,9 +414,11 @@ defi_services/services/lending/lending_info/arbitrum/radiant_arbitrum.py,sha256=
 defi_services/services/lending/lending_info/arbitrum/silo_arbitrum.py,sha256=XJWbE3xmIiNP44OF_ElXZ8m4FMIoGpesX_HgoG8AKLo,6513
 defi_services/services/lending/lending_info/arbitrum/venus_arbitrum.py,sha256=uY7BXnvJEBiqZHnQm8J9ONI9ng4Pl5PWMKvo0okKsac,312
 defi_services/services/lending/lending_info/arbitrum/wepiggy_arbitrum.py,sha256=Wysawoam2d9pMhaED8EhPJhwNlWV4_r9j6diikI275k,1523
+defi_services/services/lending/lending_info/arbitrum/yldr_arbitrum.py,sha256=bnRntZIO1A0ARtjBDQaeVJDidjLmSyOps_vxT18ko2A,340
 defi_services/services/lending/lending_info/avalanche/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 defi_services/services/lending/lending_info/avalanche/aave_v2_avalanche.py,sha256=Md3n217lm7ZZadGqXmSooYKesYPXx5mGaW2BEuz1i_Y,2668
 defi_services/services/lending/lending_info/avalanche/aave_v3_avalanche.py,sha256=WrWBjJ88_5jKm3qmd1F_txnZaPE9uXIXBKG8sHvqcR4,4236
+defi_services/services/lending/lending_info/avalanche/benqi_avalanche.py,sha256=lueulxqlstcLejriraNOT4dfcuaN1cWEiFDtm3IXeT0,320
 defi_services/services/lending/lending_info/avalanche/granary_avalanche.py,sha256=rfUF9HaW5yJQP2sRHbVf9nnFWi5YqEHPF905iFdhDbU,2640
 defi_services/services/lending/lending_info/avalanche/iron_bank_avalanche.py,sha256=r06sFd-UyLXPlzAn3-A4ukJhix0OSkqLy7vsFU3KHvE,2343
 defi_services/services/lending/lending_info/base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -467,6 +469,7 @@ defi_services/services/lending/lending_info/ethereum/trava_eth.py,sha256=ycPAsnq
 defi_services/services/lending/lending_info/ethereum/uwu_eth.py,sha256=l_LMKCUjy3JlSXS7pMr34FNpqedFQheO-QhUWxUA1OE,4837
 defi_services/services/lending/lending_info/ethereum/venus_eth.py,sha256=Xxww3KuI5elm8342UgbuyP28GA7ZwBcFRlVanBLyaTQ,312
 defi_services/services/lending/lending_info/ethereum/wepiggy_eth.py,sha256=yyi2l5PpxUUSM3irLVDdhocANW7rHqmwSJM_KRTsy_Y,2224
+defi_services/services/lending/lending_info/ethereum/yldr_ethereum.py,sha256=UmwogvzrngXC3v6dZ1MQczftUTcE6rmhZJYo7XIwy_c,340
 defi_services/services/lending/lending_info/ethereum/zerolend_eth.py,sha256=Ddyti8DccOVgWka3jpxas7LbsI-RGwv4zHzfjAVIG88,4465
 defi_services/services/lending/lending_info/fantom/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 defi_services/services/lending/lending_info/fantom/aave_v3_ftm.py,sha256=Oukfb-f-p3Y_MLoyVqj-f6yl_1QxAyjHdyz02BkxyEU,3556
@@ -522,8 +525,8 @@ defi_services/utils/memory_storage.py,sha256=BOT8laB0iVSCGE-oDlpWJQLbSC6X2blKX4z
 defi_services/utils/sqrt_price_math.py,sha256=9lgUeWFT4wjl3Vq3b7-jZ2bGvvZx7dDBSfVnM3lsZ8o,5575
 defi_services/utils/thread_proxy.py,sha256=5Z8biAyEReUkh3vfJSvEv7GwMe3CsE5M8CbghkQtePw,2951
 defi_services/utils/ton_decode_address.py,sha256=EWKwmC7KtbXpdKgiNK-5j-5lX7fCr17I4EWYs9b43eU,443
-defi_state_querier-0.5.31.dist-info/licenses/LICENSE,sha256=6jmfxa8nUIwfKnzZUxAHJSJ_IS7h7mpbJq26cWjoo-o,1063
-defi_state_querier-0.5.31.dist-info/METADATA,sha256=JXpOyJJo8MOmicAvbxxvmQI8Ehmw92VfUotNYrMJ0OE,4653
-defi_state_querier-0.5.31.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-defi_state_querier-0.5.31.dist-info/top_level.txt,sha256=C-OTxHK6MknKK-nAbEzCPDUl1M6pktRhgJrmsozdf6g,14
-defi_state_querier-0.5.31.dist-info/RECORD,,
+defi_state_querier-0.5.32.dist-info/licenses/LICENSE,sha256=6jmfxa8nUIwfKnzZUxAHJSJ_IS7h7mpbJq26cWjoo-o,1063
+defi_state_querier-0.5.32.dist-info/METADATA,sha256=IKXupw7jMsPsPXWFAINCtIDYihaLyKNcbLk0lCy8rM8,4653
+defi_state_querier-0.5.32.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+defi_state_querier-0.5.32.dist-info/top_level.txt,sha256=C-OTxHK6MknKK-nAbEzCPDUl1M6pktRhgJrmsozdf6g,14
+defi_state_querier-0.5.32.dist-info/RECORD,,

{defi_state_querier-0.5.31.dist-info → defi_state_querier-0.5.32.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (80.3.1)
 Root-Is-Purelib: true
 Tag: py3-none-any