Commit 42b1f303 authored by Diederik Loerakker's avatar Diederik Loerakker Committed by GitHub

op-node: clip derivation reset to not go past L1 genesis (#2910)

parent b9a90f32
...@@ -99,6 +99,10 @@ func (bq *BatchQueue) ResetStep(ctx context.Context, l1Fetcher L1Fetcher) error ...@@ -99,6 +99,10 @@ func (bq *BatchQueue) ResetStep(ctx context.Context, l1Fetcher L1Fetcher) error
} else { } else {
startNumber -= bq.config.SeqWindowSize startNumber -= bq.config.SeqWindowSize
} }
// clip to genesis
if startNumber < bq.config.Genesis.L1.Number {
startNumber = bq.config.Genesis.L1.Number
}
l1BlockStart, err := l1Fetcher.L1BlockRefByNumber(ctx, startNumber) l1BlockStart, err := l1Fetcher.L1BlockRefByNumber(ctx, startNumber)
if err != nil { if err != nil {
return err return err
......
...@@ -221,7 +221,7 @@ func (ib *ChannelBank) ResetStep(ctx context.Context, l1Fetcher L1Fetcher) error ...@@ -221,7 +221,7 @@ func (ib *ChannelBank) ResetStep(ctx context.Context, l1Fetcher L1Fetcher) error
ib.resetting = true ib.resetting = true
return nil return nil
} }
if ib.progress.Origin.Time+ib.cfg.ChannelTimeout < ib.next.Progress().Origin.Time || ib.progress.Origin.Number == 0 { if ib.progress.Origin.Time+ib.cfg.ChannelTimeout < ib.next.Progress().Origin.Time || ib.progress.Origin.Number <= ib.cfg.Genesis.L1.Number {
ib.log.Debug("found reset origin for channel bank", "origin", ib.progress.Origin) ib.log.Debug("found reset origin for channel bank", "origin", ib.progress.Origin)
ib.resetting = false ib.resetting = false
return io.EOF return io.EOF
......
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