From ddea10b160464068bdd2eb0515eee313115b9719 Mon Sep 17 00:00:00 2001
From: softsimon <softsimon@protonmail.com>
Date: Sun, 15 Nov 2020 17:58:38 +0700
Subject: [PATCH] Toggle display UTXO details and scripts for transactions
 fixes #46

---
 .../transaction/transaction.component.html    |   8 +-
 .../transactions-list.component.html          | 213 ++++++++++++------
 .../transactions-list.component.scss          |  18 +-
 .../transactions-list.component.ts            |  11 +
 frontend/src/styles.scss                      |   1 +
 5 files changed, 173 insertions(+), 78 deletions(-)

diff --git a/frontend/src/app/components/transaction/transaction.component.html b/frontend/src/app/components/transaction/transaction.component.html
index 723d7e952..94c6e4d76 100644
--- a/frontend/src/app/components/transaction/transaction.component.html
+++ b/frontend/src/app/components/transaction/transaction.component.html
@@ -162,9 +162,13 @@
 
     <br>
 
-    <h2>Inputs & Outputs</h2>
+    <h2 class="float-left">Inputs & Outputs</h2>
 
-    <app-transactions-list [transactions]="[tx]" [transactionPage]="true"></app-transactions-list>
+    <button type="button" class="btn btn-outline-info btn-sm float-right mr-1 mt-2" (click)="txList.toggleDetails()">Details</button>
+
+    <div class="clearfix"></div>
+
+    <app-transactions-list #txList [transactions]="[tx]" [transactionPage]="true"></app-transactions-list>
 
     <h2>Details</h2>
     <div class="box">
diff --git a/frontend/src/app/components/transactions-list/transactions-list.component.html b/frontend/src/app/components/transactions-list/transactions-list.component.html
index 5a5fbac13..04ab6ac0a 100644
--- a/frontend/src/app/components/transactions-list/transactions-list.component.html
+++ b/frontend/src/app/components/transactions-list/transactions-list.component.html
@@ -17,50 +17,87 @@
       <div class="col">
         <table class="table table-borderless smaller-text table-xs" style="margin: 0;">
           <tbody>
-            <tr *ngFor="let vin of (tx['@vinLimit'] ? tx.vin.slice(0, 10) : tx.vin); trackBy: trackByIndexFn">
-              <td class="arrow-td">
-                <ng-template [ngIf]="vin.prevout === null && !vin.is_pegin" [ngIfElse]="hasPrevout">
-                  <i class="arrow grey"></i>
-                </ng-template>
-                <ng-template #hasPrevout>
-                  <a *ngIf="vin.is_pegin; else defaultPrevout" [routerLink]="['/tx/', vin.txid]">
-                    <i class="arrow red"></i>
-                  </a>
-                  <ng-template #defaultPrevout>
-                    <a [routerLink]="['/tx/' | relativeUrl, vin.txid]">
+            <ng-template ngFor let-vin [ngForOf]="tx['@vinLimit'] ? tx.vin.slice(0, 10) : tx.vin" [ngForTrackBy]="trackByIndexFn">
+              <tr>
+                <td class="arrow-td">
+                  <ng-template [ngIf]="vin.prevout === null && !vin.is_pegin" [ngIfElse]="hasPrevout">
+                    <i class="arrow grey"></i>
+                  </ng-template>
+                  <ng-template #hasPrevout>
+                    <a *ngIf="vin.is_pegin; else defaultPrevout" [routerLink]="['/tx/', vin.txid]">
                       <i class="arrow red"></i>
                     </a>
+                    <ng-template #defaultPrevout>
+                      <a [routerLink]="['/tx/' | relativeUrl, vin.txid]">
+                        <i class="arrow red"></i>
+                      </a>
+                    </ng-template>
                   </ng-template>
-                </ng-template>
-              </td>
-              <td>
-                <div [ngSwitch]="true">
-                  <ng-container *ngSwitchCase="vin.is_coinbase"><a placement="bottom" [ngbTooltip]="vin.scriptsig | hex2ascii">Coinbase<ng-template [ngIf]="network !== 'liquid'"> (Newly Generated Coins)</ng-template></a><br><span class="badge badge-secondary scriptmessage longer">{{ vin.scriptsig | hex2ascii }}</span></ng-container>
-                  <ng-container *ngSwitchCase="vin.is_pegin">
-                    Peg-in
-                  </ng-container>
-                  <ng-container *ngSwitchDefault>
-                    <a [routerLink]="['/address/' | relativeUrl, vin.prevout.scriptpubkey_address]" title="{{ vin.prevout.scriptpubkey_address }}">
-                      <span class="d-block d-lg-none">{{ vin.prevout.scriptpubkey_address | shortenString : 16 }}</span>
-                      <span class="d-none d-lg-block">{{ vin.prevout.scriptpubkey_address | shortenString : 35 }}</span>
-                    </a>
-                    <div>
-                      <app-address-labels [vin]="vin"></app-address-labels>
-                    </div>
-                  </ng-container>
-                </div>
-              </td>
-              <td class="text-right nowrap">
-                <ng-template [ngIf]="vin.prevout && vin.prevout.asset && vin.prevout.asset !== nativeAssetId" [ngIfElse]="defaultOutput">
-                  <div *ngIf="assetsMinimal && assetsMinimal[vin.prevout.asset]">
-                    <ng-container *ngTemplateOutlet="assetBox; context:{ $implicit: vin.prevout }"></ng-container>
+                </td>
+                <td>
+                  <div [ngSwitch]="true">
+                    <ng-container *ngSwitchCase="vin.is_coinbase"><a placement="bottom" [ngbTooltip]="vin.scriptsig | hex2ascii">Coinbase<ng-template [ngIf]="network !== 'liquid'"> (Newly Generated Coins)</ng-template></a><br><span class="badge badge-secondary scriptmessage longer">{{ vin.scriptsig | hex2ascii }}</span></ng-container>
+                    <ng-container *ngSwitchCase="vin.is_pegin">
+                      Peg-in
+                    </ng-container>
+                    <ng-container *ngSwitchDefault>
+                      <a [routerLink]="['/address/' | relativeUrl, vin.prevout.scriptpubkey_address]" title="{{ vin.prevout.scriptpubkey_address }}">
+                        <span class="d-block d-lg-none">{{ vin.prevout.scriptpubkey_address | shortenString : 16 }}</span>
+                        <span class="d-none d-lg-block">{{ vin.prevout.scriptpubkey_address | shortenString : 35 }}</span>
+                      </a>
+                      <div>
+                        <app-address-labels [vin]="vin"></app-address-labels>
+                      </div>
+                    </ng-container>
                   </div>
-                </ng-template>
-                <ng-template #defaultOutput>
-                  <app-amount *ngIf="vin.prevout" [satoshis]="vin.prevout.value"></app-amount>
-                </ng-template>
-              </td>
-            </tr>
+                </td>
+                <td class="text-right nowrap">
+                  <ng-template [ngIf]="vin.prevout && vin.prevout.asset && vin.prevout.asset !== nativeAssetId" [ngIfElse]="defaultOutput">
+                    <div *ngIf="assetsMinimal && assetsMinimal[vin.prevout.asset]">
+                      <ng-container *ngTemplateOutlet="assetBox; context:{ $implicit: vin.prevout }"></ng-container>
+                    </div>
+                  </ng-template>
+                  <ng-template #defaultOutput>
+                    <app-amount *ngIf="vin.prevout" [satoshis]="vin.prevout.value"></app-amount>
+                  </ng-template>
+                </td>
+              </tr>
+              <tr *ngIf="displayDetails">
+                <td></td>
+                <td colspan="2">
+                  <table class="table table-striped table-borderless details-table">
+                    <tbody>
+                      <ng-template [ngIf]="vin.scriptsig">
+                        <tr>
+                          <td>ScriptSig (ASM)</td>
+                          <td class="script-details">{{ vin.scriptsig_asm }}</td>
+                        </tr>
+                        <tr>
+                          <td>ScriptSig (HEX)</td>
+                          <td class="script-details">{{ vin.scriptsig }}</td>
+                        </tr>
+                      </ng-template>
+                      <tr *ngIf="vin.witness">
+                        <td>Witness</td>
+                        <td class="script-details">{{ vin.witness.join(' ') }}</td>
+                      </tr>
+                      <tr *ngIf="vin.inner_redeemscript_asm">
+                        <td>P2SH redeem script</td>
+                        <td class="script-details">{{ vin.inner_redeemscript_asm }}</td>
+                      </tr>
+                      <tr *ngIf="vin.inner_witnessscript_asm">
+                        <td>P2WSH witness script</td>
+                        <td class="script-details">{{ vin.inner_witnessscript_asm }}</td>
+                      </tr>
+                      <tr>
+                        <td>nSequence</td>
+                        <td class="script-details">{{ formatHex(vin.sequence) }}</td>
+                      </tr>
+                    </tbody>
+                  </table>
+                </td>
+              </tr>
+            </ng-template>
             <tr *ngIf="tx.vin.length > 10 && tx['@vinLimit']">
               <td colspan="3" class="text-center">
                 <button class="btn btn-sm btn-primary mt-2" (click)="tx['@vinLimit'] = false;">Load all ({{ tx.vin.length - 10 }})</button>
@@ -73,44 +110,70 @@
       <div class="col mobile-bottomcol">
         <table class="table table-borderless smaller-text table-xs"  style="margin: 0;">
           <tbody>
-            <tr *ngFor="let vout of (tx['@voutLimit'] ? tx.vout.slice(0, 10) : tx.vout); let vindex = index; trackBy: trackByIndexFn">
-              <td>
-                <a *ngIf="vout.scriptpubkey_address; else scriptpubkey_type" [routerLink]="['/address/' | relativeUrl, vout.scriptpubkey_address]" title="{{ vout.scriptpubkey_address }}">
-                  <span class="d-block d-lg-none">{{ vout.scriptpubkey_address | shortenString : 16 }}</span>
-                  <span class="d-none d-lg-block">{{ vout.scriptpubkey_address | shortenString : 35 }}</span>
-                </a>
-                <ng-template #scriptpubkey_type>
-                  <ng-template [ngIf]="vout.pegout" [ngIfElse]="defaultscriptpubkey_type">
-                    Peg-out to <a [routerLink]="['/address/', vout.pegout.scriptpubkey_address]" title="{{ vout.pegout.scriptpubkey_address }}">
-                      <span class="d-block d-lg-none">{{ vout.pegout.scriptpubkey_address | shortenString : 16 }}</span>
-                      <span class="d-none d-lg-block">{{ vout.pegout.scriptpubkey_address | shortenString : 35 }}</span>
-                    </a>
+            <ng-template ngFor let-vout let-vindex="index"  [ngForOf]="tx['@voutLimit'] ? tx.vout.slice(0, 10) : tx.vout" [ngForTrackBy]="trackByIndexFn">
+              <tr>
+                <td>
+                  <a *ngIf="vout.scriptpubkey_address; else scriptpubkey_type" [routerLink]="['/address/' | relativeUrl, vout.scriptpubkey_address]" title="{{ vout.scriptpubkey_address }}">
+                    <span class="d-block d-lg-none">{{ vout.scriptpubkey_address | shortenString : 16 }}</span>
+                    <span class="d-none d-lg-block">{{ vout.scriptpubkey_address | shortenString : 35 }}</span>
+                  </a>
+                  <ng-template #scriptpubkey_type>
+                    <ng-template [ngIf]="vout.pegout" [ngIfElse]="defaultscriptpubkey_type">
+                      Peg-out to <a [routerLink]="['/address/', vout.pegout.scriptpubkey_address]" title="{{ vout.pegout.scriptpubkey_address }}">
+                        <span class="d-block d-lg-none">{{ vout.pegout.scriptpubkey_address | shortenString : 16 }}</span>
+                        <span class="d-none d-lg-block">{{ vout.pegout.scriptpubkey_address | shortenString : 35 }}</span>
+                      </a>
+                    </ng-template>
+                    <ng-template #defaultscriptpubkey_type>
+                      <a placement="bottom" [ngbTooltip]="vout.scriptpubkey | hex2ascii">{{ vout.scriptpubkey_type | scriptpubkeyType }}</a>&nbsp;<span class="badge badge-secondary scriptmessage">{{ vout.scriptpubkey_asm | hex2ascii }}</span>
+                    </ng-template>
                   </ng-template>
-                  <ng-template #defaultscriptpubkey_type>
-                    <a placement="bottom" [ngbTooltip]="vout.scriptpubkey | hex2ascii">{{ vout.scriptpubkey_type | scriptpubkeyType }}</a>&nbsp;<span class="badge badge-secondary scriptmessage">{{ vout.scriptpubkey_asm | hex2ascii }}</span>
+                </td>
+                <td class="text-right nowrap">
+                  <ng-template [ngIf]="vout.asset && vout.asset !== nativeAssetId" [ngIfElse]="defaultOutput">
+                    <div *ngIf="assetsMinimal && assetsMinimal[vout.asset]">
+                      <ng-container *ngTemplateOutlet="assetBox; context:{ $implicit: vout }"></ng-container>
+                  </div>
                   </ng-template>
-                </ng-template>
-              </td>
-              <td class="text-right nowrap">
-                <ng-template [ngIf]="vout.asset && vout.asset !== nativeAssetId" [ngIfElse]="defaultOutput">
-                  <div *ngIf="assetsMinimal && assetsMinimal[vout.asset]">
-                    <ng-container *ngTemplateOutlet="assetBox; context:{ $implicit: vout }"></ng-container>
-                </div>
-                </ng-template>
-                <ng-template #defaultOutput>
-                  <app-amount [satoshis]="vout.value"></app-amount>
-                </ng-template>
-              </td>
-              <td class="pl-1 arrow-td">
-                <i *ngIf="!outspends[i] || vout.scriptpubkey_type === 'op_return' || vout.scriptpubkey_type === 'fee' ; else outspend" class="arrow grey"></i>
-                <ng-template #outspend>
-                  <i *ngIf="!outspends[i][vindex] || !outspends[i][vindex].spent; else spent" class="arrow green"></i>
-                  <ng-template #spent>
-                    <a [routerLink]="['/tx/' | relativeUrl, outspends[i][vindex].txid]"><i class="arrow red"></i></a>
+                  <ng-template #defaultOutput>
+                    <app-amount [satoshis]="vout.value"></app-amount>
                   </ng-template>
-                </ng-template>
-              </td>
-            </tr>
+                </td>
+                <td class="pl-1 arrow-td">
+                  <i *ngIf="!outspends[i] || vout.scriptpubkey_type === 'op_return' || vout.scriptpubkey_type === 'fee' ; else outspend" class="arrow grey"></i>
+                  <ng-template #outspend>
+                    <i *ngIf="!outspends[i][vindex] || !outspends[i][vindex].spent; else spent" class="arrow green"></i>
+                    <ng-template #spent>
+                      <a [routerLink]="['/tx/' | relativeUrl, outspends[i][vindex].txid]"><i class="arrow red"></i></a>
+                    </ng-template>
+                  </ng-template>
+                </td>
+              </tr>
+              <tr *ngIf="displayDetails">
+                <td colspan="2">
+                  <table class="table table-striped table-borderless details-table mb-3">
+                    <tbody>
+                      <tr *ngIf="vout.scriptpubkey_type">
+                        <td>Type</td>
+                        <td class="script-details">{{ vout.scriptpubkey_type.toUpperCase() }}</td>
+                      </tr>
+                      <tr>
+                        <td>scriptPubKey (ASM)</td>
+                        <td class="script-details">{{ vout.scriptpubkey_asm }}</td>
+                      </tr>
+                      <tr>
+                        <td>scriptPubKey (HEX)</td>
+                        <td class="script-details">{{ vout.scriptpubkey }}</td>
+                      </tr>
+                      <tr *ngIf="vout.scriptpubkey_type == 'op_return'">
+                        <td>OP_RETURN data</td>
+                        <td class="script-details">{{ vout.scriptpubkey_asm | hex2ascii }}</td>
+                      </tr>
+                    </tbody>
+                  </table>
+                </td>
+              </tr>
+            </ng-template>
             <tr *ngIf="tx.vout.length > 10 && tx['@voutLimit']">
               <td colspan="3" class="text-center">
                 <button class="btn btn-sm btn-primary mt-2" (click)="tx['@voutLimit'] = false;">Load all ({{ tx.vout.length - 10 }})</button>
diff --git a/frontend/src/app/components/transactions-list/transactions-list.component.scss b/frontend/src/app/components/transactions-list/transactions-list.component.scss
index 3f78768ca..8cfc8212a 100644
--- a/frontend/src/app/components/transactions-list/transactions-list.component.scss
+++ b/frontend/src/app/components/transactions-list/transactions-list.component.scss
@@ -81,4 +81,20 @@
 	.scriptmessage.longer {
 		max-width: 280px !important;
 	}
-}
\ No newline at end of file
+}
+
+.details-table {
+	margin-top: 5px;
+	max-width: 500px;
+}
+
+.details-table td {
+	padding: 0.75rem;
+}
+
+.script-details {
+	word-break: break-all;
+	white-space: normal;
+	font-family: "Courier New", Courier, monospace;
+	font-size: 12px;
+}
diff --git a/frontend/src/app/components/transactions-list/transactions-list.component.ts b/frontend/src/app/components/transactions-list/transactions-list.component.ts
index adc33e8b4..cce2cee20 100644
--- a/frontend/src/app/components/transactions-list/transactions-list.component.ts
+++ b/frontend/src/app/components/transactions-list/transactions-list.component.ts
@@ -16,6 +16,7 @@ import { map } from 'rxjs/operators';
 export class TransactionsListComponent implements OnInit, OnChanges {
   network = '';
   nativeAssetId = environment.nativeAssetId;
+  displayDetails = false;
 
   @Input() transactions: Transaction[];
   @Input() showConfirmations = false;
@@ -95,4 +96,14 @@ export class TransactionsListComponent implements OnInit, OnChanges {
   trackByIndexFn(index: number) {
     return index;
   }
+
+  formatHex(num: number): string {
+    const str = num.toString(16);
+    return '0x' + (str.length % 2 ? '0' : '') + str;
+  }
+
+  toggleDetails() {
+    this.displayDetails = !this.displayDetails;
+    this.ref.markForCheck();
+  }
 }
diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss
index 45769be32..ac02e49bf 100644
--- a/frontend/src/styles.scss
+++ b/frontend/src/styles.scss
@@ -10,6 +10,7 @@ $nav-tabs-link-active-bg: #11131f;
 $primary: #105fb0;
 $secondary: #2d3348;
 $success: #1a9436;
+$info: #1bd8f4;
 
 $pagination-bg: $body-bg;
 $pagination-border-color: $gray-800;