diff --git a/C_Main.py b/C_Main.py
index 2208b08..78ab980 100644
--- a/C_Main.py
+++ b/C_Main.py
@@ -38,7 +38,9 @@
def keep_safe():
if config.Debug_mode: print(f'keep_safe() started.')
+
begin_time = time()
+
wallet_balance = Queries_class.get_wallet_balances()
general_estimated_tx_fee = Dec(Queries_class.get_fee_estimation())
@@ -51,12 +53,16 @@ def keep_safe():
cooldowns = Cooldown_class.read_cooldown()
status_update = False
+ claimable_MIR = claimable_SPEC = claimable_ANC = value_of_SPEC_LP_token =available_ANC_LP_token_for_withdrawal = value_of_ANC_LP_token = 0
+
Mirror_position_info = Queries_class.Mirror_get_position_info()
Anchor_borrow_info = Queries_class.Anchor_get_borrow_info()
wallet_balance = Queries_class.get_wallet_balances()
all_rates = Queries_class.get_all_rates()
+ tax_rate = Terra.terra.treasury.tax_rate()
action_dict = {'MIR' : 'none','SPEC' : 'none','ANC' : 'none', }
+
wallet_balance_before = Queries_class.get_wallet_balances()
default_logger.debug(f'Wallet_balance_before: {Prettify_class.dict_value_convert_dec_to_float(wallet_balance_before, True)}')
@@ -70,13 +76,14 @@ def keep_safe():
if cooldowns.get('withdraw_MIR_from_pool') is None or cooldowns['withdraw_MIR_from_pool'] <= datetime_now:
# Check if there is enough UST balance in the wallet to pay the transaction fees
if wallet_balance['UST'] > general_estimated_tx_fee:
+ available_MIR_LP_token_for_withdrawal = Queries_class.get_available_LP_token_for_withdrawal(Terra_class.mirrorFarm, Terra_class.MIR_token)
+ value_of_MIR_LP_token = all_rates['MIR-TOKEN-PER-SHARE'] * available_MIR_LP_token_for_withdrawal * all_rates['MIR']/1000000 \
+ + all_rates['MIR-UST-PER-SHARE'] * available_MIR_LP_token_for_withdrawal
# Check if the min_price for the token has been matched
if (all_rates['MIR']/1000000) > config.MIR_min_price:
# Check if there are any LP for that token available
- available_MIR_LP_token_for_withdrawal = Queries_class.get_available_LP_token_for_withdrawal(Terra_class.mirrorFarm, Terra_class.MIR_token)
if available_MIR_LP_token_for_withdrawal > 0:
# Check if the min_withdrawal_limit is exceeded
- value_of_MIR_LP_token = Queries_class.get_UST_amount_for_LP_deposit(available_MIR_LP_token_for_withdrawal, Terra_class.Mirror_MIR_UST_Pair)
if (value_of_MIR_LP_token/1000000) > config.MIR_min_total_value:
# Unstake / withdrawn LP
withdraw_MIR_from_pool_tx = Transaction_class.withdraw_MIR_from_pool(available_MIR_LP_token_for_withdrawal)
@@ -111,13 +118,14 @@ def keep_safe():
if cooldowns.get('withdraw_SPEC_from_pool') is None or cooldowns['withdraw_SPEC_from_pool'] <= datetime_now:
# Check if there is enough UST balance in the wallet to pay the transaction fees
if wallet_balance['UST'] > general_estimated_tx_fee:
+ available_SPEC_LP_token_for_withdrawal = Queries_class.get_available_LP_token_for_withdrawal(Terra_class.specFarm, Terra_class.SPEC_token)
+ value_of_SPEC_LP_token = all_rates['SPEC-TOKEN-PER-SHARE'] * available_SPEC_LP_token_for_withdrawal * all_rates['SPEC']/1000000 \
+ + all_rates['SPEC-UST-PER-SHARE'] * available_SPEC_LP_token_for_withdrawal
# Check if the min_price for the token has been matched
if (all_rates['SPEC']/1000000) > config.SPEC_min_price:
# Check if there are any LP for that token available
- available_SPEC_LP_token_for_withdrawal = Queries_class.get_available_LP_token_for_withdrawal(Terra_class.specFarm, Terra_class.SPEC_token)
if available_SPEC_LP_token_for_withdrawal > 0:
# Check if the min_withdrawal_limit is exceeded
- value_of_SPEC_LP_token = Queries_class.get_UST_amount_for_LP_deposit(available_SPEC_LP_token_for_withdrawal, Terra_class.Spectrum_SPEC_UST_Pair)
if (value_of_SPEC_LP_token/1000000) > config.SPEC_min_total_value:
# Unstake / withdrawn LP
withdraw_SPEC_from_pool_tx = Transaction_class.withdraw_SPEC_from_pool(available_SPEC_LP_token_for_withdrawal)
@@ -153,13 +161,14 @@ def keep_safe():
if cooldowns.get('withdraw_ANC_from_pool') is None or cooldowns['withdraw_ANC_from_pool'] <= datetime_now:
# Check if there is enough UST balance in the wallet to pay the transaction fees
if wallet_balance['UST'] > general_estimated_tx_fee:
+ available_ANC_LP_token_for_withdrawal = Queries_class.get_available_LP_token_for_withdrawal(Terra_class.anchorFarm, Terra_class.ANC_token)
+ value_of_ANC_LP_token = all_rates['ANC-TOKEN-PER-SHARE'] * available_ANC_LP_token_for_withdrawal * all_rates['ANC']/1000000 \
+ + all_rates['ANC-UST-PER-SHARE'] * available_ANC_LP_token_for_withdrawal
# Check if the min_price for the token has been matched
if (all_rates['ANC']/1000000) > config.ANC_min_price:
# Check if there are any LP for that token available
- available_ANC_LP_token_for_withdrawal = Queries_class.get_available_LP_token_for_withdrawal(Terra_class.anchorFarm, Terra_class.ANC_token)
if available_ANC_LP_token_for_withdrawal > 0:
# Check if the min_withdrawal_limit is exceeded
- value_of_ANC_LP_token = Queries_class.get_UST_amount_for_LP_deposit(available_ANC_LP_token_for_withdrawal, Terra_class.Terraswap_ANC_UST_Pair)
if (value_of_ANC_LP_token/1000000) > config.ANC_min_total_value:
# Unstake / withdrawn LP
withdraw_ANC_from_pool_tx = Transaction_class.withdraw_ANC_from_pool(available_ANC_LP_token_for_withdrawal)
@@ -226,7 +235,7 @@ def keep_safe():
# Check if deposit is enabled
elif config.MIR_claim_and_deposit_in_LP:
# Check if enough UST is available to actually deposit it later
- UST_to_be_deposited_with_MIR = Queries_class.get_UST_amount_for_LP_deposit(claimable_MIR, Terra_class.Mirror_MIR_UST_Pair)
+ UST_to_be_deposited_with_MIR = claimable_MIR * (all_rates['MIR'] + tax_rate)
if wallet_balance['UST'] > UST_to_be_deposited_with_MIR:
# Claim and mark for deposit
claim_MIR_tx = Transaction_class.claim_MIR()
@@ -321,7 +330,7 @@ def keep_safe():
# Check if deposit is enabled
elif config.SPEC_claim_and_deposit_in_LP:
# Check if enough UST is available to actually deposit it later
- UST_to_be_deposited_with_SPEC = Queries_class.get_UST_amount_for_LP_deposit(claimable_SPEC, Terra_class.Spectrum_SPEC_UST_Pair)
+ UST_to_be_deposited_with_SPEC = claimable_SPEC * (all_rates['SPEC'] + tax_rate)
if wallet_balance['UST'] > UST_to_be_deposited_with_SPEC:
# Claim and mark for deposit
claim_SPEC_tx = Transaction_class.claim_SPEC(claimable_SPEC_list)
@@ -415,7 +424,7 @@ def keep_safe():
# Check if deposit is enabled
elif config.ANC_claim_and_deposit_in_LP:
# Check if enough UST is available to actually deposit it later
- UST_to_be_deposited_with_ANC = Queries_class.get_UST_amount_for_LP_deposit(claimable_ANC, Terra_class.Terraswap_ANC_UST_Pair)
+ UST_to_be_deposited_with_ANC = claimable_ANC * (all_rates['ANC'] + tax_rate)
if wallet_balance['UST'] > UST_to_be_deposited_with_ANC:
# Claim and mark for deposit
claim_ANC_tx = Transaction_class.claim_ANC()
@@ -643,7 +652,7 @@ def keep_safe():
MIR_to_be_deposited = wallet_balance['MIR'] - wallet_balance_before['MIR']
if MIR_to_be_deposited > 0:
# Price and min_value has been checked before therefore deposit
- UST_to_be_deposited_with_MIR = Queries_class.get_UST_amount_for_LP_deposit(MIR_to_be_deposited,Terra_class.Mirror_MIR_UST_Pair)
+ UST_to_be_deposited_with_MIR = MIR_to_be_deposited * (all_rates['MIR'] + tax_rate)
deposit_MIR_tx = Transaction_class.deposit_MIR_in_pool(MIR_to_be_deposited, UST_to_be_deposited_with_MIR)
deposit_MIR_tx_status = Queries_class.get_status_of_tx(deposit_MIR_tx)
if deposit_MIR_tx_status == True:
@@ -678,7 +687,7 @@ def keep_safe():
SPEC_to_be_deposited = wallet_balance['SPEC'] - wallet_balance_before['SPEC']
if SPEC_to_be_deposited > 0:
# Price and min_value has been checked before therefore deposit
- UST_to_be_deposited_with_SPEC = Queries_class.get_UST_amount_for_LP_deposit(SPEC_to_be_deposited,Terra_class.Spectrum_SPEC_UST_Pair)
+ UST_to_be_deposited_with_SPEC = SPEC_to_be_deposited * (all_rates['SPEC'] + tax_rate)
deposit_SPEC_tx = Transaction_class.deposit_SPEC_in_pool(SPEC_to_be_deposited, UST_to_be_deposited_with_SPEC)
deposit_SPEC_tx_status = Queries_class.get_status_of_tx(deposit_SPEC_tx)
if deposit_SPEC_tx_status == True:
@@ -714,7 +723,7 @@ def keep_safe():
ANC_to_be_deposited = wallet_balance['ANC'] - wallet_balance_before['ANC']
if ANC_to_be_deposited > 0:
# Price and min_value has been checked before therefore deposit
- UST_to_be_deposited_with_ANC = Queries_class.get_UST_amount_for_LP_deposit(ANC_to_be_deposited,Terra_class.Terraswap_ANC_UST_Pair)
+ UST_to_be_deposited_with_ANC = ANC_to_be_deposited * (all_rates['ANC'] + tax_rate)
deposit_ANC_tx = Transaction_class.deposit_ANC_in_pool(ANC_to_be_deposited, UST_to_be_deposited_with_ANC)
deposit_ANC_tx_status = Queries_class.get_status_of_tx(deposit_ANC_tx)
if deposit_ANC_tx_status == True:
@@ -1022,7 +1031,12 @@ def keep_safe():
if cooldowns.get('Staus_Report_cooldown') is None or cooldowns['Staus_Report_cooldown'] <= datetime_now:
if datetime.strptime(f'{datetime_now:%H:%M}', '%H:%M') > datetime.strptime(config.Status_update_time, '%H:%M'):
- status_update = Notifications_class.generate_status_report_html('text', Anchor_borrow_info, Mirror_position_info)
+ status_update = Notifications_class.generate_status_report_html(
+ 'text',
+ Anchor_borrow_info, Mirror_position_info,
+ claimable_MIR, claimable_SPEC, claimable_ANC, claimable_UST,
+ available_MIR_LP_token_for_withdrawal, available_SPEC_LP_token_for_withdrawal, available_ANC_LP_token_for_withdrawal,
+ all_rates)
# Notify user about status report
if config.Notify_Slack:
Notifications_class.slack_webhook(status_update)
@@ -1034,8 +1048,10 @@ def keep_safe():
f'{config.EMAIL_SUBJECT} Status:',
Notifications_class.generate_status_report_html(
config.Email_format,
- Anchor_borrow_info,
- Mirror_position_info))
+ Anchor_borrow_info, Mirror_position_info,
+ claimable_MIR, claimable_SPEC, claimable_ANC, claimable_UST,
+ available_MIR_LP_token_for_withdrawal, available_SPEC_LP_token_for_withdrawal, available_ANC_LP_token_for_withdrawal,
+ all_rates))
# Cooldown: Write date of today into cooldown dictionary
cooldowns['Staus_Report_cooldown'] = datetime.strptime(f'{date.today()} {config.Status_update_time}', '%Y-%m-%d %H:%M') + timedelta(hours=config.Status_update_frequency)
diff --git a/assets/Notifications.py b/assets/Notifications.py
index 8f91186..8d1da46 100644
--- a/assets/Notifications.py
+++ b/assets/Notifications.py
@@ -63,7 +63,7 @@ def email_notification(self, msg:str):
pass
def report_content_to_HTML(self, report_content):
- return report_content.replace('\n','
')
+ return report_content.replace('\n','\n')
def report_contect_to_Telegram(self, report_content):
pass
@@ -89,7 +89,13 @@ def gmail_notification(self, format:str, subject:str, message:str):
msg['To'] = config.EMAIL_TO
server.send_message(msg)
- def generate_status_report_html(self, format, Anchor_borrow_info, Mirror_position_info):
+ def generate_status_report_html(
+ self,
+ format,
+ Anchor_borrow_info, Mirror_position_info,
+ claimable_MIR, claimable_SPEC, claimable_ANC, claimable_UST,
+ available_MIR_LP_token_for_withdrawal, available_SPEC_LP_token_for_withdrawal, available_ANC_LP_token_for_withdrawal,
+ all_rates):
status_update = ""
@@ -104,7 +110,7 @@ def generate_status_report_html(self, format, Anchor_borrow_info, Mirror_positio
status_update += f'Loan amount: {(Anchor_borrow_info["loan_amount"].__float__()/1000000):.0f} UST\n'
status_update += f'Borrow limit: {(Anchor_borrow_info["borrow_limit"].__float__()/1000000):.0f} UST\n'
status_update += f'Current LTV: {Anchor_borrow_info["cur_col_ratio"].__float__()*100:.0f} %\n'
- status_update += f'If your collateral would lose {Anchor_borrow_info["collateral_loss_to_liq"].__float__()*100:.0f}% you would get liquidated.\n'
+ status_update += f'If your collateral would lose {Anchor_borrow_info["collateral_loss_to_liq"].__float__()*100:.0f} % you would get liquidated.\n'
if len(Mirror_position_info) > 0:
@@ -115,15 +121,35 @@ def generate_status_report_html(self, format, Anchor_borrow_info, Mirror_positio
for position in Mirror_position_info:
status_update += f'Position: {position["position_idx"]} - {position["mAsset_symbol"]}\n'
- status_update += f'Collateral value: {(position["collateral_amount_in_kind"].__float__()/1000000):.0f} {position["collateral_token_denom"]}\n'
- status_update += f'Collateral value: {(position["collateral_amount_in_ust"].__float__()/1000000):.0f} UST\n'
- status_update += f'Shorted Value in UST: {(position["shorted_asset_amount"].__float__()/1000000):.0f} UST\n'
+ status_update += f'Collateral value: {(position["collateral_amount_in_kind"].__float__()/1000000):.0f} {position["collateral_token_denom"]} / {(position["collateral_amount_in_ust"].__float__()/1000000):.0f} UST\n'
+ status_update += f'Shorted value: {(position["shorted_asset_amount"].__float__()/1000000):.0f} UST\n'
status_update += f'Current LTV: {position["cur_col_ratio"].__float__()*100:.0f} %\n'
- status_update += f'If all your collateral loses {(position["collateral_loss_to_liq"].__float__()*100):.0f}%\n'
- status_update += f'or if {position["mAsset_symbol"]} raises by {(position["shorted_mAsset_gain_to_liq"].__float__()*100):.0f}% you would get liquidated.\n'
+ status_update += f'If all your collateral loses {(position["collateral_loss_to_liq"].__float__()*100):.0f} %\n'
+ status_update += f'or if {position["mAsset_symbol"]} raises by {(position["shorted_mAsset_gain_to_liq"].__float__()*100):.0f} % you would get liquidated.\n'
status_update += f'\n'
- status_update +=f'Reserve: In order to increase your LTV by 5% on all positions you would need assets valued {Mirror_position_info[len(Mirror_position_info)-1]["reserve_UST"].__float__()/1000000:.0f} UST. Do you have enough?'
+ status_update +=f'Reserve info: In order to increase your LTV by 5 % on all positions you would need assets valued {Mirror_position_info[len(Mirror_position_info)-1]["reserve_UST"].__float__()/1000000:.0f} UST. Do you have enough?'
+
+ status_update += f'-----------------------------------\n'
+ status_update += f'----------- OTHER INFO ------------\n'
+ status_update += f'-----------------------------------\n'
+
+ status_update += f'Liquidity Pools:\n'
+ status_update += f'MIR-UST: {available_MIR_LP_token_for_withdrawal.__float__()/1000000 * all_rates["MIR-TOKEN-PER-SHARE"].__float__():.2f} MIR ({available_MIR_LP_token_for_withdrawal.__float__()/1000000 * all_rates["MIR-TOKEN-PER-SHARE"].__float__() * all_rates["MIR"].__float__()/1000000:.2f} UST)\n'
+ status_update += f'SPEC-UST: {available_SPEC_LP_token_for_withdrawal.__float__()/1000000 * all_rates["SPEC-TOKEN-PER-SHARE"].__float__():.2f} SPEC ({available_SPEC_LP_token_for_withdrawal.__float__()/1000000 * all_rates["SPEC-TOKEN-PER-SHARE"].__float__() * all_rates["SPEC"].__float__()/1000000:.2f} UST)\n'
+ status_update += f'ANC-UST: {available_ANC_LP_token_for_withdrawal.__float__()/1000000 * all_rates["ANC-TOKEN-PER-SHARE"].__float__():.2f} ANC ({available_ANC_LP_token_for_withdrawal.__float__()/1000000 * all_rates["ANC-TOKEN-PER-SHARE"].__float__() * all_rates["ANC"].__float__()/1000000:.2f} UST)\n'
+ status_update += f'\n'
+ status_update += f'Claimable / staked:\n'
+ status_update += f'MIR: {claimable_MIR.__float__()/1000000:.2f} ({claimable_MIR.__float__()/1000000 * all_rates["MIR"].__float__()/1000000:.2f} UST)\n'
+ status_update += f'SPEC: {claimable_SPEC.__float__()/1000000:.2f} ({claimable_SPEC.__float__()/1000000 * all_rates["SPEC"].__float__()/1000000:.2f} UST)\n'
+ status_update += f'ANC: {claimable_ANC.__float__()/1000000:.2f} ({claimable_ANC.__float__()/1000000 * all_rates["ANC"].__float__()/1000000:.2f} UST)\n'
+ status_update += f'UST: {claimable_UST.__float__()/1000000:.2f}\n'
+ status_update += f'\n'
+ status_update += f'Current price in UST, minimum sell prices in UST, distance:\n'
+ status_update += f'MIR: {all_rates["MIR"].__float__()/1000000:.2f}, {config.MIR_min_price:.2f}, {(config.MIR_min_price / all_rates["MIR"].__float__()/1000000 - 1 ) * 100:.2f} %\n'
+ status_update += f'SPEC: {all_rates["SPEC"].__float__()/1000000:.2f}, {config.SPEC_min_price:.2f}, {(config.SPEC_min_price/ all_rates["SPEC"].__float__()/1000000 - 1 ) * 100:.2f} %\n'
+ status_update += f'ANC: {all_rates["ANC"].__float__()/1000000:.2f}, {config.ANC_min_price:.2f}, {(config.ANC_min_price/ all_rates["ANC"].__float__()/1000000 - 1 ) * 100:.2f} %\n'
+ status_update += f'\n'
elif format.lower() == 'html':
@@ -135,7 +161,7 @@ def generate_status_report_html(self, format, Anchor_borrow_info, Mirror_positio
status_update += f'Loan amount: {(Anchor_borrow_info["loan_amount"].__float__()/1000000):.0f} UST
'
status_update += f'Borrow limit: {(Anchor_borrow_info["borrow_limit"].__float__()/1000000):.0f} UST
'
status_update += f'Current LTV: {Anchor_borrow_info["cur_col_ratio"].__float__()*100:.0f} %
'
- status_update += f'If your collateral would lose {Anchor_borrow_info["collateral_loss_to_liq"].__float__()*100:.0f}% you would get liquidated.
'
+ status_update += f'If your collateral would lose {Anchor_borrow_info["collateral_loss_to_liq"].__float__()*100:.0f} % you would get liquidated.
'
if len(Mirror_position_info) > 0:
@@ -146,13 +172,32 @@ def generate_status_report_html(self, format, Anchor_borrow_info, Mirror_positio
status_update += f'Position: {position["position_idx"]} - {position["mAsset_symbol"]}
'
status_update += f'Collateral value: {(position["collateral_amount_in_kind"].__float__()/1000000):.0f} {position["collateral_token_denom"]}
'
status_update += f'Collateral value: {(position["collateral_amount_in_ust"].__float__()/1000000):.0f} UST
'
- status_update += f'Shorted Value in UST: {(position["shorted_asset_amount"].__float__()/1000000):.0f} UST
'
+ status_update += f'Shorted value in UST: {(position["shorted_asset_amount"].__float__()/1000000):.0f} UST
'
status_update += f'Current LTV: {position["cur_col_ratio"].__float__()*100:.0f} %
'
- status_update += f'If your collateral would lose {(position["collateral_loss_to_liq"].__float__()*100):.0f}%
'
- status_update += f'or if {position["mAsset_symbol"]} would raise by {(position["shorted_mAsset_gain_to_liq"].__float__()*100):.0f}% you would get liquidated.
'
+ status_update += f'If your collateral would lose {(position["collateral_loss_to_liq"].__float__()*100):.0f} %
'
+ status_update += f'or if {position["mAsset_symbol"]} would raise by {(position["shorted_mAsset_gain_to_liq"].__float__()*100):.0f} % you would get liquidated.
'
status_update += f'
'
- status_update += f'Reserve: In order to increase your LTV by 5% on all positions you would need assets valued at {Mirror_position_info[len(Mirror_position_info)-1]["reserve_UST"].__float__()/1000000:.0f} UST. Do you have enough?'
+ status_update += f'Reserve: In order to increase your LTV by 5 % on all positions you would need assets valued at {Mirror_position_info[len(Mirror_position_info)-1]["reserve_UST"].__float__()/1000000:.0f} UST. Do you have enough?'
+
+ status_update += f'Other Info
'
+
+ status_update += f'Liquidity Pools:
'
+ status_update += f'MIR-UST: {available_MIR_LP_token_for_withdrawal.__float__()/1000000 * all_rates["MIR-TOKEN-PER-SHARE"].__float__():.2f} MIR ({available_MIR_LP_token_for_withdrawal.__float__()/1000000 * all_rates["MIR-TOKEN-PER-SHARE"].__float__() * all_rates["MIR"].__float__()/1000000:.2f} UST)
'
+ status_update += f'SPEC-UST: {available_SPEC_LP_token_for_withdrawal.__float__()/1000000 * all_rates["SPEC-TOKEN-PER-SHARE"].__float__():.2f} SPEC ({available_SPEC_LP_token_for_withdrawal.__float__()/1000000 * all_rates["SPEC-TOKEN-PER-SHARE"].__float__() * all_rates["SPEC"].__float__()/1000000:.2f} UST)
'
+ status_update += f'ANC-UST: {available_ANC_LP_token_for_withdrawal.__float__()/1000000 * all_rates["ANC-TOKEN-PER-SHARE"].__float__():.2f} ANC ({available_ANC_LP_token_for_withdrawal.__float__()/1000000 * all_rates["ANC-TOKEN-PER-SHARE"].__float__() * all_rates["ANC"].__float__()/1000000:.2f} UST)
'
+ status_update += f'
'
+ status_update += f'Claimable / staked:
'
+ status_update += f'MIR: {claimable_MIR.__float__()/1000000:.2f} ({claimable_MIR.__float__()/1000000 * all_rates["MIR"].__float__()/1000000:.2f} UST)
'
+ status_update += f'SPEC: {claimable_SPEC.__float__()/1000000:.2f} ({claimable_SPEC.__float__()/1000000 * all_rates["SPEC"].__float__()/1000000:.2f} UST)
'
+ status_update += f'ANC: {claimable_ANC.__float__()/1000000:.2f} ({claimable_ANC.__float__()/1000000 * all_rates["ANC"].__float__()/1000000:.2f} UST)
'
+ status_update += f'UST: {claimable_UST.__float__()/1000000:.2f}
'
+ status_update += f'
'
+ status_update += f'Current price in UST, minimum sell prices in UST, distance:
'
+ status_update += f'MIR: {all_rates["MIR"].__float__()/1000000:.2f}, {config.MIR_min_price:.2f}, {(config.MIR_min_price / (all_rates["MIR"].__float__()/1000000) - 1 ) * 100:.2f} %
'
+ status_update += f'SPEC: {all_rates["SPEC"].__float__()/1000000:.2f}, {config.SPEC_min_price:.2f}, {(config.SPEC_min_price / (all_rates["SPEC"].__float__()/1000000) - 1 ) * 100:.2f} %
'
+ status_update += f'ANC: {all_rates["ANC"].__float__()/1000000:.2f}, {config.ANC_min_price:.2f}, {(config.ANC_min_price / (all_rates["ANC"].__float__()/1000000) - 1 ) * 100:.2f} %
'
+ status_update += f'
'
return status_update
diff --git a/assets/Queries.py b/assets/Queries.py
index bcf225f..c4bdc94 100644
--- a/assets/Queries.py
+++ b/assets/Queries.py
@@ -41,9 +41,24 @@ def get_all_rates(self):
all_rates['aUST'] = Dec(query_result['exchange_rate']) * 1000000
# Update ANC, MIR, SPEC as those prices are critical to be up-to-date
- all_rates['MIR'] = Dec(self.get_swap_price(Terra.Mirror_MIR_UST_Pair) * 1000000)
- all_rates['SPEC'] = Dec(self.get_swap_price(Terra.Spectrum_SPEC_UST_Pair) * 1000000)
- all_rates['ANC'] = Dec(self.get_swap_price(Terra.Terraswap_ANC_UST_Pair) * 1000000)
+
+ MIR_pool_info = self.get_pool_info(Terra.Mirror_MIR_UST_Pair)
+ SPEC_pool_info = self.get_pool_info(Terra.Spectrum_SPEC_UST_Pair)
+ ANC_pool_info = self.get_pool_info(Terra.Terraswap_ANC_UST_Pair)
+
+ all_rates['MIR'] = Dec(MIR_pool_info[1] / MIR_pool_info[0] * 1000000)
+ all_rates['SPEC'] = Dec(SPEC_pool_info[1] / SPEC_pool_info[0] * 1000000)
+ all_rates['ANC'] = Dec(ANC_pool_info[1] / ANC_pool_info[0] * 1000000)
+
+ all_rates['MIR-TOKEN-PER-SHARE'] = Dec(MIR_pool_info[0] / MIR_pool_info[2])
+ all_rates['MIR-UST-PER-SHARE'] = Dec(MIR_pool_info[1] / MIR_pool_info[2])
+
+ all_rates['SPEC-TOKEN-PER-SHARE'] = Dec(SPEC_pool_info[0] / SPEC_pool_info[2])
+ all_rates['SPEC-UST-PER-SHARE'] = Dec(SPEC_pool_info[1] / SPEC_pool_info[2])
+
+ all_rates['ANC-TOKEN-PER-SHARE'] = Dec(ANC_pool_info[0] / ANC_pool_info[2])
+ all_rates['ANC-UST-PER-SHARE'] = Dec(ANC_pool_info[1] / ANC_pool_info[2])
+
return all_rates
def get_fee_estimation(self):
@@ -52,10 +67,7 @@ def get_fee_estimation(self):
fee = estimation.to_data().get('amount')
return Dec(fee)
- def get_swap_price(self, token_UST_pair_address:str):
-
- # Get the terra swap price from the pool
- # https://bombay-lcd.terra.dev/wasm/contracts/terra15cjce08zcmempedxwtce2y44y2ayup8gww3txr/store?query_msg={"pool":{}}
+ def get_pool_info(self, token_UST_pair_address:str):
query = {
"pool": {}
@@ -70,9 +82,10 @@ def get_swap_price(self, token_UST_pair_address:str):
# Otherwise it is the token
else:
token_in_pool = Dec(asset['amount'])
- Swap_price = UST_in_pool / token_in_pool
- return Dec(Swap_price)
+ total_share = Dec(query_result['total_share'])
+
+ return [token_in_pool, UST_in_pool, total_share]
@@ -435,19 +448,10 @@ def get_available_LP_token_for_withdrawal(self, token_farm_address:str, token_ad
if not query_result == []:
for reward_info in query_result['reward_infos']:
if reward_info['asset_token'] == token_address:
- LP_token_available = reward_info['bond_amount']
+ LP_token_available = reward_info['bond_amount']
return Dec(LP_token_available)
- def get_UST_amount_for_LP_deposit(self, token_amount:Dec, token_UST_pair_address:str):
-
- Swap_price = self.get_swap_price(token_UST_pair_address)
- tax_rate = Terra.terra.treasury.tax_rate()
- UST_amount = token_amount * (Swap_price + tax_rate)
-
- return Dec(UST_amount)
-
-
def Anchor_get_max_ltv_ratio(self):
max_ltv_ratio:dict