cerc-io/lotus
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Fix storage miner info for ePoSt

Browse Source
This commit is contained in:
Łukasz Magiera 2019-12-02 17:47:09 +01:00
parent 66a0aaf253
commit 24be85e8ec
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cmd/lotus-storage-miner/info.go
View File

@ -60,18 +60,25 @@ var infoCmd = &cli.Command{
} }
fmt.Printf("Worker use: %d / %d (+%d)\n", wstat.Total-wstat.Reserved-wstat.Free, wstat.Total, wstat.Reserved) fmt.Printf("Worker use: %d / %d (+%d)\n", wstat.Total-wstat.Reserved-wstat.Free, wstat.Total, wstat.Reserved)
ppe, err := api.StateMinerElectionPeriodStart(ctx, maddr, nil) eps, err := api.StateMinerElectionPeriodStart(ctx, maddr, nil)
if err != nil { if err != nil {
return err return err
} }
if ppe != 0 { if eps != 0 {
head, err := api.ChainHead(ctx) head, err := api.ChainHead(ctx)
if err != nil { if err != nil {
return err return err
} }
pdiff := int64(ppe - head.Height()) lastEps := int64(head.Height() - eps)
pdifft := pdiff * build.BlockDelay lastEpsS := lastEps * build.BlockDelay
fmt.Printf("Proving Period: %d, in %d Blocks (~%dm %ds)\n", ppe, pdiff, pdifft/60, pdifft%60)
next := lastEps + build.SlashablePowerDelay
nextS := next * build.BlockDelay
fmt.Printf("PoSt Submissions:\n")
fmt.Printf("\tPrevious: Epoch %d (%d block(s), ~%dm %ds ago)\n", eps, lastEps, lastEpsS/60, lastEpsS%60)
fmt.Printf("\tDeadline: Epoch %d (in %d blocks, ~%dm %ds)\n", eps+build.SlashablePowerDelay, next, nextS/60, nextS%60)
} else { } else {
fmt.Printf("Proving Period: Not Proving\n") fmt.Printf("Proving Period: Not Proving\n")
} }

2
lotuspond/main.go
View File

@ -88,6 +88,8 @@ var shCmd = &cli.Command{
} }
} }
shcmd.Env = append(os.Environ(), shcmd.Env...)
shcmd.Stdin = os.Stdin shcmd.Stdin = os.Stdin
shcmd.Stdout = os.Stdout shcmd.Stdout = os.Stdout
shcmd.Stderr = os.Stderr shcmd.Stderr = os.Stderr