ui: add tx & script version to tx details

decred · Sep 17, 2021 · df93ebc · df93ebc
1 parent 551a7eb
commit df93ebc
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 14 deletions.
diff --git a/cmd/dcrdata/views/tx.tmpl b/cmd/dcrdata/views/tx.tmpl
@@ -228,26 +228,24 @@
                   {{end}}
               {{end}}
               <tr>
-                <td class="text-right medium-sans text-nowrap pr-2 py-2"
-                  >Raw Tx:
-                </td>
-                <td class="text-left py-1 text-secondary"><a
-                  href="/api/tx/decoded/{{.TxID}}?indent=true" data-turbolinks="false">decoded</a> &middot; <a
-                  href="/api/tx/hex/{{.TxID}}" data-turbolinks="false">hex</a>
-                </td>
-                <td class="text-right medium-sans text-nowrap pr-2 py-2"
-                  >Time:
+                <td class="text-right medium-sans text-nowrap pr-2 py-2">Tx Raw: </td>
+                <td class="text-left py-1 text-secondary">
+                  <a href="/api/tx/decoded/{{.TxID}}?indent=true" data-turbolinks="false">decoded</a> &middot;
+                  <a href="/api/tx/hex/{{.TxID}}" data-turbolinks="false">hex</a>
                 </td>
+                <td class="text-right medium-sans text-nowrap pr-2 py-2">Time: </td>
                 <td class="text-left py-1 text-secondary" data-target="tx.formattedAge">{{.Time.String}}</td>
               </tr>
               <tr>
-                <td class="text-right medium-sans text-nowrap pr-2 py-2"
-                  >Size:
-                </td>
-                <td class="text-left py-1 text-secondary">{{.FormattedSize}}</td>
-                <td class="text-right medium-sans text-nowrap pr-2 py-2">Rate:</td>
+                <td class="text-right medium-sans text-nowrap pr-2 py-2">Tx Version: </td>
+                <td class="text-left py-1 text-secondary">{{.TxVersion}}</td>
+                <td class="text-right medium-sans text-nowrap pr-2 py-2">Rate: </td>
                 <td class="text-left py-1 text-secondary">{{.FeeRate}}/kB</td>
               </tr>
+              <tr>
+                <td class="text-right medium-sans text-nowrap pr-2 py-2">Size: </td>
+                <td class="text-left py-1 text-secondary">{{.FormattedSize}}</td>
+              </tr>
               {{if $.SwapsFound}}
                 <tr>
                   <td class="text-right medium-sans text-nowrap pr-2 py-2"
@@ -362,6 +360,7 @@
                     <th class="shrink-to-fit">#</th>
                     <th class="addr-hash-column"><div class="pl-1">Address</div></th>
                     <th class="text-left shrink-to-fit">Type</th>
+                    <th class="text-left shrink-to-fit">Version</th>
                     <th class="text-left shrink-to-fit">Spent</th>
                     <th class="text-right shrink-to-fit">DCR</th>
                   </tr>
@@ -396,6 +395,9 @@
                         <td class="fs13 break-word shrink-to-fit">
                             {{.Type}}
                         </td>
+                        <td class="fs13 break-word shrink-to-fit">
+                            {{$v.Version}}
+                        </td>
                         <td class="text-left fs13 shrink-to-fit">{{with $spending := (index $.Data.SpendingTxns $i) }}
                             {{if $spending.Hash}}
                                 <a href="/tx/{{$spending.Hash}}/in/{{$spending.Index}}">{{$v.Spent}}</a>

diff --git a/db/dcrpg/pgblockchain.go b/db/dcrpg/pgblockchain.go
@@ -5712,6 +5712,7 @@ func (pgb *ChainDB) GetExplorerTx(txid string) *exptypes.TxInfo {
 	txBasic, txType := makeExplorerTxBasic(txraw, ticketPrice, msgTx, pgb.chainParams)
 	tx := &exptypes.TxInfo{
 		TxBasic:       txBasic,
+		TxVersion:     txraw.Version,
 		BlockHeight:   txraw.BlockHeight,
 		BlockIndex:    txraw.BlockIndex,
 		BlockHash:     txraw.BlockHash,
@@ -5845,6 +5846,7 @@ func (pgb *ChainDB) GetExplorerTx(txid string) *exptypes.TxInfo {
 			Type:            vout.ScriptPubKey.Type,
 			Spent:           txout == nil,
 			Index:           vout.N,
+			Version:         vout.Version,
 		})
 	}
 	tx.Vout = outputs

diff --git a/explorer/types/explorertypes.go b/explorer/types/explorertypes.go
@@ -173,6 +173,7 @@ type TrimmedTxInfo struct {
 // TxInfo models data needed for display on the tx page
 type TxInfo struct {
 	*TxBasic
+	TxVersion        int32
 	SpendingTxns     []TxInID
 	Vin              []Vin
 	Vout             []Vout
@@ -427,6 +428,7 @@ type Vout struct {
 	OP_RETURN       string
 	OP_TADD         bool
 	Index           uint32
+	Version         uint16
 }
 
 // TrimmedBlockInfo models data needed to display block info on the new home page