defi-state-querier 0.2.3__py3-none-any.whl → 0.2.4__py3-none-any.whl

defi_services/__init__.py

@@ -1 +1 @@
-__version__ = "0.2.3"
+__version__ = "0.2.4"

defi_services/abis/lending/compound_v3/reward_abi.py

@@ -0,0 +1,334 @@
+import json
+
+REWARD_ABI = json.loads('''
+[
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "governor_",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "nonpayable",
+    "type": "constructor"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "name": "AlreadyConfigured",
+    "type": "error"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "name": "InvalidUInt64",
+    "type": "error"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "name": "NotPermitted",
+    "type": "error"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "name": "NotSupported",
+    "type": "error"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "name": "TransferOutFailed",
+    "type": "error"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "oldGovernor",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "newGovernor",
+        "type": "address"
+      }
+    ],
+    "name": "GovernorTransferred",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "src",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "recipient",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "token",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "amount",
+        "type": "uint256"
+      }
+    ],
+    "name": "RewardClaimed",
+    "type": "event"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "comet",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "src",
+        "type": "address"
+      },
+      {
+        "internalType": "bool",
+        "name": "shouldAccrue",
+        "type": "bool"
+      }
+    ],
+    "name": "claim",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "comet",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "src",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "internalType": "bool",
+        "name": "shouldAccrue",
+        "type": "bool"
+      }
+    ],
+    "name": "claimTo",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "comet",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "account",
+        "type": "address"
+      }
+    ],
+    "name": "getRewardOwed",
+    "outputs": [
+      {
+        "components": [
+          {
+            "internalType": "address",
+            "name": "token",
+            "type": "address"
+          },
+          {
+            "internalType": "uint256",
+            "name": "owed",
+            "type": "uint256"
+          }
+        ],
+        "internalType": "struct CometRewards.RewardOwed",
+        "name": "",
+        "type": "tuple"
+      }
+    ],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "governor",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "name": "rewardConfig",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "token",
+        "type": "address"
+      },
+      {
+        "internalType": "uint64",
+        "name": "rescaleFactor",
+        "type": "uint64"
+      },
+      {
+        "internalType": "bool",
+        "name": "shouldUpscale",
+        "type": "bool"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "name": "rewardsClaimed",
+    "outputs": [
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "comet",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "token",
+        "type": "address"
+      }
+    ],
+    "name": "setRewardConfig",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "newGovernor",
+        "type": "address"
+      }
+    ],
+    "name": "transferGovernor",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "token",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "amount",
+        "type": "uint256"
+      }
+    ],
+    "name": "withdrawToken",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  }
+]
+''')

defi_services/services/lending/compound_service.py

@@ -224,13 +224,15 @@ class CompoundStateService(ProtocolServices):
             reserves_info: dict = None,
             block_number: int = "latest",
     ):
-        rpc_call = self.get_comptroller_function_info("compAccrued", [wallet], block_number)
-        get_reward_id = f"compAccrued_{self.name}_{wallet}_{block_number}".lower()
+        reward_token = self.pool_info.get("rewardToken")
+        comptroller = self.pool_info.get("comptrollerAddress")
+        rpc_call = self.get_lens_function_info("getCompBalanceMetadataExt", [reward_token, comptroller, wallet], block_number)
+        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"):
-        get_reward_id = f"compAccrued_{self.name}_{wallet}_{block_number}".lower()
-        rewards = decoded_data.get(get_reward_id) / 10 ** 18
+        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")
         result = {
             reward_token: {"amount": rewards}

defi_services/services/lending/compound_v3_services.py

@@ -1,5 +1,6 @@
 from defi_services.abis.lending.compound_v3.comet_abi import COMET_ABI
 from defi_services.abis.lending.compound_v3.comet_ext_abi import COMET_EXT_ABI
+from defi_services.abis.lending.compound_v3.reward_abi import REWARD_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
@@ -22,6 +23,7 @@ class CompoundV3StateService(CompoundStateService):
         self.pool_info = CompoundV3Info.mapping.get(chain_id)
         self.comet_abi = COMET_ABI
         self.comet_ext = COMET_EXT_ABI
+        self.reward_abi = REWARD_ABI
 
     def get_service_info(self):
         info = {
@@ -70,11 +72,12 @@ class CompoundV3StateService(CompoundStateService):
             block_number: int = "latest",
     ):
         result = {}
+        reward_address = self.pool_info.get("rewardAddress")
         for token, value in self.pool_info.get("reservesList").items():
-            ext_address = value.get("cometExt")
+            comet = value.get("comet")
             rpc_call = self.state_service.get_function_info(
-                ext_address, self.comet_ext, "baseTrackingAccrued", [wallet], block_number)
-            get_reward_id = f"baseTrackingAccrued_{ext_address}_{wallet}_{block_number}".lower()
+                reward_address, self.reward_abi, "getRewardOwed", [comet, wallet], block_number)
+            get_reward_id = f"getRewardOwed_{reward_address}_{comet}_{wallet}_{block_number}".lower()
             result[get_reward_id] = rpc_call
         return result
 
@@ -84,10 +87,11 @@ class CompoundV3StateService(CompoundStateService):
             wallet: str,
             block_number: int = "latest"):
         reward_amount = 0
+        reward_address = self.pool_info.get("rewardAddress")
         for token, value in self.pool_info.get("reservesList").items():
-            ext_address = value.get("cometExt")
-            get_reward_id = f"baseTrackingAccrued_{ext_address}_{wallet}_{block_number}".lower()
-            reward_amount += decoded_data.get(get_reward_id) / 10 ** 18
+            comet = value.get("comet")
+            get_reward_id = f"getRewardOwed_{reward_address}_{comet}_{wallet}_{block_number}".lower()
+            reward_amount += decoded_data.get(get_reward_id)[1] / 10 ** 18
         reward_token = self.pool_info.get("rewardToken")
         result = {
             reward_token: {"amount": reward_amount}

defi_services/services/lending/cream_services.py

@@ -34,3 +34,14 @@ class CreamStateService(CompoundStateService):
         }
         return info
 
+    def get_rewards_balance_function_info(
+            self,
+            wallet: str,
+            reserves_info: dict = None,
+            block_number: int = "latest",
+    ):
+        reward_token = self.pool_info.get("rewardToken")
+        comptroller = self.pool_info.get("comptrollerImplementationAddress")
+        rpc_call = self.get_lens_function_info("getCompBalanceMetadataExt", [reward_token, comptroller, wallet], block_number)
+        get_reward_id = f"getCompBalanceMetadataExt_{self.name}_{wallet}_{block_number}".lower()
+        return {get_reward_id: rpc_call}

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

@@ -18,7 +18,7 @@ AAVE_V3_ETH = {
             "tToken": "0x0b925ed163218f6662a35e0f0371ac234f9e9371",
             "sdToken": "0x39739943199c0fbfe9e5f1b5b160cd73a64cb85d",
             "dToken": "0xc96113eed8cab59cd8a66813bcb0ceb29f06d2e4",
-            "liquidationThreshold": 0.8
+            "liquidationThreshold": 0.81
         },
         "0x2260fac5e5542a773aa44fbcfedf7c193bc2c599": {
             "tToken": "0x5ee5bf7ae06d1be5997a1a72006fe6c607ec6de8",
@@ -54,7 +54,7 @@ AAVE_V3_ETH = {
             "tToken": "0x977b6fc5de62598b08c85ac8cf2b745874e8b78c",
             "sdToken": "0x82be6012cea6d147b968ebaea5ceecf6a5b4f493",
             "dToken": "0x0c91bca95b5fe69164ce583a2ec9429a569798ed",
-            "liquidationThreshold": 0.74
+            "liquidationThreshold": 0.77
         },
         "0xdac17f958d2ee523a2206206994597c13d831ec7": {
             "tToken": "0x23878914efe38d27c4d67ab83ed1b93a74d4086a",
@@ -66,7 +66,7 @@ AAVE_V3_ETH = {
             "tToken": "0xcc9ee9483f662091a1de4795249e24ac0ac2630f",
             "sdToken": "0x1d1906f909cae494c7441604dafdddbd0485a925",
             "dToken": "0xae8593dd575fe29a9745056aa91c4b746eee62c8",
-            "liquidationThreshold": 0.74
+            "liquidationThreshold": 0.77
         },
         "0x5f98805a4e8be255a32880fdec7f6728c6568ba0": {
             "tToken": "0x3fe6a295459fae07df8a0cecc36f37160fe86aa9",
@@ -139,6 +139,12 @@ AAVE_V3_ETH = {
             "sdToken": "0x41e330fd8f7ea31e2e8f02cc0c9392d1403597b4",
             "dToken": "0x8988eca19d502fd8b9ccd03fa3bd20a6f599bc2a",
             "liquidationThreshold": 0.0
+        },
+        "0x83f20f44975d03b1b09e64809b757c47f942beea": {
+            "tToken": "0x4c612e3b15b96ff9a6faed838f8d07d479a8dd4c",
+            "sdToken": "0x48bc45f084988bc01933ea93eeffebc0416534f6",
+            "dToken": "0x8db9d35e117d8b93c6ca9b644b25bad5d9908141",
+            "liquidationThreshold": 0.8
         }
     }
 }

{defi_state_querier-0.2.3.dist-info → defi_state_querier-0.2.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: defi-state-querier
-Version: 0.2.3
+Version: 0.2.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.2.3.dist-info → defi_state_querier-0.2.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-defi_services/__init__.py,sha256=PNiDER4qM19h9zdsdfgKt2_dT4WgYK7EguJ8RU2qA_g,22
+defi_services/__init__.py,sha256=SBl2EPFW-ltPvQ7vbVWItyAsz3aKYIpjO7vcfr84GkU,22
 defi_services/abis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 defi_services/abis/dex/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 defi_services/abis/dex/biswap/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -34,6 +34,7 @@ defi_services/abis/lending/apeswape/apswap_ctoken_abi.py,sha256=O2q-bl0hGY0maG7K
 defi_services/abis/lending/compound_v3/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 defi_services/abis/lending/compound_v3/comet_abi.py,sha256=KU0CONZWPPWhvc0GT8TUB71tHMOoHex38GmSlUMvupU,37543
 defi_services/abis/lending/compound_v3/comet_ext_abi.py,sha256=npi28jLXipBUYywfcNUXz7gAlsF9w8ou3JcJMSrnZs0,11684
+defi_services/abis/lending/compound_v3/reward_abi.py,sha256=YzULMk7RZvVHrL2m_OTrLeVyfln2RVkCeflTipN70Ew,6223
 defi_services/abis/lending/cream/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 defi_services/abis/lending/cream/cream_comptroller_abi.py,sha256=lHcdsXy99bltWfHhvu5svHLk6FF5p8GuwMJBRKnPz68,43379
 defi_services/abis/lending/cream/cream_lens_abi.py,sha256=IP5xv3YG2pgqlzldUJCzQ8PXhzlD5BnHTuFf0qypms8,20100
@@ -128,9 +129,9 @@ defi_services/services/lending/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5
 defi_services/services/lending/aave_v2_services.py,sha256=-sVla7IQ8GdkBXYuloaN9VSm4XUk_BkcpGsZRTiG9aI,17188
 defi_services/services/lending/aave_v3_services.py,sha256=wRgDN8Pb3DorEJlBv_SpUvwJN034Ti9XVjRcevP_hrE,14783
 defi_services/services/lending/apeswap_services.py,sha256=Pj_27FjE04IZe41RdxFg6Wpu45qmabg5v20hwhBRBBw,3408
-defi_services/services/lending/compound_service.py,sha256=HxSnADUt9ODBBkq-Nmk6KCt1AwG2jYSekUm9kgY-tTM,17878
-defi_services/services/lending/compound_v3_services.py,sha256=l-BCIhvJdqVCCXEScnOF03sqAZcAcq1i0b6OshRRZno,7396
-defi_services/services/lending/cream_services.py,sha256=dUXtlC66zpqPQL6e66O9YzQPvAqr_Y5pc2m3zNYLiY4,1093
+defi_services/services/lending/compound_service.py,sha256=rxvYlu_JS2KXGLD_viJCRYnB_IJiU28GCugPPDA3D9E,18064
+defi_services/services/lending/compound_v3_services.py,sha256=onZJYgqW6DEvUaYiMS2-7pOTjWKrD2tb1oEyqNQ4QzA,7628
+defi_services/services/lending/cream_services.py,sha256=kh49qnfnha-cVy2QQ-eQFt3mziwfYLvAyPentFeDB0Q,1666
 defi_services/services/lending/flux_services.py,sha256=vrtGdPg9N4jSbjUxPSM6TNHmTABikup0bVDUqfjLeHI,12270
 defi_services/services/lending/geist_services.py,sha256=UI5D-MbMqplrt7D4krSFdpaREKOT81k8boD_XhGGpUQ,1035
 defi_services/services/lending/granary_services.py,sha256=yoHWStc9qW4XhDjJQyNeKhheQbk7by7Ipz_0RL11dbg,10763
@@ -174,7 +175,7 @@ defi_services/services/lending/lending_info/bsc/venus_bsc.py,sha256=9B9wRuHkrPM4
 defi_services/services/lending/lending_info/bsc/wepiggy_bsc.py,sha256=2Db98_o42B8TSsmcmbLL5OwjV3Y56PLWTBNjRssXNrg,3273
 defi_services/services/lending/lending_info/ethereum/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 defi_services/services/lending/lending_info/ethereum/aave_v2_eth.py,sha256=HkI4ed-_27oZvGs6rdpFcIyJeqGcRsObDoCnMEApeuA,12032
-defi_services/services/lending/lending_info/ethereum/aave_v3_eth.py,sha256=tgHWU2NnrmlbPplRKRfo5TS5Vqivrd3fxtwvxb2B8GU,7307
+defi_services/services/lending/lending_info/ethereum/aave_v3_eth.py,sha256=tXe5QlEvQzQHgAJjug0MNo1m5bIyThiM7OavhQMsmok,7620
 defi_services/services/lending/lending_info/ethereum/compound_eth.py,sha256=9gMWKs9RUsV4bIWb4bJ9rF6L-LNUOQQAzE15UVLS3lE,3740
 defi_services/services/lending/lending_info/ethereum/compound_v3_eth.py,sha256=l3mVlB2MkKkNmr2Op9WocPFB1QaPJ0R9SLbO1fYNkw8,2653
 defi_services/services/lending/lending_info/ethereum/flux_eth.py,sha256=Iw-hvmFc5g9_--drvZCWxtoscvMIkr1mna4pTStrA-g,1270
@@ -216,8 +217,8 @@ defi_services/utils/logger_utils.py,sha256=KxDlmaK9aoMOI1gdroRYjMm383myvFiWqW0iK
 defi_services/utils/market_service.py,sha256=imPtPHBkpEx5JnhqeIWYqbCjsIEm8IKBYHNEy6rKjdU,723
 defi_services/utils/memory_storage.py,sha256=BOT8laB0iVSCGE-oDlpWJQLbSC6X2blKX4zuQbs4inc,851
 defi_services/utils/thread_proxy.py,sha256=5Z8biAyEReUkh3vfJSvEv7GwMe3CsE5M8CbghkQtePw,2951
-defi_state_querier-0.2.3.dist-info/LICENSE,sha256=6jmfxa8nUIwfKnzZUxAHJSJ_IS7h7mpbJq26cWjoo-o,1063
-defi_state_querier-0.2.3.dist-info/METADATA,sha256=LOspr9XbYnFL8fKT5Y1Tm7v3tYWT6rlg2NafyiiqxQY,3932
-defi_state_querier-0.2.3.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-defi_state_querier-0.2.3.dist-info/top_level.txt,sha256=C-OTxHK6MknKK-nAbEzCPDUl1M6pktRhgJrmsozdf6g,14
-defi_state_querier-0.2.3.dist-info/RECORD,,
+defi_state_querier-0.2.4.dist-info/LICENSE,sha256=6jmfxa8nUIwfKnzZUxAHJSJ_IS7h7mpbJq26cWjoo-o,1063
+defi_state_querier-0.2.4.dist-info/METADATA,sha256=U3LRytpVwUwYtkpMs4PjsSEjoEzSGyk8UJjOAZlHBKk,3932
+defi_state_querier-0.2.4.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+defi_state_querier-0.2.4.dist-info/top_level.txt,sha256=C-OTxHK6MknKK-nAbEzCPDUl1M6pktRhgJrmsozdf6g,14
+defi_state_querier-0.2.4.dist-info/RECORD,,