|
|
|
@ -75,14 +75,12 @@ class Transactions(object):
|
|
|
|
|
|
|
|
|
|
self.log.info("Transaction processed: {formatted}", formatted=dumps(to_store, indent=2))
|
|
|
|
|
r.hmset(f"tx.{txid}", to_store)
|
|
|
|
|
self.irc.client.msg(
|
|
|
|
|
self.irc.client.channel, f"AUTO Incoming transaction: {amount}{currency} ({reference}) - {state} - {description}"
|
|
|
|
|
)
|
|
|
|
|
self.irc.sendmsg(f"AUTO Incoming transaction: {amount}{currency} ({reference}) - {state} - {description}")
|
|
|
|
|
# Try getting the trade by the reference ID given
|
|
|
|
|
stored_trade = self.get_ref(reference)
|
|
|
|
|
if not stored_trade:
|
|
|
|
|
self.log.info(f"No reference in DB for {reference}", reference=reference)
|
|
|
|
|
self.irc.client.msg(self.irc.client.channel, f"No reference in DB for {reference}")
|
|
|
|
|
self.irc.sendmsg(f"No reference in DB for {reference}")
|
|
|
|
|
return
|
|
|
|
|
|
|
|
|
|
amount = float(amount)
|
|
|
|
@ -90,30 +88,25 @@ class Transactions(object):
|
|
|
|
|
|
|
|
|
|
# Make sure it was sent in the expected currency
|
|
|
|
|
if not stored_trade["currency"] == currency:
|
|
|
|
|
self.irc.client.msg(self.irc.client.channel, f"Currency mismatch, Agora: {stored_trade['currency']} / Revolut: {currency}")
|
|
|
|
|
self.irc.sendmsg(f"Currency mismatch, Agora: {stored_trade['currency']} / Revolut: {currency}")
|
|
|
|
|
return
|
|
|
|
|
|
|
|
|
|
# Make sure the expected amount was sent
|
|
|
|
|
if not stored_trade["amount"] == amount:
|
|
|
|
|
# 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)
|
|
|
|
|
self.irc.client.msg(
|
|
|
|
|
self.irc.client.channel, f"Amount does not match exactly, trying with margins: min: {min_amount} / max: {max_amount}"
|
|
|
|
|
)
|
|
|
|
|
self.irc.sendmsg(f"Amount does not match exactly, trying with margins: min: {min_amount} / max: {max_amount}")
|
|
|
|
|
if not min_amount < stored_trade["amount"] < max_amount:
|
|
|
|
|
self.irc.client.msg(
|
|
|
|
|
self.irc.client.channel,
|
|
|
|
|
f"Amount mismatch - not in margins: {stored_trade['amount']} (min: {min_amount} / max: {max_amount}",
|
|
|
|
|
)
|
|
|
|
|
self.irc.sendmsg(f"Amount mismatch - not in margins: {stored_trade['amount']} (min: {min_amount} / max: {max_amount}")
|
|
|
|
|
return
|
|
|
|
|
# Make sure the account type was Revolut, as these are completed instantly
|
|
|
|
|
if not account_type == "revolut":
|
|
|
|
|
self.irc.client.msg(self.irc.client.channel, f"Account type is not Revolut: {account_type}")
|
|
|
|
|
self.irc.sendmsg(f"Account type is not Revolut: {account_type}")
|
|
|
|
|
return
|
|
|
|
|
self.irc.client.msg(self.irc.client.channel, f"All checks passed, releasing funds for {stored_trade['id']} / {reference}")
|
|
|
|
|
self.irc.sendmsg(f"All checks passed, releasing funds for {stored_trade['id']} / {reference}")
|
|
|
|
|
rtrn = self.agora.release_funds(stored_trade["id"])
|
|
|
|
|
self.agora.agora.contact_message_post(stored_trade["id"], "Thanks! Releasing now :)")
|
|
|
|
|
self.irc.client.msg(self.irc.client.channel, dumps(rtrn))
|
|
|
|
|
self.irc.sendmsg(dumps(rtrn))
|
|
|
|
|
|
|
|
|
|
def new_trade(self, trade_id, buyer, currency, amount, amount_xmr):
|
|
|
|
|
"""
|
|
|
|
@ -123,8 +116,6 @@ class Transactions(object):
|
|
|
|
|
reference = "".join(choices(ascii_uppercase, k=5))
|
|
|
|
|
reference = f"XMR-{reference}"
|
|
|
|
|
existing_ref = r.get(f"trade.{trade_id}.reference")
|
|
|
|
|
# if existing_ref:
|
|
|
|
|
# self.irc.client.msg(self.irc.client.channel, f"Existing reference for {trade_id}: {existing_ref.decode('utf-8')}")
|
|
|
|
|
if not existing_ref:
|
|
|
|
|
r.set(f"trade.{trade_id}.reference", reference)
|
|
|
|
|
to_store = {
|
|
|
|
@ -137,7 +128,7 @@ class Transactions(object):
|
|
|
|
|
}
|
|
|
|
|
self.log.info("Storing trade information: {info}", info=str(to_store))
|
|
|
|
|
r.hmset(f"trade.{reference}", to_store)
|
|
|
|
|
self.irc.client.msg(self.irc.client.channel, f"Generated reference for {trade_id}: {reference}")
|
|
|
|
|
self.irc.sendmsg(f"Generated reference for {trade_id}: {reference}")
|
|
|
|
|
if settings.Agora.Send == "1":
|
|
|
|
|
self.agora.agora.contact_message_post(trade_id, f"Hi! When sending the payment please use reference code: {reference}")
|
|
|
|
|
if existing_ref:
|
|
|
|
|