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

stmgr: Exetute miner amt after correctly switching to amt2 in miner code

Browse Source
This commit is contained in:
Łukasz Magiera 2020-01-19 17:27:43 +01:00
parent 3c4acbc6cb
commit 55fd0a4e60
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/forks.go
View File

@ -4,5 +4,4 @@ const ForkBlizzardHeight = 6288
const ForkFrigidHeight = 7950 const ForkFrigidHeight = 7950
// you can choose any suitable height here const ForkBootyBayHeight = 10762
const ForkBootyBayHeight = 12000

2
build/version.go
View File

@ -5,7 +5,7 @@ import "fmt"
var CurrentCommit string var CurrentCommit string
// BuildVersion is the local build version, set by build system // BuildVersion is the local build version, set by build system
const BuildVersion = "0.2.4" const BuildVersion = "0.2.5"
var UserVersion = BuildVersion + CurrentCommit var UserVersion = BuildVersion + CurrentCommit

14
chain/stmgr/forks.go
View File

@ -19,20 +19,22 @@ func (sm *StateManager) handleStateForks(ctx context.Context, pstate cid.Cid, he
switch i { switch i {
case build.ForkBlizzardHeight: case build.ForkBlizzardHeight:
log.Warnw("Executing blizzard fork logic", "height", i) log.Warnw("Executing blizzard fork logic", "height", i)
npstate, err := fixBlizzardAMTBug(ctx, sm, pstate) pstate, err = fixBlizzardAMTBug(ctx, sm, pstate)
if err != nil { if err != nil {
return cid.Undef, xerrors.Errorf("blizzard bug fix failed: %w", err) return cid.Undef, xerrors.Errorf("blizzard bug fix failed: %w", err)
} }
return npstate, nil
case build.ForkFrigidHeight: case build.ForkFrigidHeight:
log.Warnw("Executing frigid fork logic", "height", i) log.Warnw("Executing frigid fork logic", "height", i)
npstate, err := fixBlizzardAMTBug(ctx, sm, pstate) pstate, err = fixBlizzardAMTBug(ctx, sm, pstate)
if err != nil { if err != nil {
return cid.Undef, xerrors.Errorf("frigid bug fix failed: %w", err) return cid.Undef, xerrors.Errorf("frigid bug fix failed: %w", err)
} }
case build.ForkBootyBayHeight:
return npstate, nil log.Warnw("Executing booty bay fork logic", "height", i)
pstate, err = fixBlizzardAMTBug(ctx, sm, pstate)
if err != nil {
return cid.Undef, xerrors.Errorf("booty bay bug fix failed: %w", err)
}
} }
} }