Fix key offsets being offsets, not indices

observer.py

@@ -403,14 +403,17 @@ def show_tx(txid, more_details=False):
         # The "extra" field is retardedly in per-byte values, convert it to a hex string:
         tx['info']['extra'] = bytes_to_hex(tx['info']['extra'])
 
-    koffset_info = {} # { amount => { keyoffset => {output-info} } }
+    kindex_info = {} # { amount => { keyindex => {output-info} } }
     block_info_req = None
     if 'vin' in tx['info']:
         if len(tx['info']['vin']) == 1 and 'gen' in tx['info']['vin'][0]:
             tx['coinbase'] = True
         elif tx['info']['vin'] and config.enable_mixins_details:
             # Load output details for all outputs contained in the inputs
-            outs_req = [{"amount":inp['key']['amount'], "index":koff} for inp in tx['info']['vin'] for koff in inp['key']['key_offsets']]
+            outs_req = []
+            for inp in tx['info']['vin']:
+                inp['key']['key_indices'] = [sum(inp['key']['key_offsets'][0:(x+1)]) for x in range(len(inp['key']['key_offsets']))]
+            outs_req = [{"amount":inp['key']['amount'], "index":ki} for inp in tx['info']['vin'] for ki in inp['key']['key_indices']]
             outputs = FutureJSON(lmq, lokid, 'rpc.get_outs', args={
                 'get_txid': True,
                 'outputs': outs_req,
@@ -424,10 +427,10 @@ def show_tx(txid, more_details=False):
                 i = 0
                 for inp in tx['info']['vin']:
                     amount = inp['key']['amount']
-                    if amount not in koffset_info:
-                        koffset_info[amount] = {}
-                    ki = koffset_info[amount]
-                    for ko in inp['key']['key_offsets']:
+                    if amount not in kindex_info:
+                        kindex_info[amount] = {}
+                    ki = kindex_info[amount]
+                    for ko in inp['key']['key_indices']:
                         ki[ko] = outputs[i]
                         i += 1
 
@@ -450,7 +453,7 @@ def show_tx(txid, more_details=False):
     return flask.render_template('tx.html',
             info=info.get(),
             tx=tx,
-            koffset_info=koffset_info,
+            kindex_info=kindex_info,
             block_info=block_info,
             **more_details,
             )

static/style.css

@@ -367,3 +367,6 @@ span.icon {
     max-width: 1000px;
     margin: auto;
 }
+tr.tx-input-key-image>td {
+    padding-top: 1.5em;
+}

templates/tx.html

@@ -531,7 +531,7 @@
       <div class="tx-inputs">
         <table class="Table">
           {%for inp in tx.info.vin if 'key' in inp%}
-            <tr>
+            <tr class="tx-input-key-image">
               <td style="text-align: left;" colspan="2">
                 <label>Key Image {{loop.index0}}:</label> {{inp.key.k_image}}
                 {#FIXME:#}
@@ -555,9 +555,8 @@
                 <td>Block</td>
                 <td>Timestamp (UTC)</td>
               </tr>
-              {%for koffset in inp.key.key_offsets%}
-                {%set oinfo = koffset_info[inp.key.amount][koffset]%}
-                {%if oinfo.height in binfo%}
+              {%for kindex in inp.key.key_indices%}
+                {%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>
@@ -573,7 +572,6 @@
                       ({{(binfo.timestamp|from_timestamp - server.datetime) | reltime}})
                     </td>
                   </tr>
-                {%endif%}
               {%endfor%}
             {%endif%}
           {%endfor%}
@@ -589,7 +587,7 @@
       {{details_html | safe}}
     {%else%}
       <h5>
-        <a href="/tx/{{tx.tx_hash}}/1">Show raw details</a>
+        <a href="/tx/{{tx.tx_hash}}/1#more_details">Show raw details</a>
       </h5>
     {%endif%}