Merge pull request #203 from matiu/feature/small-front-end-fixes
add block reward to block page, remove it from coinbase
This commit is contained in:
commit
e4447573cb
|
@ -139,8 +139,8 @@ function spec(b) {
|
|||
if (err && err.code === -5) return cb();
|
||||
if (err) return cb(err);
|
||||
|
||||
info.reward = BitcoreBlock.getBlockValue(info.height) / util.COIN ;
|
||||
|
||||
if (info.result.height)
|
||||
info.result.reward = BitcoreBlock.getBlockValue(info.result.height) / util.COIN ;
|
||||
return cb(null, {
|
||||
hash: hash,
|
||||
info: info.result,
|
||||
|
|
|
@ -24,10 +24,6 @@ function spec(b) {
|
|||
// Inputs
|
||||
if (tx.isCoinBase()) {
|
||||
info.isCoinBase = true;
|
||||
|
||||
var reward = BitcoreBlock.getBlockValue(info.height) / util.COIN;
|
||||
info.vin[0].reward = reward;
|
||||
info.valueIn = reward;
|
||||
}
|
||||
|
||||
var n =0;
|
||||
|
|
|
@ -47,6 +47,11 @@
|
|||
<td> <strong> Height </strong></td>
|
||||
<td class="text-right text-muted">{{block.height}}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td> <strong> Block Reward </strong></td>
|
||||
<td class="text-right text-muted">{{$root.currency.getConvertion(block.reward)}}</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td> <strong> Timestamp </strong></td>
|
||||
<td class="text-right text-muted">{{block.time * 1000 | date:'medium'}}</td>
|
||||
|
|
|
@ -14,7 +14,6 @@
|
|||
<div class="col-md-5">
|
||||
<div class="row" data-ng-show="tx.isCoinBase">
|
||||
<div class="col-md-12 transaction-vin-vout" data-ng-repeat="vin in tx.vin">
|
||||
<div class="text-muted pull-right btc-value"><small>{{$root.currency.getConvertion(vin.reward)}}</small></div>
|
||||
<div class="ellipsis">
|
||||
<span>No Inputs (Newly Generated Coins)</span>
|
||||
</div>
|
||||
|
|
Loading…
Reference in New Issue