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

fix ordering of block applies in reorg ops

Browse Source
This commit is contained in:
whyrusleeping 2019-11-18 12:18:59 -06:00
parent eeec3c1783
commit ccfa03138d
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
chain/events/events_height.go
View File

@ -70,9 +70,8 @@ func (e *heightEvents) headChangeAt(rev, app []*types.TipSet) error {
} }
} }
tail := len(app) - 1
for i := range app { for i := range app {
ts := app[tail-i] ts := app[i]
if err := e.tsc.add(ts); err != nil { if err := e.tsc.add(ts); err != nil {
return err return err

7
chain/store/store.go
View File

@ -254,6 +254,13 @@ func (cs *ChainStore) reorgWorker(ctx context.Context) chan<- reorg {
log.Error("computing reorg ops failed: ", err) log.Error("computing reorg ops failed: ", err)
continue continue
} }
// reverse the apply array
for i := len(apply)/2 - 1; i >= 0; i-- {
opp := len(apply) - 1 - i
apply[i], apply[opp] = apply[opp], apply[i]
}
for _, hcf := range cs.headChangeNotifs { for _, hcf := range cs.headChangeNotifs {
if err := hcf(revert, apply); err != nil { if err := hcf(revert, apply); err != nil {
log.Error("head change func errored (BAD): ", err) log.Error("head change func errored (BAD): ", err)