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

New bids pages + various fixes. (#266)

Browse Source 
* New bids pages + various fixes.

* LINT

* Fix styling.
This commit is contained in:
Gerlof van Ek
2025-02-22 16:55:12 +01:00
committed by GitHub
parent f1c2b41714
commit 97bb615176
12 changed files with 2851 additions and 640 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
basicswap/js_server.py
View File

@@ -15,6 +15,7 @@ from .util import (
)
from .basicswap_util import (
strBidState,
strTxState,
SwapTypes,
NotificationTypes as NT,
)
@@ -320,18 +321,36 @@ def formatBids(swap_client, bids, filters) -> bytes:
with_extra_info = filters.get("with_extra_info", False)
rv = []
for b in bids:
ci_from = swap_client.ci(b[9])
offer = swap_client.getOffer(b[3])
ci_to = swap_client.ci(offer.coin_to) if offer else None
amount_to = None
if ci_to:
amount_to = ci_to.format_amount(
(b[4] * b[10]) // ci_from.COIN()
)
bid_data = {
"bid_id": b[2].hex(),
"offer_id": b[3].hex(),
"created_at": b[0],
"expire_at": b[1],
"coin_from": b[9],
"amount_from": swap_client.ci(b[9]).format_amount(b[4]),
"coin_from": ci_from.coin_name(),
"coin_to": ci_to.coin_name() if ci_to else "Unknown",
"amount_from": ci_from.format_amount(b[4]),
"amount_to": amount_to,
"bid_rate": swap_client.ci(b[14]).format_amount(b[10]),
"bid_state": strBidState(b[5]),
"addr_from": b[11],
"addr_to": offer.addr_to if offer else None
}
if with_extra_info:
bid_data["addr_from"] = b[11]
bid_data.update({
"tx_state_a": strTxState(b[7]),
"tx_state_b": strTxState(b[8])
})
rv.append(bid_data)
return bytes(json.dumps(rv), "UTF-8")