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

use right fork trigger height

Browse Source
This commit is contained in:
whyrusleeping 2020-01-17 21:35:45 -08:00
parent f9ea6969c3
commit c6bf252a21
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chain/actors/actor_storagepower.go
View File

@ -87,7 +87,7 @@ func (spa StoragePowerActor) CreateStorageMiner(act *types.Actor, vmctx types.VM
// FORK // FORK
minerCid := StorageMinerCodeCid minerCid := StorageMinerCodeCid
if vmctx.BlockHeight() > build.ForkBlizzardHeight { if vmctx.BlockHeight() > build.ForkFrigidHeight {
minerCid = StorageMiner2CodeCid minerCid = StorageMiner2CodeCid
} }

2
chain/stmgr/forks.go
View File

@ -18,6 +18,7 @@ func (sm *StateManager) handleStateForks(ctx context.Context, pstate cid.Cid, he
for i := parentH; i < height; i++ { for i := parentH; i < height; i++ {
switch i { switch i {
case build.ForkBlizzardHeight: case build.ForkBlizzardHeight:
log.Warnw("Executing blizzard fork logic", "height", i)
npstate, err := fixBlizzardAMTBug(ctx, sm, pstate) npstate, 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)
@ -25,6 +26,7 @@ func (sm *StateManager) handleStateForks(ctx context.Context, pstate cid.Cid, he
return npstate, nil return npstate, nil
case build.ForkFrigidHeight: case build.ForkFrigidHeight:
log.Warnw("Executing frigid fork logic", "height", i)
npstate, err := fixBlizzardAMTBug(ctx, sm, pstate) npstate, 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)