show user agent of mining software

PoC-Consortium · Jan 9, 2019 · 4fa93a3 · 4fa93a3
1 parent 057dea9
commit 4fa93a3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/pkg/modelx/modelx.go b/pkg/modelx/modelx.go
@@ -47,6 +47,8 @@ type Miner struct {
 
 	PayoutDetail string `db:"account.payout_detail"`
 
+	UserAgent string
+
 	// this mutex ensures that there is only one concurrent write process
 	// to the db for each miner
 	dbMu sync.Mutex

diff --git a/pkg/pool/pool.go b/pkg/pool/pool.go
@@ -238,6 +238,12 @@ func (pool *Pool) processSubmitNonceRequest(w http.ResponseWriter, req *http.Req
 		return
 	}
 
+	if ua := req.Header.Get("User-Agent"); ua == "" {
+		miner.UserAgent = req.Header.Get("X-Miner")
+	} else {
+		miner.UserAgent = ua
+	}
+
 	// Calculate deadline and check against limit
 	deadlineReq := burstmath.NewCalcDeadlineRequest(accountID, nonce, ri.BaseTarget, ri.Scoop, ri.GenSig)
 	deadline := pool.deadlineRequestHandler.CalcDeadline(deadlineReq)

diff --git a/pkg/webserver/webserver.go b/pkg/webserver/webserver.go
@@ -77,6 +77,7 @@ type MinerInfo struct {
 	LastActiveBlockHeight uint64
 	Capacity              float64
 	Deadline              uint64
+	UserAgent             string
 }
 
 type IndexInfo struct {
@@ -239,7 +240,8 @@ func (webServer *WebServer) updateMinerInfos() {
 			NConf:                 len(miner.DeadlinesParams),
 			Capacity:              capacity,
 			Deadline:              miner.CurrentDeadline(),
-			LastActiveBlockHeight: miner.CurrentBlockHeight()}
+			LastActiveBlockHeight: miner.CurrentBlockHeight(),
+			UserAgent:             miner.UserAgent}
 		miner.Unlock()
 		mis = append(mis, mi)
 

diff --git a/web/templates/minerTable.tmpl b/web/templates/minerTable.tmpl
@@ -8,6 +8,7 @@
     <th data-sort="float"><i class="sort-toggle fa fa-sort" aria-hidden="true"></i>Historical Share</th>
     <th data-sort="float" data-sort-onload="yes" data-sort-default="desc"><i class="sort-toggle fa fa-sort" aria-hidden="true"></i>Effective Capacity</th>
     <th data-sort="int"><i class="sort-toggle fa fa-sort" aria-hidden="true"></i>Confirmed Deadlines (Last nAvg Rounds)</th>
+    <th data-sort="string"><i class="sort-toggle fa fa-sort" aria-hidden="true"></i>Miner</th>
   </thead>
 
   <tbody>
@@ -23,6 +24,7 @@
       <td>{{$minerInfo.HistoricalShare | printf "%.3f" | html}} %</td>
       <td>{{$minerInfo.Capacity |printf "%.4f"| html}} TB</td>
       <td>{{$minerInfo.NConf | html}}</td>
+      <td>{{$minerInfo.UserAgent | html}}</td>
     </tr>
     {{end}}
   </tbody>