From 5c12dd18d94d861a6d63f13a4a6fbce6efee9daf Mon Sep 17 00:00:00 2001
From: yuriy0803 <68668177+yuriy0803@users.noreply.github.com>
Date: Sun, 28 Feb 2021 01:46:36 +0100
Subject: [PATCH] login

---
 storage/redis.go                      | 7 +++++--
 www/app/templates/blocks/block.hbs    | 4 ++--
 www/app/templates/blocks/immature.hbs | 2 +-
 www/app/templates/blocks/pending.hbs  | 6 ++++--
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/storage/redis.go b/storage/redis.go
index ddeb255..413084d 100644
--- a/storage/redis.go
+++ b/storage/redis.go
@@ -65,6 +65,7 @@ type RewardData struct {
 }
 
 type BlockData struct {
+	Login	         string   `json:"login"`
 	Height         int64    `json:"height"`
 	Timestamp      int64    `json:"timestamp"`
 	Difficulty     int64    `json:"difficulty"`
@@ -103,7 +104,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.Login)
 }
 
 type Miner struct {
@@ -405,7 +406,7 @@ func (r *RedisClient) WriteBlock(login, id string, params []string, diff, roundD
 			totalShares += n
 		}
 		hashHex := strings.Join(params, ":")
-		s := join(hashHex, ts, roundDiff, totalShares)
+		s := join(hashHex, ts, roundDiff, totalShares, login)
 		cmd := r.client.ZAdd(r.formatKey("blocks", "candidates"), redis.Z{Score: float64(height), Member: s})
 		return false, cmd.Err()
 	}
@@ -1107,6 +1108,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.Login = fields[6]
 		block.candidateKey = v.Member.(string)
 		result = append(result, &block)
 	}
@@ -1152,6 +1154,7 @@ func convertBlockResults(rows ...*redis.ZSliceCmd) []*BlockData {
 			block.TotalShares, _ = strconv.ParseInt(fields[6], 10, 64)
 			block.RewardString = fields[7]
 			block.ImmatureReward = fields[7]
+      block.Login = fields[8]
 			block.immatureKey = v.Member.(string)
 			result = append(result, &block)
 		}
diff --git a/www/app/templates/blocks/block.hbs b/www/app/templates/blocks/block.hbs
index c37e418..791d070 100644
--- a/www/app/templates/blocks/block.hbs
+++ b/www/app/templates/blocks/block.hbs
@@ -8,11 +8,11 @@
   </td>
   <td>
     {{#if block.uncle}}
-      <a href="https://expedition.dev/uncle/{{block.hash}}" class="hash" rel="nofollow" target="_blank">{{block.hash}}</a>
+      <a href="https://expedition.dev/uncle/{{block.login}}" class="hash" rel="nofollow" target="_blank">{{block.login}}</a>
     {{else if block.orphan}}
       <span class="label label-danger">Orphan</span>
     {{else}}
-      <a href="https://expedition.dev/block/{{block.hash}}" class="hash" rel="nofollow" target="_blank">{{block.hash}}</a>
+      <a href="https://expedition.dev/block/{{block.login}}" class="hash" rel="nofollow" target="_blank">{{block.login}}</a>
     {{/if}}
   </td>
   <td>{{format-date-locale block.timestamp}}</td>
diff --git a/www/app/templates/blocks/immature.hbs b/www/app/templates/blocks/immature.hbs
index ae7cab5..8108d70 100644
--- a/www/app/templates/blocks/immature.hbs
+++ b/www/app/templates/blocks/immature.hbs
@@ -4,7 +4,7 @@
   <thead>
     <tr>
       <th>Height</th>
-      <th>Block Hash</th>
+      <th>Login</th>
       <th>Time Found</th>
       <th>Variance</th>
       <th>Reward</th>
diff --git a/www/app/templates/blocks/pending.hbs b/www/app/templates/blocks/pending.hbs
index 74a64db..ccd56f9 100644
--- a/www/app/templates/blocks/pending.hbs
+++ b/www/app/templates/blocks/pending.hbs
@@ -5,6 +5,7 @@
     <thead>
       <tr>
         <th>Height</th>
+        <th>Login</th>
         <th>Time Found</th>
         <th>Variance</th>
       </tr>
@@ -12,8 +13,9 @@
     <tbody>
       {{#each model.candidates as |block|}}
       <tr>
-        <td><a href="https://expedition.dev/block/{{block.height}}" rel="nofollow" target="_blank">{{format-number block.height}}</a></td>
-        <td>{{format-date-locale block.timestamp}}</td>
+        <td><a href="https://explorer.ellaism.org/block/{{block.height}}" rel="nofollow" target="_blank">{{format-number block.height}}</a></td>
+        <td>{{#link-to 'account' block.login class='hash'}}{{block.login}}{{/link-to}}</td>
+		<td>{{format-date-locale block.timestamp}}</td>
         <td>
           {{#if block.isLucky}}
           <span class="label label-success">{{format-number block.variance style='percent'}}</span>