oxen-io
/
oxen-observer
mirror of https://github.com/oxen-io/oxen-observer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Misc. fixes

This commit is contained in:
Jason Rhinelander 2020-09-15 18:41:45 -03:00
parent b78b8740cd
commit ae39cccb8b
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
templates/include/mempool.html
View File

@ -28,8 +28,13 @@
<td title="{{tx.receive_time | from_timestamp | format_datetime}}">{{tx.receive_time | from_timestamp | ago}}</td>
<td>{{symbol.display(tx)}}</td>
<td><a href="/tx/{{tx.id_hash}}">{{tx.id_hash}}</a></td>
<td>{{fee.display(tx)}} /
{{(tx.info.rct_signatures.txnFee * 1000 / tx.blob_size) | loki(tag=false, decimals=4)}}</td>
<td>
{%if 'rct_signatures' in tx.info%}
{{fee.display(tx)}} / {{(tx.info.rct_signatures.txnFee * 1000 / tx.blob_size) | loki(tag=false, decimals=4)}}
{%else%}
N/A
{%endif%}
</td>
<td>{{tx.info.vin | length}}/{{tx.info.vout | length}}</td>
<td>{{tx.blob_size | si}}B</td>
</tr>
@ -39,7 +44,7 @@
{% if mempool.transactions|length > mempool_limit %}
<div class="center" style="text-align: center; margin-bottom: 10px">
<a href="/txpool">Only {{mempool_limit}}/{{len(mempool.transactions)}} transactions shown. Click here to see all of them</a>
<a href="/txpool">Only {{mempool_limit}}/{{mempool.transactions | length}} transactions shown. Click here to see all of them</a>
</div>
{% endif %}

16
templates/tx.html
View File

@ -53,7 +53,7 @@
{# FIXME - if in mempool then link to mempool page instead #}
<span><label>Fee (Per kB):</label>
{%if tx.coinbase%}
{%if tx.coinbase or 'rct_signatures' not in tx.info%}
N/A
{%else%}
{% import 'include/tx_fee.html' as fee %}
@ -64,7 +64,7 @@
<span title="{{tx.size}} bytes"><label>TX Size:</label> {{tx.size|si}}B</span>
<span><label>No. Confirmations:</label> {%if 'block_height' in tx%}{{info.height - tx.block_height}}{%else%}None (in mempool){%endif%}</span>
<span><label>RingCT/RingCT Type:</label> {%if tx.info.version >= 2 and not tx.coinbase%}Yes/{{tx.info.rct_signatures.type}}{%else%}No{%endif%}</span>
<span><label>RingCT/RingCT Type:</label> {%if tx.info.version >= 2 and 'rct_signatures' in tx.info and not tx.coinbase%}Yes/{{tx.info.rct_signatures.type}}{%else%}No{%endif%}</span>
{%if tx.coinbase and tx.extra.sn_winner%}
<span><label>Service Node Winner:</label>
@ -556,7 +556,8 @@
<td>Timestamp (UTC)</td>
</tr>
{%for kindex in inp.key.key_indices%}
{%set oinfo = kindex_info[inp.key.amount][kindex]%}
{%if inp.key.amount in kindex_info and kindex in kindex_info[inp.key.amount]%}
{%set oinfo = kindex_info[inp.key.amount][kindex]%}
{%set binfo = block_info[oinfo.height]%}
<tr>
<td><label>- {{loop.index0}}:</label> <a href="/tx/{{oinfo.txid}}">{{oinfo.key}}</a></td>
@ -572,6 +573,15 @@
({{(binfo.timestamp|from_timestamp - server.datetime) | reltime}})
</td>
</tr>
{%else%}
<tr>
<td title="This transaction references outputs that do not exist on the blockchain, possibly as a result of a reorganization">
<label>- {{loop.index0}}:</label> Unknown output ({%if inp.key.amount != 0%}amount {{inp.key.amount}}, {%endif%}index {{kindex}})
</td>
<td></td>
<td></td>
</tr>
{%endif%}
{%endfor%}
{%endif%}
{%endfor%}