Commit d71d82c0 authored by refcell.eth's avatar refcell.eth Committed by GitHub

fix(op-challenger): preimage scheduler nits (#9277)

parent 3d99b857
...@@ -2,6 +2,7 @@ package keccak ...@@ -2,6 +2,7 @@ package keccak
import ( import (
"context" "context"
"errors"
"sync" "sync"
keccakTypes "github.com/ethereum-optimism/optimism/op-challenger/game/keccak/types" keccakTypes "github.com/ethereum-optimism/optimism/op-challenger/game/keccak/types"
...@@ -52,7 +53,7 @@ func (s *LargePreimageScheduler) run(ctx context.Context) { ...@@ -52,7 +53,7 @@ func (s *LargePreimageScheduler) run(ctx context.Context) {
return return
case blockHash := <-s.ch: case blockHash := <-s.ch:
if err := s.verifyPreimages(ctx, blockHash); err != nil { if err := s.verifyPreimages(ctx, blockHash); err != nil {
s.log.Error("Failed to verify large preimages", "err", err) s.log.Error("Failed to verify large preimages", "blockHash", blockHash, "err", err)
} }
} }
} }
...@@ -63,18 +64,16 @@ func (s *LargePreimageScheduler) Schedule(blockHash common.Hash, _ uint64) error ...@@ -63,18 +64,16 @@ func (s *LargePreimageScheduler) Schedule(blockHash common.Hash, _ uint64) error
case s.ch <- blockHash: case s.ch <- blockHash:
default: default:
s.log.Trace("Skipping preimage check while already processing") s.log.Trace("Skipping preimage check while already processing")
// Already busy processing, skip this update
} }
return nil return nil
} }
func (s *LargePreimageScheduler) verifyPreimages(ctx context.Context, blockHash common.Hash) error { func (s *LargePreimageScheduler) verifyPreimages(ctx context.Context, blockHash common.Hash) error {
var err error
for _, oracle := range s.oracles { for _, oracle := range s.oracles {
if err := s.verifyOraclePreimages(ctx, oracle, blockHash); err != nil { err = errors.Join(err, s.verifyOraclePreimages(ctx, oracle, blockHash))
s.log.Error("Failed to verify preimages in oracle %v: %w", oracle.Addr(), err)
} }
} return err
return nil
} }
func (s *LargePreimageScheduler) verifyOraclePreimages(ctx context.Context, oracle keccakTypes.LargePreimageOracle, blockHash common.Hash) error { func (s *LargePreimageScheduler) verifyOraclePreimages(ctx context.Context, oracle keccakTypes.LargePreimageOracle, blockHash common.Hash) error {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment