Skip to content

Commit

Permalink
fix: srv log error (OffchainLabs#424)
Browse files Browse the repository at this point in the history
  • Loading branch information
@terencechain
terencechain authored Aug 28, 2023
1 parent 2ab4a80 commit 1d60251
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 33 deletions.
4 changes: 2 additions & 2 deletions assertions/poster.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ func NewPoster(

func (p *Poster) Start(ctx context.Context) {
if _, err := p.PostAssertion(ctx); err != nil {
srvlog.Error("Could not submit latest assertion to L1", err)
srvlog.Error("Could not submit latest assertion to L1", log.Ctx{"err": err})
}
ticker := time.NewTicker(p.postInterval)
defer ticker.Stop()
for {
select {
case <-ticker.C:
if _, err := p.PostAssertion(ctx); err != nil {
srvlog.Error("Could not submit latest assertion to L1", err)
srvlog.Error("Could not submit latest assertion to L1", log.Ctx{"err": err})
}
case <-ctx.Done():
return
Expand Down
12 changes: 6 additions & 6 deletions assertions/scanner.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,20 +79,20 @@ func NewScanner(
func (s *Scanner) Start(ctx context.Context) {
latestConfirmed, err := s.chain.LatestConfirmed(ctx)
if err != nil {
srvlog.Error("Could not get latest confirmed assertion", err)
srvlog.Error("Could not get latest confirmed assertion", log.Ctx{"err": err})
return
}
fromBlock, err := latestConfirmed.CreatedAtBlock()
if err != nil {
srvlog.Error("Could not get creation block", err)
srvlog.Error("Could not get creation block", log.Ctx{"err": err})
return
}

filterer, err := retry.UntilSucceeds(ctx, func() (*rollupgen.RollupUserLogicFilterer, error) {
return rollupgen.NewRollupUserLogicFilterer(s.rollupAddr, s.backend)
})
if err != nil {
srvlog.Error("Could not get rollup user logic filterer", err)
srvlog.Error("Could not get rollup user logic filterer", log.Ctx{"err": err})
return
}
ticker := time.NewTicker(s.pollInterval)
Expand All @@ -102,7 +102,7 @@ func (s *Scanner) Start(ctx context.Context) {
case <-ticker.C:
latestBlock, err := s.backend.HeaderByNumber(ctx, nil)
if err != nil {
srvlog.Error("Could not get header by number", err)
srvlog.Error("Could not get header by number", log.Ctx{"err": err})
continue
}
if !latestBlock.Number.IsUint64() {
Expand All @@ -122,7 +122,7 @@ func (s *Scanner) Start(ctx context.Context) {
return true, s.checkForAssertionAdded(ctx, filterer, filterOpts)
})
if err != nil {
srvlog.Error("Could not check for assertion added", err)
srvlog.Error("Could not check for assertion added", log.Ctx{"err": err})
return
}
fromBlock = toBlock
Expand All @@ -143,7 +143,7 @@ func (s *Scanner) checkForAssertionAdded(
}
defer func() {
if err = it.Close(); err != nil {
srvlog.Error("Could not close filter iterator", err)
srvlog.Error("Could not close filter iterator", log.Ctx{"err": err})
}
}()
for it.Next() {
Expand Down
42 changes: 21 additions & 21 deletions challenge-manager/chain-watcher/watcher.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ func (w *Watcher) Start(ctx context.Context) {
return w.getStartEndBlockNum(ctx)
})
if err != nil {
srvlog.Error("Could not get start and end block num", err)
srvlog.Error("Could not get start and end block num", log.Ctx{"err": err})
return
}
fromBlock := scanRange.startBlockNum
Expand All @@ -175,14 +175,14 @@ func (w *Watcher) Start(ctx context.Context) {
return w.chain.SpecChallengeManager(ctx)
})
if err != nil {
srvlog.Error("Could not get spec challenge manager", err)
srvlog.Error("Could not get spec challenge manager", log.Ctx{"err": err})
return
}
filterer, err := retry.UntilSucceeds(ctx, func() (*challengeV2gen.EdgeChallengeManagerFilterer, error) {
return challengeV2gen.NewEdgeChallengeManagerFilterer(challengeManager.Address(), w.backend)
})
if err != nil {
srvlog.Error("Could not initialize edge challenge manager filterer", err)
srvlog.Error("Could not initialize edge challenge manager filterer", log.Ctx{"err": err})
return
}
filterOpts := &bind.FilterOpts{
Expand All @@ -196,35 +196,35 @@ func (w *Watcher) Start(ctx context.Context) {
return true, w.checkForEdgeAdded(ctx, filterer, filterOpts)
})
if err != nil {
srvlog.Error("Could not check for edge added", err)
srvlog.Error("Could not check for edge added", log.Ctx{"err": err})
return
}
_, err = retry.UntilSucceeds(ctx, func() (bool, error) {
return true, w.checkForEdgeConfirmedByOneStepProof(ctx, filterer, filterOpts)
})
if err != nil {
srvlog.Error("Could not check for edge confirmed by osp", err)
srvlog.Error("Could not check for edge confirmed by osp", log.Ctx{"err": err})
return
}
_, err = retry.UntilSucceeds(ctx, func() (bool, error) {
return true, w.checkForEdgeConfirmedByChildren(ctx, filterer, filterOpts)
})
if err != nil {
srvlog.Error("Could not check for edge confirmed by children", err)
srvlog.Error("Could not check for edge confirmed by children", log.Ctx{"err": err})
return
}
_, err = retry.UntilSucceeds(ctx, func() (bool, error) {
return true, w.checkForEdgeConfirmedByClaim(ctx, filterer, filterOpts)
})
if err != nil {
srvlog.Error("Could not check for edge confirmed by claim", err)
srvlog.Error("Could not check for edge confirmed by claim", log.Ctx{"err": err})
return
}
_, err = retry.UntilSucceeds(ctx, func() (bool, error) {
return true, w.checkForEdgeConfirmedByTime(ctx, filterer, filterOpts)
})
if err != nil {
srvlog.Error("Could not check for edge confirmed by time", err)
srvlog.Error("Could not check for edge confirmed by time", log.Ctx{"err": err})
return
}

Expand All @@ -238,7 +238,7 @@ func (w *Watcher) Start(ctx context.Context) {
case <-ticker.C:
latestBlock, err := w.backend.HeaderByNumber(ctx, nil)
if err != nil {
srvlog.Error("Could not get latest header", err)
srvlog.Error("Could not get latest header", log.Ctx{"err": err})
continue
}
if !latestBlock.Number.IsUint64() {
Expand All @@ -254,14 +254,14 @@ func (w *Watcher) Start(ctx context.Context) {
return w.chain.SpecChallengeManager(ctx)
})
if err != nil {
srvlog.Error("Could not get spec challenge manager", err)
srvlog.Error("Could not get spec challenge manager", log.Ctx{"err": err})
return
}
filterer, err = retry.UntilSucceeds(ctx, func() (*challengeV2gen.EdgeChallengeManagerFilterer, error) {
return challengeV2gen.NewEdgeChallengeManagerFilterer(challengeManager.Address(), w.backend)
})
if err != nil {
srvlog.Error("Could not get challenge manager filterer", err)
srvlog.Error("Could not get challenge manager filterer", log.Ctx{"err": err})
return
}
filterOpts := &bind.FilterOpts{
Expand All @@ -270,23 +270,23 @@ func (w *Watcher) Start(ctx context.Context) {
Context: ctx,
}
if err = w.checkForEdgeAdded(ctx, filterer, filterOpts); err != nil {
srvlog.Error("Could not check for edge added", err)
srvlog.Error("Could not check for edge added", log.Ctx{"err": err})
continue
}
if err = w.checkForEdgeConfirmedByOneStepProof(ctx, filterer, filterOpts); err != nil {
srvlog.Error("Could not check for edge confirmed by osp", err)
srvlog.Error("Could not check for edge confirmed by osp", log.Ctx{"err": err})
continue
}
if err = w.checkForEdgeConfirmedByChildren(ctx, filterer, filterOpts); err != nil {
srvlog.Error("Could not check for edge confirmed by children", err)
srvlog.Error("Could not check for edge confirmed by children", log.Ctx{"err": err})
continue
}
if err = w.checkForEdgeConfirmedByTime(ctx, filterer, filterOpts); err != nil {
srvlog.Error("Could not check for edge confirmed by time", err)
srvlog.Error("Could not check for edge confirmed by time", log.Ctx{"err": err})
continue
}
if err = w.checkForEdgeConfirmedByClaim(ctx, filterer, filterOpts); err != nil {
srvlog.Error("Could not check for edge confirmed by claim", err)
srvlog.Error("Could not check for edge confirmed by claim", log.Ctx{"err": err})
continue
}
fromBlock = toBlock
Expand Down Expand Up @@ -355,7 +355,7 @@ func (w *Watcher) checkForEdgeAdded(
}
defer func() {
if err = it.Close(); err != nil {
srvlog.Error("Could not close filter iterator", err)
srvlog.Error("Could not close filter iterator", log.Ctx{"err": err})
}
}()
for it.Next() {
Expand Down Expand Up @@ -439,7 +439,7 @@ func (w *Watcher) checkForEdgeConfirmedByOneStepProof(
}
defer func() {
if err = it.Close(); err != nil {
srvlog.Error("Could not close filter iterator", err)
srvlog.Error("Could not close filter iterator", log.Ctx{"err": err})
}
}()
for it.Next() {
Expand Down Expand Up @@ -477,7 +477,7 @@ func (w *Watcher) checkForEdgeConfirmedByTime(
}
defer func() {
if err = it.Close(); err != nil {
srvlog.Error("Could not close filter iterator", err)
srvlog.Error("Could not close filter iterator", log.Ctx{"err": err})
}
}()
for it.Next() {
Expand Down Expand Up @@ -515,7 +515,7 @@ func (w *Watcher) checkForEdgeConfirmedByChildren(
}
defer func() {
if err = it.Close(); err != nil {
srvlog.Error("Could not close filter iterator", err)
srvlog.Error("Could not close filter iterator", log.Ctx{"err": err})
}
}()
for it.Next() {
Expand Down Expand Up @@ -553,7 +553,7 @@ func (w *Watcher) checkForEdgeConfirmedByClaim(
}
defer func() {
if err = it.Close(); err != nil {
srvlog.Error("Could not close filter iterator", err)
srvlog.Error("Could not close filter iterator", log.Ctx{"err": err})
}
}()
for it.Next() {
Expand Down
6 changes: 5 additions & 1 deletion challenge-manager/challenges.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,11 @@ func (m *Manager) ChallengeAssertion(ctx context.Context, id protocol.AssertionH
return errors.New("assertion creation info inbox max count was not a uint64")
}
if verifiedErr := m.watcher.AddVerifiedHonestEdge(ctx, levelZeroEdge); verifiedErr != nil {
srvlog.Error("could not add verified honest edge with id %#x to chain watcher: %w", levelZeroEdge.Id(), verifiedErr)
fields := log.Ctx{
"edgeId": levelZeroEdge.Id(),
"err": verifiedErr,
}
srvlog.Error("could not add verified honest edge with id %#x to chain watcher: %w", fields)
}
// Start tracking the challenge.
tracker, err := edgetracker.New(
Expand Down
6 changes: 3 additions & 3 deletions challenge-manager/edge-tracker/tracker.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -538,10 +538,10 @@ func (et *Tracker) bisect(ctx context.Context) (protocol.SpecEdge, protocol.Spec
if addVerifiedErr := et.chainWatcher.AddVerifiedHonestEdge(ctx, firstChild); addVerifiedErr != nil {
// We simply log an error, as if this fails, it will be added later on by the chain watcher
// scraping events from the chain, but this is a helpful optimization.
srvlog.Error("Could not add verified honest edge to chain watcher", addVerifiedErr)
srvlog.Error("Could not add verified honest edge to chain watcher", log.Ctx{"err": addVerifiedErr})
}
if addVerifiedErr := et.chainWatcher.AddVerifiedHonestEdge(ctx, secondChild); addVerifiedErr != nil {
srvlog.Error("Could not add verified honest edge to chain watcher", addVerifiedErr)
srvlog.Error("Could not add verified honest edge to chain watcher", log.Ctx{"err": addVerifiedErr})
}
return firstChild, secondChild, nil
}
Expand Down Expand Up @@ -643,7 +643,7 @@ func (et *Tracker) openSubchallengeLeaf(ctx context.Context) error {
if addVerifiedErr := et.chainWatcher.AddVerifiedHonestEdge(ctx, addedLeaf); addVerifiedErr != nil {
// We simply log an error, as if this fails, it will be added later on by the chain watcher
// scraping events from the chain, but this is a helpful optimization.
srvlog.Error("Could not add verified honest edge to chain watcher", addVerifiedErr)
srvlog.Error("Could not add verified honest edge to chain watcher", log.Ctx{"err": addVerifiedErr})
}

tracker, err := New(
Expand Down

0 comments on commit 1d60251

Please sign in to comment.