XF/pluto
XF
/
pluto
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Libraries refactor and add some sinks #4

Closed
m wants to merge 136 commits from library-refactor into master
pull from: library-refactor
merge into: XF:master
Conversation 1 Commits 136 Files Changed 23 +8 -4
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c6926388d9 - Show all commits

8
handler/agora.py
View File

@ -130,9 +130,10 @@ class Agora(object):
elif asset == "BTC": elif asset == "BTC":
amount_crypto = contact["data"]["amount_btc"] amount_crypto = contact["data"]["amount_btc"]
currency = contact["data"]["currency"] currency = contact["data"]["currency"]
provider = contact["data"]["advertisement"]["payment_method"]
if not contact["data"]["is_selling"]: if not contact["data"]["is_selling"]:
continue continue
rtrn.append(f"{reference}: {buyer} {amount}{currency} {amount_crypto}{asset}") rtrn.append(f"{reference}: {buyer} {amount}{currency} {provider} {amount_crypto}{asset}")
return rtrn return rtrn
def dashboard_hook(self, dash): def dashboard_hook(self, dash):
@ -152,6 +153,7 @@ class Agora(object):
buyer = contact["data"]["buyer"]["username"] buyer = contact["data"]["buyer"]["username"]
amount = contact["data"]["amount"] amount = contact["data"]["amount"]
asset = contact["data"]["advertisement"]["asset"] asset = contact["data"]["advertisement"]["asset"]
provider = contact["data"]["advertisement"]["payment_method"]
if asset == "XMR": if asset == "XMR":
amount_crypto = contact["data"]["amount_xmr"] amount_crypto = contact["data"]["amount_xmr"]
elif asset == "BTC": elif asset == "BTC":
@ -160,12 +162,12 @@ class Agora(object):
if not contact["data"]["is_selling"]: if not contact["data"]["is_selling"]:
continue continue
if reference not in self.last_dash: if reference not in self.last_dash:
reference = self.tx.new_trade(asset, contact_id, buyer, currency, amount, amount_crypto) reference = self.tx.new_trade(asset, contact_id, buyer, currency, amount, amount_crypto, provider)
if reference: if reference:
if reference not in current_trades: if reference not in current_trades:
current_trades.append(reference) current_trades.append(reference)
# Let us know there is a new trade # Let us know there is a new trade
self.irc.sendmsg(f"AUTO {reference}: {buyer} {amount}{currency} {amount_crypto}{asset}") self.irc.sendmsg(f"AUTO {reference}: {buyer} {amount}{currency} {provider} {amount_crypto}{asset}")
# Note that we have seen this reference # Note that we have seen this reference
self.last_dash.add(reference) self.last_dash.add(reference)

4
handler/transactions.py
View File

@ -45,6 +45,7 @@ class Transactions(object):
if not stored_trade: if not stored_trade:
self.log.error("Could not find entry in DB for typeless transaction: {id}", id=txid) self.log.error("Could not find entry in DB for typeless transaction: {id}", id=txid)
return return
print("BEFORE CONVERT STORED TRADE", stored_trade)
stored_trade = convert(stored_trade) stored_trade = convert(stored_trade)
if "old_state" in inside: if "old_state" in inside:
if "new_state" in inside: if "new_state" in inside:
@ -240,7 +241,7 @@ class Transactions(object):
message_long = rtrn["response"]["data"]["message"] message_long = rtrn["response"]["data"]["message"]
self.irc.sendmsg(f"{message} - {message_long}") self.irc.sendmsg(f"{message} - {message_long}")
def new_trade(self, asset, trade_id, buyer, currency, amount, amount_crypto): def new_trade(self, asset, trade_id, buyer, currency, amount, amount_crypto, provider):
""" """
Called when we have a new trade in Agora. Called when we have a new trade in Agora.
Store details in Redis, generate a reference and optionally let the customer know the reference. Store details in Redis, generate a reference and optionally let the customer know the reference.
@ -258,6 +259,7 @@ class Transactions(object):
"amount": amount, "amount": amount,
"amount_crypto": amount_crypto, "amount_crypto": amount_crypto,
"reference": reference, "reference": reference,
"provider": provider,
} }
self.log.info("Storing trade information: {info}", info=str(to_store)) self.log.info("Storing trade information: {info}", info=str(to_store))
r.hmset(f"trade.{reference}", to_store) r.hmset(f"trade.{reference}", to_store)