block finder

storage/redis.go

@@ -63,6 +63,7 @@ type RewardData struct {
 }
 
 type BlockData struct {
+	Finder         string   `json:"finder"`
 	Height         int64    `json:"height"`
 	Timestamp      int64    `json:"timestamp"`
 	Difficulty     int64    `json:"difficulty"`
@@ -101,7 +102,7 @@ func (b *BlockData) RoundKey() string {
 }
 
 func (b *BlockData) key() string {
-	return join(b.UncleHeight, b.Orphan, b.Nonce, b.serializeHash(), b.Timestamp, b.Difficulty, b.TotalShares, b.Reward)
+	return join(b.UncleHeight, b.Orphan, b.Nonce, b.serializeHash(), b.Timestamp, b.Difficulty, b.TotalShares, b.Reward, b.Finder)
 }
 
 type Miner struct {
@@ -1137,6 +1138,7 @@ func convertCandidateResults(raw *redis.ZSliceCmd) []*BlockData {
 		block.Timestamp, _ = strconv.ParseInt(fields[3], 10, 64)
 		block.Difficulty, _ = strconv.ParseInt(fields[4], 10, 64)
 		block.TotalShares, _ = strconv.ParseInt(fields[5], 10, 64)
+		block.Finder = fields[6]
 		block.candidateKey = v.Member.(string)
 		result = append(result, &block)
 	}
@@ -1182,6 +1184,7 @@ func convertBlockResults(rows ...*redis.ZSliceCmd) []*BlockData {
 			block.TotalShares, _ = strconv.ParseInt(fields[6], 10, 64)
 			block.RewardString = fields[7]
 			block.ImmatureReward = fields[7]
+			block.Finder = fields[8]
 			block.immatureKey = v.Member.(string)
 			result = append(result, &block)
 		}

www/app/templates/blocks/block.hbs

@@ -1,26 +1,32 @@
 <tr>
   <td>
     {{#if block.uncle}}
-      <a href="{{t "links.blockExplorerLink_uncle"}}{{block.height}}" rel="nofollow" target="_blank">{{format-number block.height}}</a>
+    <a href="{{t "links.blockExplorerLink_uncle"}}{{block.height}}" rel="nofollow"
+      target="_blank">{{format-number block.height}}</a>
     {{else}}
-      <a href="{{t "links.blockExplorerLink_block"}}{{block.height}}" rel="nofollow" target="_blank">{{format-number block.height}}</a>
+    <a href="{{t "links.blockExplorerLink_block"}}{{block.height}}" rel="nofollow"
+      target="_blank">{{format-number block.height}}</a>
     {{/if}}
   </td>
   <td>
     {{#if block.uncle}}
-      <a href="{{t "links.blockExplorerLink_uncle"}}{{block.hash}}" class="hash" rel="nofollow" target="_blank">{{block.hash}}</a>
+
+    {{#link-to 'account' block.finder class='hash'}}{{block.finder}}{{/link-to}}
+
     {{else if block.orphan}}
-      <span class="label label-danger">{{t "block.orphan"}}</span>
+    <span class="label label-danger">{{t "block.orphan"}}</span>
     {{else}}
-      <a href="{{t "links.blockExplorerLink_block"}}{{block.hash}}" class="hash" rel="nofollow" target="_blank">{{block.hash}}</a>
+
+    {{#link-to 'account' block.finder class='hash'}}{{block.finder}}{{/link-to}}
+
     {{/if}}
   </td>
   <td>{{format-date-locale block.timestamp}}</td>
   <td>
     {{#if block.isLucky}}
-      <span class="label label-success">{{format-number block.variance style='percent'}}</span>
+    <span class="label label-success">{{format-number block.variance style='percent'}}</span>
     {{else}}
-      <span class="label label-info">{{format-number block.variance style='percent'}}</span>
+    <span class="label label-info">{{format-number block.variance style='percent'}}</span>
     {{/if}}
   </td>
   <td>
@@ -30,4 +36,4 @@
     <span class="label label-primary">{{block.formatReward}}</span>
     {{/if}}
   </td>
-</tr>
+</tr>