Skip to content

Commit

Permalink
auto repair events
Browse files Browse the repository at this point in the history
  • Loading branch information
aarshkshah1992 committed Sep 14, 2024
1 parent efe90f8 commit 6501c3a
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 1 deletion.
16 changes: 15 additions & 1 deletion chain/index/events.go
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,21 @@ func (si *SqliteIndexer) loadExecutedMessages(ctx context.Context, msgTs, rctTs

eventsArr, err := amt4.LoadAMT(ctx, st, *rct.EventsRoot, amt4.UseTreeBitWidth(types.EventAMTBitwidth))
if err != nil {
return nil, xerrors.Errorf("error loading events amt: %w", err)
if si.tipsetExecutorFnc == nil {
return nil, xerrors.Errorf("failed to load events amt for message %s: %w", ems[i].msg.Cid(), err)
}
log.Warnf("failed to load events amt for message %s: %s; recomputing tipset state to regenerate events", ems[i].msg.Cid(), err)

_, _, err = si.tipsetExecutorFnc(ctx, msgTs)
if err != nil {
return nil, xerrors.Errorf("failed to recompute missing events; failed to recompute tipset state: %w", err)
}

eventsArr, err = amt4.LoadAMT(ctx, st, *rct.EventsRoot, amt4.UseTreeBitWidth(types.EventAMTBitwidth))
if err != nil {
return nil, xerrors.Errorf("failed to load events amt for message %s: %w", ems[i].msg.Cid(), err)
}
log.Infof("successfully recomputed tipset state and loaded events amt for message %s", ems[i].msg.Cid())
}

ems[i].evs = make([]types.Event, eventsArr.Len())
Expand Down
6 changes: 6 additions & 0 deletions chain/index/indexer.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ var _ Indexer = (*SqliteIndexer)(nil)

// IdToRobustAddrFunc is a function type that resolves an actor ID to a robust address
type IdToRobustAddrFunc func(ctx context.Context, emitter abi.ActorID, ts *types.TipSet) (address.Address, bool)
type tipsetExecutorFnc func(ctx context.Context, ts *types.TipSet) (cid.Cid, cid.Cid, error)

type preparedStatements struct {
insertEthTxHashStmt *sql.Stmt
Expand Down Expand Up @@ -53,6 +54,7 @@ type SqliteIndexer struct {
cs ChainStore

idToRobustAddrFunc IdToRobustAddrFunc
tipsetExecutorFnc tipsetExecutorFnc

stmts *preparedStatements

Expand Down Expand Up @@ -120,6 +122,10 @@ func (si *SqliteIndexer) SetIdToRobustAddrFunc(idToRobustAddrFunc IdToRobustAddr
si.idToRobustAddrFunc = idToRobustAddrFunc
}

func (si *SqliteIndexer) SetTipsetExecutorFnc(tipsetExecutorFnc tipsetExecutorFnc) {
si.tipsetExecutorFnc = tipsetExecutorFnc
}

func (si *SqliteIndexer) Close() error {
si.closeLk.Lock()
defer si.closeLk.Unlock()
Expand Down
1 change: 1 addition & 0 deletions chain/index/interface.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ type Indexer interface {
IndexEthTxHash(ctx context.Context, txHash ethtypes.EthHash, c cid.Cid) error

SetIdToRobustAddrFunc(idToRobustAddrFunc IdToRobustAddrFunc)
SetTipsetExecutorFnc(tipsetExecutorFnc tipsetExecutorFnc)
Apply(ctx context.Context, from, to *types.TipSet) error
Revert(ctx context.Context, from, to *types.TipSet) error

Expand Down
5 changes: 5 additions & 0 deletions node/modules/chainindex.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (

"github.com/filecoin-project/go-address"
"github.com/filecoin-project/go-state-types/abi"
"github.com/ipfs/go-cid"

"github.com/filecoin-project/lotus/chain/events"
"github.com/filecoin-project/lotus/chain/index"
Expand Down Expand Up @@ -70,6 +71,10 @@ func InitChainIndexer(lc fx.Lifecycle, mctx helpers.MetricsCtx, indexer index.In
return *actor.DelegatedAddress, true
})

indexer.SetTipsetExecutorFnc(func(ctx context.Context, ts *types.TipSet) (cid.Cid, cid.Cid, error) {
return sm.RecomputeTipSetState(ctx, ts)
})

ch, err := mp.Updates(ctx)
if err != nil {
return err
Expand Down

0 comments on commit 6501c3a

Please sign in to comment.