Ecosystem/basicswap
1
0
Fork 0
mirror of https://github.com/basicswap/basicswap.git synced 2025-01-09 12:19:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

api: Optionally display events with states.

Browse source
This commit is contained in:
tecnovert 2024-11-04 16:13:25 +02:00
parent b43c159dc4
commit 97fcf177a9
No known key found for this signature in database
GPG key ID: 8ED6D8750C4E3F93
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
basicswap/basicswap.py
View file

@ -4524,7 +4524,7 @@ class BasicSwap(BaseApp):
bid.setState(BidStates.XMR_SWAP_FAILED) bid.setState(BidStates.XMR_SWAP_FAILED)
if was_received: if was_received:
if not was_sent: if not was_sent: # Self bids
bid.setState(BidStates.XMR_SWAP_FAILED_REFUNDED) bid.setState(BidStates.XMR_SWAP_FAILED_REFUNDED)
else: else:

16
basicswap/js_server.py
View file

@ -364,7 +364,8 @@ def js_bids(self, url_split, post_string: str, is_json: bool) -> bytes:
bid_id = bytes.fromhex(url_split[3]) bid_id = bytes.fromhex(url_split[3])
assert (len(bid_id) == 28) assert (len(bid_id) == 28)
show_txns = False show_txns: bool = False
with_events: bool = False
if post_string != '': if post_string != '':
post_data = getFormData(post_string, is_json) post_data = getFormData(post_string, is_json)
if have_data_entry(post_data, 'accept'): if have_data_entry(post_data, 'accept'):
@ -376,6 +377,8 @@ def js_bids(self, url_split, post_string: str, is_json: bool) -> bytes:
if have_data_entry(post_data, 'show_extra'): if have_data_entry(post_data, 'show_extra'):
show_txns = True show_txns = True
if have_data_entry(post_data, 'with_events'):
with_events = True
bid, xmr_swap, offer, xmr_offer, events = swap_client.getXmrBidAndOffer(bid_id) bid, xmr_swap, offer, xmr_offer, events = swap_client.getXmrBidAndOffer(bid_id)
assert (bid), 'Unknown bid ID' assert (bid), 'Unknown bid ID'
@ -389,6 +392,17 @@ def js_bids(self, url_split, post_string: str, is_json: bool) -> bytes:
if len(url_split) > 4 and url_split[4] == 'states': if len(url_split) > 4 and url_split[4] == 'states':
old_states = listOldBidStates(bid) old_states = listOldBidStates(bid)
if with_events:
new_list = []
for entry in old_states:
entry_list = list(entry)
entry_list.insert(1, 'state')
new_list.append(entry_list)
for event in events:
new_list.append([event['at'], 'event', event['desc']])
old_states = sorted(new_list, key=lambda x: x[0])
return bytes(json.dumps(old_states), 'UTF-8') return bytes(json.dumps(old_states), 'UTF-8')
edit_bid = False edit_bid = False