midefos/basicswap
1
0
Fork 0
mirror of https://github.com/basicswap/basicswap.git synced 2025-11-05 18:38:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix js_active amounts for reverse bids.

Browse Source
This commit is contained in:
tecnovert
2025-04-29 19:48:49 +02:00
parent e7af4f9005
commit 48bfdb7462
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
basicswap/js_server.py
View File

@@ -999,6 +999,16 @@ def js_active(self, url_split, post_string, is_json) -> bytes:
try: try:
for bid_id, (bid, offer) in list(swap_client.swaps_in_progress.items()): for bid_id, (bid, offer) in list(swap_client.swaps_in_progress.items()):
try: try:
ci_from = swap_client.ci(offer.coin_from)
ci_to = swap_client.ci(offer.coin_to)
if offer.bid_reversed:
amount_from: int = bid.amount_to
amount_to: int = bid.amount
bid_rate: int = ci_from.make_int(amount_to / amount_from, r=1)
else:
amount_from: int = bid.amount
amount_to: int = bid.amount_to
bid_rate: int = bid.rate
swap_data = { swap_data = {
"bid_id": bid_id.hex(), "bid_id": bid_id.hex(),
"offer_id": offer.offer_id.hex(), "offer_id": offer.offer_id.hex(),
@@ -1007,14 +1017,11 @@ def js_active(self, url_split, post_string, is_json) -> bytes:
"bid_state": strBidState(bid.state), "bid_state": strBidState(bid.state),
"tx_state_a": None, "tx_state_a": None,
"tx_state_b": None, "tx_state_b": None,
"coin_from": swap_client.ci(offer.coin_from).coin_name(), "coin_from": ci_from.coin_name(),
"coin_to": swap_client.ci(offer.coin_to).coin_name(), "coin_to": ci_to.coin_name(),
"amount_from": swap_client.ci(offer.coin_from).format_amount( "amount_from": ci_from.format_amount(amount_from),
bid.amount "amount_to": ci_to.format_amount(amount_to),
), "rate": bid_rate,
"amount_to": swap_client.ci(offer.coin_to).format_amount(
bid.amount_to
),
"addr_from": bid.bid_addr if bid.was_received else offer.addr_from, "addr_from": bid.bid_addr if bid.was_received else offer.addr_from,
} }
@@ -1033,9 +1040,6 @@ def js_active(self, url_split, post_string, is_json) -> bytes:
swap_data["tx_state_a"] = bid.getITxState() swap_data["tx_state_a"] = bid.getITxState()
swap_data["tx_state_b"] = bid.getPTxState() swap_data["tx_state_b"] = bid.getPTxState()
if hasattr(bid, "rate"):
swap_data["rate"] = bid.rate
all_bids.append(swap_data) all_bids.append(swap_data)
except Exception: except Exception: