From ccfa03138d5ae510a0be8a030258e0fe0c266c31 Mon Sep 17 00:00:00 2001 From: whyrusleeping Date: Mon, 18 Nov 2019 12:18:59 -0600 Subject: [PATCH] fix ordering of block applies in reorg ops --- chain/events/events_height.go | 3 +-- chain/store/store.go | 7 +++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/chain/events/events_height.go b/chain/events/events_height.go index 524efd0d5..a05a3e1be 100644 --- a/chain/events/events_height.go +++ b/chain/events/events_height.go @@ -70,9 +70,8 @@ func (e *heightEvents) headChangeAt(rev, app []*types.TipSet) error { } } - tail := len(app) - 1 for i := range app { - ts := app[tail-i] + ts := app[i] if err := e.tsc.add(ts); err != nil { return err diff --git a/chain/store/store.go b/chain/store/store.go index 018b5bbc8..c2278add3 100644 --- a/chain/store/store.go +++ b/chain/store/store.go @@ -254,6 +254,13 @@ func (cs *ChainStore) reorgWorker(ctx context.Context) chan<- reorg { log.Error("computing reorg ops failed: ", err) 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 { if err := hcf(revert, apply); err != nil { log.Error("head change func errored (BAD): ", err)