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

Merge pull request #4114 from filecoin-project/fix/fork-after-cron

Browse Source 
Run fork function after cron for null block safety
This commit is contained in:
Aayush Rajasekaran 2020-10-02 23:05:36 -04:00 committed by GitHub
commit 4631cee564
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
chain/stmgr/stmgr.go
View File

@ -209,6 +209,18 @@ func (sm *StateManager) ApplyBlocks(ctx context.Context, parentEpoch abi.ChainEp
} }
for i := parentEpoch; i < epoch; i++ { for i := parentEpoch; i < epoch; i++ {
if i > parentEpoch {
// run cron for null rounds if any
if err := runCron(); err != nil {
return cid.Undef, cid.Undef, err
}
pstate, err = vmi.Flush(ctx)
if err != nil {
return cid.Undef, cid.Undef, xerrors.Errorf("flushing vm: %w", err)
}
}
// handle state forks // handle state forks
// XXX: The state tree // XXX: The state tree
newState, err := sm.handleStateForks(ctx, pstate, i, cb, ts) newState, err := sm.handleStateForks(ctx, pstate, i, cb, ts)
@ -223,18 +235,6 @@ func (sm *StateManager) ApplyBlocks(ctx context.Context, parentEpoch abi.ChainEp
} }
} }
if i > parentEpoch {
// run cron for null rounds if any
if err := runCron(); err != nil {
return cid.Cid{}, cid.Cid{}, err
}
newState, err = vmi.Flush(ctx)
if err != nil {
return cid.Undef, cid.Undef, xerrors.Errorf("flushing vm: %w", err)
}
}
vmi.SetBlockHeight(i + 1) vmi.SetBlockHeight(i + 1)
pstate = newState pstate = newState
} }