|
|
@ -194,7 +194,7 @@ class Transactions(object):
|
|
|
|
if currency == "USD":
|
|
|
|
if currency == "USD":
|
|
|
|
amount_usd = amount
|
|
|
|
amount_usd = amount
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
rates = self.agora.get_rates_all()
|
|
|
|
rates = self.money.get_rates_all()
|
|
|
|
amount_usd = amount / rates[currency]
|
|
|
|
amount_usd = amount / rates[currency]
|
|
|
|
# Amount is reliable here as it is checked by find_trade, so no need for stored_trade["amount"]
|
|
|
|
# Amount is reliable here as it is checked by find_trade, so no need for stored_trade["amount"]
|
|
|
|
if float(amount_usd) > float(settings.Agora.AcceptableAltLookupUSD):
|
|
|
|
if float(amount_usd) > float(settings.Agora.AcceptableAltLookupUSD):
|
|
|
@ -230,7 +230,7 @@ class Transactions(object):
|
|
|
|
if looked_up_without_reference:
|
|
|
|
if looked_up_without_reference:
|
|
|
|
return
|
|
|
|
return
|
|
|
|
# If the amount does not match exactly, get the min and max values for our given acceptable margins for trades
|
|
|
|
# If the amount does not match exactly, get the min and max values for our given acceptable margins for trades
|
|
|
|
min_amount, max_amount = self.agora.get_acceptable_margins(currency, amount)
|
|
|
|
min_amount, max_amount = self.money.get_acceptable_margins(currency, amount)
|
|
|
|
self.log.info(
|
|
|
|
self.log.info(
|
|
|
|
"Amount does not match exactly, trying with margins: min: {min_amount} / max: {max_amount}",
|
|
|
|
"Amount does not match exactly, trying with margins: min: {min_amount} / max: {max_amount}",
|
|
|
|
min_amount=min_amount,
|
|
|
|
min_amount=min_amount,
|
|
|
@ -510,7 +510,7 @@ class Transactions(object):
|
|
|
|
total_usd = total_usd_agora + total_usd_revolut
|
|
|
|
total_usd = total_usd_agora + total_usd_revolut
|
|
|
|
|
|
|
|
|
|
|
|
# Convert the total USD price to GBP and SEK
|
|
|
|
# Convert the total USD price to GBP and SEK
|
|
|
|
rates = self.agora.get_rates_all()
|
|
|
|
rates = self.money.get_rates_all()
|
|
|
|
price_sek = rates["SEK"] * total_usd
|
|
|
|
price_sek = rates["SEK"] * total_usd
|
|
|
|
price_usd = total_usd
|
|
|
|
price_usd = total_usd
|
|
|
|
price_gbp = rates["GBP"] * total_usd
|
|
|
|
price_gbp = rates["GBP"] * total_usd
|
|
|
@ -599,7 +599,7 @@ class Transactions(object):
|
|
|
|
if dash is False:
|
|
|
|
if dash is False:
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
|
|
|
|
|
|
|
|
rates = self.agora.get_rates_all()
|
|
|
|
rates = self.money.get_rates_all()
|
|
|
|
cumul_usd = 0
|
|
|
|
cumul_usd = 0
|
|
|
|
for contact_id, contact in dash.items():
|
|
|
|
for contact_id, contact in dash.items():
|
|
|
|
# We need created at in order to look up the historical prices
|
|
|
|
# We need created at in order to look up the historical prices
|
|
|
|