review changes: Make /mempool tx col match /blocks tx col

Signed-off-by: Philemon Ukane <ukanephilemon@gmail.com>

Author: ukane-philemon

cmd/dcrdata/views/mempool.tmpl

@@ -231,8 +231,8 @@
                             <tr>
                               <th>Transaction ID</th>
                               <th class="text-end">Total DCR</th>
-                              <th class="text-end">Size</th>
                               <th class="text-end">Fee Rate</th>
+                              <th class="text-end">Size</th>
                               <th class="text-end">Time in Mempool</th>
                             </tr>
                           </thead>
@@ -247,8 +247,8 @@
                                   <td class="mono fs15 text-end">
                                     {{template "decimalParts" (float64AsDecimalParts .TotalOut 8 false)}}
                                   </td>
-                                  <td class="mono fs15 text-end">{{.Size}} B</td>
                                   <td class="mono fs15 text-end">{{printf "%.8f" (.FeeRate)}} DCR/kB</td>
+                                  <td class="mono fs15 text-end">{{.Size}} B</td>
                                   <td class="mono fs15 text-end" data-time-target="age" data-age="{{.Time}}"></td>
                               </tr>
                               {{- end -}}
@@ -307,8 +307,9 @@
                             <tr>
                               <th>Transaction ID</th>
                               <th class="text-end">Total DCR</th>
-                              <th class="text-end">Size</th>
+					          <th class="text-end">Fee</th>
                               <th class="text-end">Fee Rate</th>
+                              <th class="text-end">Size</th>
                               <th class="text-end">Time in Mempool</th>
                             </tr>
                           </thead>
@@ -323,8 +324,9 @@
                                   <td class="mono fs15 text-end">
                                     {{template "decimalParts" (float64AsDecimalParts .TotalOut 8 false)}}
                                   </td>
+					              <td class="mono fs15 text-end">{{.Fee}}</td>
+                                  <td class="mono fs15 text-end">{{dcrPerKbToAtomsPerByte .FeeRate}} atoms/B</td>
                                   <td class="mono fs15 text-end">{{.Size}} B</td>
-                                  <td class="mono fs15 text-end">{{printf "%.8f" (.FeeRate)}} DCR/kB</td>
                                   <td class="mono fs15 text-end" data-time-target="age" data-age="{{.Time}}"></td>
                               </tr>
                               {{- end -}}

explorer/types/explorertypes.go

@@ -988,12 +988,11 @@ type TicketPoolInfo struct {
 
 // MempoolTx models the tx basic data for the mempool page
 type MempoolTx struct {
-	TxID    string  `json:"txid"`
-	Version int32   `json:"version"`
-	Fees    float64 `json:"fees"`
-	FeeRate float64 `json:"fee_rate"`
-	// Consider atom representation:
-	//FeeAmount   int64        `json:"fee_amount"`
+	TxID      string         `json:"txid"`
+	Version   int32          `json:"version"`
+	Fee       dcrutil.Amount `json:"fee"`
+	Fees      float64        `json:"fees"`
+	FeeRate   float64        `json:"fee_rate"`
 	VinCount  int            `json:"vin_count"`
 	VoutCount int            `json:"vout_count"`
 	Vin       []MempoolInput `json:"vin,omitempty"`

mempool/collector.go

@@ -135,12 +135,13 @@ func (t *DataCollector) mempoolTxns() ([]exptypes.MempoolTx, txhelpers.MempoolAd
 		//fee, _ := txhelpers.TxFeeRate(msgTx)
 		// log.Tracef("tx fee: GRM result = %f, msgTx = %f", tx.Fee, fee.ToCoin())
 
-		_, feeRate := txhelpers.TxFeeRate(msgTx)
+		fee, feeRate := txhelpers.TxFeeRate(msgTx)
 
 		txs = append(txs, exptypes.MempoolTx{
 			TxID:      hashStr,
 			Version:   int32(msgTx.Version),
 			Fees:      tx.Fee,
+			Fee:       fee,
 			FeeRate:   feeRate.ToCoin(),
 			VinCount:  len(msgTx.TxIn),
 			VoutCount: len(msgTx.TxOut),

mempool/monitor.go

@@ -244,6 +244,7 @@ func (p *MempoolMonitor) TxHandler(rawTx *chainjson.TxRawResult) error {
 	tx := exptypes.MempoolTx{
 		TxID:      hash,
 		Version:   rawTx.Version,
+		Fee:       fee,
 		Fees:      fee.ToCoin(),
 		FeeRate:   feeRate.ToCoin(),
 		VinCount:  len(msgTx.TxIn),