Skip to content

Commit 3944336

Browse files
LexLuthrLexLuthr
authored
remove f0 string from UI (#296)
1 parent 82c295b commit 3944336

File tree

13 files changed

+96
-18
lines changed

13 files changed

+96
-18
lines changed

‎web/api/webrpc/cluster.go‎

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import (
77

88
"github.com/dustin/go-humanize"
99
"golang.org/x/xerrors"
10+
11+
"github.com/filecoin-project/go-address"
1012
)
1113

1214
type MachineSummary struct {
@@ -172,6 +174,7 @@ type MachineInfo struct {
172174
Posted string
173175

174176
PoRepSector, PoRepSectorSP *int64
177+
PoRepSectorMiner string
175178
}
176179

177180
FinishedTasks []struct {
@@ -286,8 +289,9 @@ func (a *WebRPC) ClusterNodeInfo(ctx context.Context, id int64) (*MachineInfo, e
286289
Task string
287290
Posted string
288291

289-
PoRepSector *int64
290-
PoRepSectorSP *int64
292+
PoRepSector *int64
293+
PoRepSectorSP *int64
294+
PoRepSectorMiner string
291295
}
292296

293297
var posted time.Time
@@ -300,15 +304,15 @@ func (a *WebRPC) ClusterNodeInfo(ctx context.Context, id int64) (*MachineInfo, e
300304
// try to find in the porep pipeline
301305
rows4, err := a.deps.DB.Query(ctx, `SELECT sp_id, sector_number FROM sectors_sdr_pipeline
302306
WHERE task_id_sdr=$1
303-
OR task_id_tree_d=$1
304-
OR task_id_tree_c=$1
305-
OR task_id_tree_r=$1
306-
OR task_id_precommit_msg=$1
307-
OR task_id_porep=$1
308-
OR task_id_commit_msg=$1
309-
OR task_id_finalize=$1
310-
OR task_id_move_storage=$1
311-
`, t.ID)
307+
OR task_id_tree_d=$1
308+
OR task_id_tree_c=$1
309+
OR task_id_tree_r=$1
310+
OR task_id_synth=$1
311+
OR task_id_precommit_msg=$1
312+
OR task_id_porep=$1
313+
OR task_id_commit_msg=$1
314+
OR task_id_finalize=$1
315+
OR task_id_move_storage=$1`, t.ID)
312316
if err != nil {
313317
return nil, err
314318
}
@@ -321,6 +325,11 @@ func (a *WebRPC) ClusterNodeInfo(ctx context.Context, id int64) (*MachineInfo, e
321325
}
322326
t.PoRepSector = &sector
323327
t.PoRepSectorSP = &spid
328+
maddr, err := address.NewIDAddress(uint64(spid))
329+
if err != nil {
330+
return nil, err
331+
}
332+
t.PoRepSectorMiner = maddr.String()
324333
}
325334

326335
rows4.Close()

‎web/api/webrpc/deals.go‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ type OpenDealInfo struct {
2222

2323
PieceSizeStr string `db:"-"`
2424
CreatedAtStr string `db:"-"`
25+
26+
Miner string
2527
}
2628

2729
func (a *WebRPC) DealsPending(ctx context.Context) ([]OpenDealInfo, error) {
@@ -34,6 +36,11 @@ func (a *WebRPC) DealsPending(ctx context.Context) ([]OpenDealInfo, error) {
3436
for i, deal := range deals {
3537
deals[i].PieceSizeStr = types.SizeStr(types.NewInt(deal.PieceSize))
3638
deals[i].CreatedAtStr = deal.CreatedAt.Format("2006-01-02 15:04:05")
39+
maddr, err := address.NewIDAddress(uint64(deals[i].Actor))
40+
if err != nil {
41+
return nil, err
42+
}
43+
deals[i].Miner = maddr.String()
3744
}
3845

3946
return deals, nil

‎web/api/webrpc/storage_stats.go‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ import (
99
"github.com/samber/lo"
1010
"github.com/snadrus/must"
1111

12+
"github.com/filecoin-project/go-address"
13+
1214
"github.com/filecoin-project/curio/lib/paths"
1315
"github.com/filecoin-project/curio/lib/storiface"
1416

@@ -18,6 +20,7 @@ import (
1820
type StorageGCStats struct {
1921
Actor int64 `db:"sp_id"`
2022
Count int `db:"count"`
23+
Miner string
2124
}
2225

2326
func (a *WebRPC) StorageGCStats(ctx context.Context) ([]StorageGCStats, error) {
@@ -26,6 +29,15 @@ func (a *WebRPC) StorageGCStats(ctx context.Context) ([]StorageGCStats, error) {
2629
if err != nil {
2730
return nil, err
2831
}
32+
33+
for _, s := range stats {
34+
maddr, err := address.NewIDAddress(uint64(s.Actor))
35+
if err != nil {
36+
return nil, err
37+
}
38+
s.Miner = maddr.String()
39+
}
40+
2941
return stats, nil
3042
}
3143

@@ -86,6 +98,8 @@ type StorageGCMarks struct {
8698
// db ignored
8799
TypeName string `db:"-"`
88100
PathType string `db:"-"`
101+
102+
Miner string
89103
}
90104

91105
func (a *WebRPC) StorageGCMarks(ctx context.Context) ([]StorageGCMarks, error) {
@@ -115,6 +129,11 @@ func (a *WebRPC) StorageGCMarks(ctx context.Context) ([]StorageGCMarks, error) {
115129
return must.One(url.Parse(u)).Host
116130
})
117131
marks[i].Urls = strings.Join(us, ", ")
132+
maddr, err := address.NewIDAddress(uint64(marks[i].Actor))
133+
if err != nil {
134+
return nil, err
135+
}
136+
marks[i].Miner = maddr.String()
118137
}
119138

120139
return marks, nil

‎web/api/webrpc/tasks.go‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@ package webrpc
22

33
import (
44
"context"
5+
"strconv"
56
"time"
67

78
"github.com/samber/lo"
89

10+
"github.com/filecoin-project/go-address"
11+
912
"github.com/filecoin-project/curio/harmony/harmonydb"
1013
"github.com/filecoin-project/curio/harmony/harmonytask"
1114
)
@@ -19,6 +22,8 @@ type TaskSummary struct {
1922

2023
// db ignored
2124
SincePostedStr string `db:"-"`
25+
26+
Miner string
2227
}
2328

2429
func (a *WebRPC) ClusterTaskSummary(ctx context.Context) ([]TaskSummary, error) {
@@ -39,6 +44,23 @@ func (a *WebRPC) ClusterTaskSummary(ctx context.Context) ([]TaskSummary, error)
3944
if v, ok := a.taskSPIDs[ts[i].Name]; ok {
4045
ts[i].SpID = v.GetSpid(a.deps.DB, ts[i].ID)
4146
}
47+
48+
if ts[i].SpID != "" {
49+
spid, err := strconv.ParseInt(ts[i].SpID, 10, 64)
50+
if err != nil {
51+
return nil, err
52+
}
53+
54+
if spid > 0 {
55+
maddr, err := address.NewIDAddress(uint64(spid))
56+
if err != nil {
57+
return nil, err
58+
}
59+
ts[i].Miner = maddr.String()
60+
} else {
61+
ts[i].Miner = ""
62+
}
63+
}
4264
}
4365

4466
return ts, nil

‎web/api/webrpc/upgrade.go‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55

66
"golang.org/x/xerrors"
77

8+
"github.com/filecoin-project/go-address"
89
"github.com/filecoin-project/go-state-types/abi"
910

1011
"github.com/filecoin-project/curio/tasks/snap"
@@ -31,6 +32,8 @@ type UpgradeSector struct {
3132
Failed bool `db:"failed"`
3233
FailedReason string `db:"failed_reason"`
3334
FailedMsg string `db:"failed_reason_msg"`
35+
36+
Miner string
3437
}
3538

3639
func (a *WebRPC) UpgradeSectors(ctx context.Context) ([]UpgradeSector, error) {
@@ -39,6 +42,15 @@ func (a *WebRPC) UpgradeSectors(ctx context.Context) ([]UpgradeSector, error) {
3942
if err != nil {
4043
return nil, err
4144
}
45+
46+
for _, s := range sectors {
47+
maddr, err := address.NewIDAddress(s.SpID)
48+
if err != nil {
49+
return nil, err
50+
}
51+
s.Miner = maddr.String()
52+
}
53+
4254
return sectors, nil
4355
}
4456

‎web/api/webrpc/win_stats.go‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ import (
44
"context"
55
"fmt"
66
"time"
7+
8+
"github.com/filecoin-project/go-address"
79
)
810

911
type WinStats struct {
@@ -21,6 +23,8 @@ type WinStats struct {
2123
TaskSuccess string `db:"-"`
2224
IncludedStr string `db:"-"`
2325
ComputeTime string `db:"-"`
26+
27+
Miner string
2428
}
2529

2630
func (a *WebRPC) WinStats(ctx context.Context) ([]WinStats, error) {
@@ -74,6 +78,11 @@ func (a *WebRPC) WinStats(ctx context.Context) ([]WinStats, error) {
7478
if success > 0 {
7579
marks[i].TaskSuccess += "Success"
7680
}
81+
maddr, err := address.NewIDAddress(uint64(marks[i].Actor))
82+
if err != nil {
83+
return nil, err
84+
}
85+
marks[i].Miner = maddr.String()
7786
}
7887

7988
return marks, nil

‎web/static/cluster-tasks.mjs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ customElements.define('cluster-tasks', class ClusterTasks extends LitElement {
6969
.map(
7070
(entry) => html`
7171
<tr>
72-
<td>${entry.SpID ? 'f0' + entry.SpID : 'n/a'}</td>
72+
<td>${entry.SpID ? entry.Miner : 'n/a'}</td>
7373
<td>${entry.Name}</td>
7474
<td>${entry.ID}</td>
7575
<td>${entry.SincePostedStr}</td>

‎web/static/deals/pending-deals.mjs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class PendingDeals extends LitElement {
4242
<tbody>
4343
${this.data.map(entry => html`
4444
<tr>
45-
<td>f0${entry.Actor}</td>
45+
<td>${entry.Miner}</td>
4646
<td>${entry.SectorNumber}</td>
4747
<td>${entry.PieceCID}</td>
4848
<td>${entry.PieceSizeStr}</td>

‎web/static/gc/gc-marks.mjs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class StorageGCStats extends LitElement {
4141
<tbody>
4242
${this.data.map(entry => html`
4343
<tr>
44-
<td>f0${entry.Actor}</td>
44+
<td>${entry.Miner}</td>
4545
<td>${entry.SectorNum}</td>
4646
<td>
4747
<div>

‎web/static/pages/node_info/node-info.mjs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ customElements.define('node-info',class NodeInfoElement extends LitElement {
111111
<td>${task.ID}</td>
112112
<td>${task.Task}</td>
113113
<td>${task.Posted}</td>
114-
<td>${task.PoRepSector ? html`<a href="/pages/sector/?sp=f0${task.PoRepSectorSP}&id=${task.PoRepSector}">f0${task.PoRepSectorSP}:${task.PoRepSector}</a>` : ''}</td>
114+
<td>${task.PoRepSector ? html`<a href="/pages/sector/?sp=${task.PoRepSectorMiner}&id=${task.PoRepSector}">${task.PoRepSectorMiner}:${task.PoRepSector}</a>` : ''}</td>
115115
</tr>
116116
`)}
117117
</table>

0 commit comments

Comments
 (0)