indev

Author: hschickdevs

README.md

@@ -111,7 +111,8 @@ pip uninstall alpha-homora-v2
 
 ## Roadmap:
 
-1. ***(WIP)*** Get position value of equity and debt
-2. ***(WIP)*** Get outstanding rewards value in native rewards token and USD
-3. ***(WIP)*** Get current debt ratio 
-4. Integrate other DEXes outside of the Avalanche network
+1. ~~Get position value of equity and debt~~
+2. ~~Get current debt ratio~~
+3. Get outstanding rewards value in native rewards token and USD
+4. Get current pool APY
+5. Integrate with Ethereum network exchanges

alpha_homora_v2/position.py

@@ -155,11 +155,11 @@ def get_debt_ratio(self) -> float:
 
         return borrow_credit / collateral_credit
 
-    def get_position_value(self):
+    def get_position_value(self) -> tuple[float, float, float, float, float, float]:
         """
         Get equity, debt, and total position value in AVAX and USD.
 
-        :return: (dict)
+        :return: (tuple)
             - equity_avax (float)
             - equity_usd (float)
             - debt_avax (float)
@@ -212,72 +212,11 @@ def get_position_value(self):
         total_equity_avax = position_value_avax - debt_value_avax
         total_equity_usd = position_value_usd - debt_value_usd
 
-        return {"equity_avax": total_equity_avax, "equity_usd": total_equity_usd,
-                "debt_avax": debt_value_avax, "debt_usd": debt_value_usd,
-                "position_avax": position_value_avax, "position_usd": position_value_usd}
-
-    # Deprecated but left temporarily for backup and reference:
-    # def get_position_value(self):
-    #     """
-    #     Get equity value, debt value, and total position value in AVAX and USD.
-    #
-    #     :return: (dict)
-    #         - equity_avax (float)
-    #         - equity_usd (float)
-    #         - debt_avax (float)
-    #         - debt_usd (float)
-    #         - position_avax (float)
-    #         - position_usd (float)
-    #     """
-    #     pool_info = self.get_pool_info()
-    #     underlying_token_data = [get_token_info_from_ref(token) for token in self.get_pool_info()['tokens']]
-    #     lp_address = pool_info['lpTokenAddress']
-    #     avax_price = get_token_price("AVAX")
-    #
-    #     pool_instance = self.platform.get_lp_contract(lp_address)
-    #
-    #     collateral_size = self.get_position_info()[-1]
-    #
-    #     r0, r1, last_block_time = pool_instance.functions.getReserves().call()
-    #     supply = pool_instance.functions.totalSupply().call()
-    #
-    #     token0_amount = (r0 * collateral_size / supply) / 10 ** int(underlying_token_data[0]['precision'])
-    #     token1_amount = (r1 * collateral_size / supply) / 10 ** int(underlying_token_data[1]['precision'])
-
-    #     position_value_usd = token0_amount + (token1_amount * avax_price)
-    #     position_value_avax = position_value_usd * (1 / avax_price)
-    #
-    #     print("Position Value:", position_value_usd)
-    #
-    #     # Get debts for underlying tokens:
-    #     total_debt_usd = 0.0
-    #     total_debt_avax = 0.0
-    #     for i, token in enumerate(pool_info['tokens']):
-    #         borrow_bal = self.homora_bank.functions.borrowBalanceCurrent(self.pos_id,
-    #                                                                      Web3.toChecksumAddress(token)).call()
-    #         mtd = get_token_info_from_ref(token)
-    #         if mtd is None:
-    #             raise ValueError(f"Could not locate token metadata for {token}")
-    #
-    #         token_price_usd = get_token_price(mtd['symbol'])
-    #
-    #         bbal_in_token = borrow_bal / 10 ** int(mtd['precision'])
-    #         bbal_in_usd = bbal_in_token * token_price_usd
-    #         bbal_in_avax = bbal_in_token / get_token_price('AVAX')
-    #
-    #         total_debt_usd += bbal_in_usd
-    #         total_debt_avax += bbal_in_avax
-    #
-    #         print(f"{mtd['symbol']} | "
-    #               f"token{i}_amount: {[token0_amount, token1_amount][i]} | "
-    #               f"r{i}: {[r0, r1][i]}")
-    #
-    #     equity_avax = position_value_avax - total_debt_avax
-    #     equity_usd = position_value_usd - total_debt_usd
-    #
-    #     return {"equity_avax": equity_avax, "equity_usd": equity_usd,
-    #             "debt_avax": total_debt_avax, "debt_usd": total_debt_usd,
-    #             "position_avax": position_value_avax, "position_usd": position_value_usd}
+        return total_equity_avax, total_equity_usd, debt_value_avax, debt_value_usd, position_value_avax, position_value_usd
+        # return {"equity_avax": total_equity_avax, "equity_usd": total_equity_usd,
+        #         "debt_avax": debt_value_avax, "debt_usd": debt_value_usd,
+        #         "position_avax": position_value_avax, "position_usd": position_value_usd}
+
 
     """ ------------------------------------------ UTILITY ------------------------------------------ """
     def get_platform(self, identifier: str) -> SpellClient:

alpha_homora_v2/resources/abi_reference.py

@@ -11,7 +11,7 @@
 PangolinSpellV2_ABI = 'PangolinSpellV2.json', '0x966bbec3ac35452133B5c236b4139C07b1e2c9b1'
 AggregatorOracle_ABI = 'AggregatorOracle.json','0xc842CC25FE89F0A60Fe9C1fd6483B6971020Eb3A'
 WERC20_ABI = 'WERC20ABI.json','0x496Aa991Cf3952264f284355371cD190ddcc8588'
-WMasterchefJoeV2_ABI = "WMasterchefJoeV2_ABI.json",'0xB41DE9c1f50697cC3Fd63F24EdE2B40f6269CBcb'
+WMasterchefJoeV2_ABI = "WMasterchefJoeV2_ABI.json", '0xB41DE9c1f50697cC3Fd63F24EdE2B40f6269CBcb'
 MasterChefJoeV2_ABI = "MasterChefJoeV2_ABI.json", "0xd6a4F121CA35509aF06A0Be99093d08462f53052"
 WMiniChefPNG_ABI = 'WMiniChefPNG.json', '0xa67CF61b0b9BC39c6df04095A118e53BFb9303c7'
 USDCe_ABI = 'USDC.e_ABI.json', '0xA7D7079b0FEaD91F3e65f86E8915Cb59c1a4C664'

alpha_homora_v2/spell.py

@@ -133,7 +133,6 @@ def get_pool_info(self, coll_id) -> dict:
         """
         pid, entryRewardPerShare = self.decode_collid(coll_id)
         pool_info = self.staking_contract.functions.poolInfo(pid).call()
-        # return pid, entryRewardPerShare, *pool_info
         return {"pid": pid, "entryRewardPerShare": entryRewardPerShare, "lpTokenAddress": pool_info[0],
                 "allocPoint": pool_info[1], "lastRewardTimestamp": pool_info[2], "accRewardPerShare": pool_info[3],
                 "rewarderAddress": pool_info[4]}
@@ -193,7 +192,6 @@ def get_pool_info(self, coll_id) -> dict:
         """
         pid, entryRewardPerShare = self.decode_collid(coll_id)
         pool_info = self.staking_contract.functions.poolInfo(pid).call()
-        # return pid, entryRewardPerShare, *pool_info
         return {"pid": pid, "entryRewardPerShare": entryRewardPerShare, "accRewardPerShare": pool_info[0],
                 "lastRewardTimestamp": pool_info[1], "allocPoint": pool_info[2]}