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

use chain head instead of mining base

Browse Source
This commit is contained in:
laser 2020-06-17 10:56:42 -07:00
parent ed5b74b1ae
commit fcdfda8ba2
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/lotus-storage-miner/market.go
View File

@ -140,13 +140,19 @@ var getAskCmd = &cli.Command{
Action: func(cctx *cli.Context) error { Action: func(cctx *cli.Context) error {
ctx := lcli.DaemonContext(cctx) ctx := lcli.DaemonContext(cctx)
api, closer, err := lcli.GetStorageMinerAPI(cctx) fnapi, closer, err := lcli.GetFullNodeAPI(cctx)
if err != nil { if err != nil {
return err return err
} }
defer closer() defer closer()
sask, err := api.MarketGetAsk(ctx) smapi, closer, err := lcli.GetStorageMinerAPI(cctx)
if err != nil {
return err
}
defer closer()
sask, err := smapi.MarketGetAsk(ctx)
if err != nil { if err != nil {
return err return err
} }
@ -164,12 +170,12 @@ var getAskCmd = &cli.Command{
return w.Flush() return w.Flush()
} }
miningBaseTs, err := api.MiningBase(ctx) head, err := fnapi.ChainHead(ctx)
if err != nil { if err != nil {
return err return err
} }
dlt := ask.Expiry - miningBaseTs.Height() dlt := ask.Expiry - head.Height()
rem := "<expired>" rem := "<expired>"
if dlt > 0 { if dlt > 0 {
rem = (time.Second * time.Duration(dlt*build.BlockDelay)).String() rem = (time.Second * time.Duration(dlt*build.BlockDelay)).String()