mirror of
https://github.com/basicswap/basicswap.git
synced 2024-12-23 03:49:25 +00:00
ui: Display shared address for XMR swaps.
This commit is contained in:
parent
d392193d7e
commit
2562aec4bd
4 changed files with 11 additions and 1 deletions
|
@ -1,3 +1,3 @@
|
||||||
name = "basicswap"
|
name = "basicswap"
|
||||||
|
|
||||||
__version__ = "0.0.20"
|
__version__ = "0.0.21"
|
||||||
|
|
|
@ -60,6 +60,9 @@
|
||||||
<input type="hidden" name="formid" value="{{ form_id }}">
|
<input type="hidden" name="formid" value="{{ form_id }}">
|
||||||
|
|
||||||
{% if data.show_txns %}
|
{% if data.show_txns %}
|
||||||
|
{% if data.xmr_b_shared_address %}
|
||||||
|
<p>Shared Address: {{ data.xmr_b_shared_address }}</p>
|
||||||
|
{% endif %}
|
||||||
<h4>Transactions</h4>
|
<h4>Transactions</h4>
|
||||||
<table>
|
<table>
|
||||||
<tr><th>Tx Type</th><th>Tx ID</th><th>Blocks Deep</th></tr>
|
<tr><th>Tx Type</th><th>Tx ID</th><th>Blocks Deep</th></tr>
|
||||||
|
|
|
@ -219,6 +219,8 @@ def describeBid(swap_client, bid, xmr_swap, offer, xmr_offer, bid_events, edit_b
|
||||||
continue
|
continue
|
||||||
txns.append({'type': strTxType(tx_type), 'txid': tx.txid.hex()})
|
txns.append({'type': strTxType(tx_type), 'txid': tx.txid.hex()})
|
||||||
data['txns'] = txns
|
data['txns'] = txns
|
||||||
|
|
||||||
|
data['xmr_b_shared_address'] = ci_to.encodeSharedAddress(xmr_swap.pkbv, xmr_swap.pkbs) if xmr_swap.pkbs else None
|
||||||
else:
|
else:
|
||||||
data['initiate_tx_refund'] = 'None' if not bid.initiate_txn_refund else bid.initiate_txn_refund.hex()
|
data['initiate_tx_refund'] = 'None' if not bid.initiate_txn_refund else bid.initiate_txn_refund.hex()
|
||||||
data['participate_tx_refund'] = 'None' if not bid.participate_txn_refund else bid.participate_txn_refund.hex()
|
data['participate_tx_refund'] = 'None' if not bid.participate_txn_refund else bid.participate_txn_refund.hex()
|
||||||
|
|
|
@ -1,3 +1,8 @@
|
||||||
|
0.0.21
|
||||||
|
==============
|
||||||
|
- Raised Particl and Monero daemon versions.
|
||||||
|
- Display shared address on bid page if show more info is enabled.
|
||||||
|
|
||||||
|
|
||||||
0.0.6
|
0.0.6
|
||||||
==============
|
==============
|
||||||
|
|
Loading…
Reference in a new issue