From ced7decb720bf6f8e9012f8a69b70d8544442425 Mon Sep 17 00:00:00 2001
From: Alexis Hernandez <alexis22229@gmail.com>
Date: Sat, 24 Mar 2018 18:23:36 -0600
Subject: [PATCH] web-ui: Add support for TPoS blocks on BlockDetails view
---
web-ui/src/app/app.component.ts | 6 +-
.../block-details.component.html | 64 ++++++++++++++++++-
.../block-details/block-details.component.ts | 8 +++
web-ui/src/app/models/block.ts | 8 ++-
4 files changed, 81 insertions(+), 5 deletions(-)
diff --git a/web-ui/src/app/app.component.ts b/web-ui/src/app/app.component.ts
index 7120d37..2f12b18 100644
--- a/web-ui/src/app/app.component.ts
+++ b/web-ui/src/app/app.component.ts
@@ -83,7 +83,11 @@ export class AppComponent {
'label.coinstake': 'Coinstake',
'label.masternode': 'Master node',
'label.amount': 'Amount',
- 'label.blockReward': 'Block reward'
+ 'label.blockReward': 'Block reward',
+
+ 'label.tposContract': 'Contract',
+ 'label.owner': 'Owner',
+ 'label.merchant': 'Merchant'
};
}
}
diff --git a/web-ui/src/app/components/block-details/block-details.component.html b/web-ui/src/app/components/block-details/block-details.component.html
index 7840b0c..cef522e 100644
--- a/web-ui/src/app/components/block-details/block-details.component.html
+++ b/web-ui/src/app/components/block-details/block-details.component.html
@@ -9,6 +9,13 @@
<label class="col-sm-2 col-md-1 col-xs-1 col-lg-1">{{getBlockType(blockDetails)}}</label>
</div>
+ <div class="row" *ngIf="isTPoS(blockDetails)">
+ <label class="col-sm-2 col-md-1 col-xs-1 col-lg-1">{{'label.tposContract' | translate}}</label>
+ <div class="col-sm-2 col-md-1 col-xs-1 col-lg-1">
+ <a routerLink="/transactions/{{blockDetails.block.tposContract}}">{{blockDetails.block.tposContract}}</a>
+ </div>
+ </div>
+
<div class="row">
<label class="col-sm-2 col-md-1 col-xs-1 col-lg-1">{{'label.blockhash' | translate}}</label>
<label class="col-sm-2 col-md-1 col-xs-1 col-lg-1">{{blockDetails.block.hash}} ({{blockDetails.block.height}})</label>
@@ -80,6 +87,7 @@
<!-- rewards -->
<div>
+ <!-- PoW -->
<div *ngIf="isPoW(blockDetails)">
<div class="row">
<label class="col-sm-2 col-md-1 col-xs-1 col-lg-1">{{'label.rewards' | translate}}</label>
@@ -96,7 +104,8 @@
</div>
</div>
- <div *ngIf="!isPoW(blockDetails)">
+ <!-- PoS -->
+ <div *ngIf="isPoS(blockDetails)">
<div class="row">
<label class="col-sm-2 col-md-1 col-xs-1 col-lg-1">{{'label.rewards' | translate}}</label>
</div>
@@ -131,6 +140,59 @@
</div>
</div>
</div>
+
+ <!-- TPoS -->
+ <div *ngIf="isTPoS(blockDetails)">
+ <div class="row">
+ <label class="col-sm-2 col-md-1 col-xs-1 col-lg-1">{{'label.rewards' | translate}}</label>
+ </div>
+
+ <div class="row">
+ <label class="col-sm-offset-1 col-md-offset-1 col-offset-xs-1 col-offset-lg-1">{{'label.owner' | translate}}</label>
+ </div>
+ <div class="row">
+ <label class="col-sm-2 col-md-1 col-xs-1 col-lg-1">{{'label.amount' | translate}}</label>
+ <label class="col-sm-3 col-md-2 col-xs-2 col-lg-2">{{blockDetails.rewards.owner.value}} {{'label.coinName' | translate}}</label>
+ </div>
+ <div class="row">
+ <label class="col-sm-2 col-md-1 col-xs-1 col-lg-1">{{'label.address' | translate}}</label>
+ <label class="col-sm-3 col-md-2 col-xs-2 col-lg-2">
+ <a routerLink="/addresses/{{blockDetails.rewards.owner.address}}">{{blockDetails.rewards.owner.address}}</a>
+ </label>
+ </div>
+
+ <div>
+ <div class="row">
+ <label class="col-sm-offset-1 col-md-offset-1 col-offset-xs-1 col-offset-lg-1">{{'label.merchant' | translate}}</label>
+ </div>
+ <div class="row">
+ <label class="col-sm-2 col-md-1 col-xs-1 col-lg-1">{{'label.amount' | translate}}</label>
+ <label class="col-sm-3 col-md-2 col-xs-2 col-lg-2">{{blockDetails.rewards.merchant.value}} {{'label.coinName' | translate}}</label>
+ </div>
+ <div class="row">
+ <label class="col-sm-2 col-md-1 col-xs-1 col-lg-1">{{'label.address' | translate}}</label>
+ <label class="col-sm-3 col-md-2 col-xs-2 col-lg-2">
+ <a routerLink="/addresses/{{blockDetails.rewards.merchant.address}}">{{blockDetails.rewards.merchant.address}}</a>
+ </label>
+ </div>
+ </div>
+
+ <div *ngIf="blockDetails.rewards.masternode != null">
+ <div class="row">
+ <label class="col-sm-offset-1 col-md-offset-1 col-offset-xs-1 col-offset-lg-1">{{'label.masternode' | translate}}</label>
+ </div>
+ <div class="row">
+ <label class="col-sm-2 col-md-1 col-xs-1 col-lg-1">{{'label.amount' | translate}}</label>
+ <label class="col-sm-3 col-md-2 col-xs-2 col-lg-2">{{blockDetails.rewards.masternode.value}} {{'label.coinName' | translate}}</label>
+ </div>
+ <div class="row">
+ <label class="col-sm-2 col-md-1 col-xs-1 col-lg-1">{{'label.address' | translate}}</label>
+ <label class="col-sm-3 col-md-2 col-xs-2 col-lg-2">
+ <a routerLink="/addresses/{{blockDetails.rewards.masternode.address}}">{{blockDetails.rewards.masternode.address}}</a>
+ </label>
+ </div>
+ </div>
+ </div>
</div>
<hr>
diff --git a/web-ui/src/app/components/block-details/block-details.component.ts b/web-ui/src/app/components/block-details/block-details.component.ts
index eef2463..dc14b3d 100644
--- a/web-ui/src/app/components/block-details/block-details.component.ts
+++ b/web-ui/src/app/components/block-details/block-details.component.ts
@@ -58,4 +58,12 @@ export class BlockDetailsComponent implements OnInit {
isPoW(details: BlockDetails): boolean {
return details.block.height <= 75;
}
+
+ isPoS(details: BlockDetails): boolean {
+ return !this.isPoW(details) && details.block.tposContract == null;
+ }
+
+ isTPoS(details: BlockDetails): boolean {
+ return !this.isPoW(details) && details.block.tposContract != null;
+ }
}
diff --git a/web-ui/src/app/models/block.ts b/web-ui/src/app/models/block.ts
index 5622659..6c5a045 100644
--- a/web-ui/src/app/models/block.ts
+++ b/web-ui/src/app/models/block.ts
@@ -25,9 +25,11 @@ class Block {
}
class BlockRewards {
- reward: BlockReward;
- coinstake: BlockReward;
- masternode: BlockReward;
+ reward: BlockReward; // PoW
+ coinstake: BlockReward; // PoS
+ masternode: BlockReward; // PoS and TPoS
+ owner: BlockReward; // TPoS
+ merchant: BlockReward; // TPoS
}
class BlockReward {