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

Resolve conflict

Browse Source
This commit is contained in:
Aayush Rajasekaran 2022-01-12 19:15:56 -05:00
parent 6f8d00310b
commit 52411b12e3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/lotus-miner/sectors.go
View File

@ -1557,7 +1557,7 @@ var sectorsMarkForUpgradeCmd = &cli.Command{
return xerrors.Errorf("failed to get chain head: %w", err) return xerrors.Errorf("failed to get chain head: %w", err)
} }
twoDays := abi.ChainEpoch(2 * builtin.EpochsInDay) twoDays := abi.ChainEpoch(2 * builtin.EpochsInDay)
if head.Height() > (build.UpgradeSnapDealsHeight - twoDays) { if head.Height() > (build.UpgradeOhSnapHeight - twoDays) {
return xerrors.Errorf("OhSnap is coming soon, " + return xerrors.Errorf("OhSnap is coming soon, " +
"please use `snap-up` to upgrade your cc sectors after the network v15 upgrade!") "please use `snap-up` to upgrade your cc sectors after the network v15 upgrade!")
} }