Skip to content

interop: Reset Derivation and Backfill Supervisor when Too Far Behind #12919

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
protolambda merged 2 commits into from
Nov 19, 2024
Merged

interop: Reset Derivation and Backfill Supervisor when Too Far Behind #12919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0b36bd
Reset Derivation when Supervisor is Behind
axelKingsley Nov 13, 2024
740f49c
Disable Batcher Throttling in Interop local-devnet
axelKingsley Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions interop-devnet/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,7 @@ services:
OP_BATCHER_METRICS_ENABLED: "true"
OP_BATCHER_RPC_ENABLE_ADMIN: "true"
OP_BATCHER_BATCH_TYPE:
OP_BATCHER_THROTTLE_INTERVAL: 0
# uncomment to use blobs
# OP_BATCHER_DATA_AVAILABILITY_TYPE: blobs
env_file:
Expand Down Expand Up @@ -350,6 +351,7 @@ services:
OP_BATCHER_METRICS_ENABLED: "true"
OP_BATCHER_RPC_ENABLE_ADMIN: "true"
OP_BATCHER_BATCH_TYPE:
OP_BATCHER_THROTTLE_INTERVAL: 0
# uncomment to use blobs
# OP_BATCHER_DATA_AVAILABILITY_TYPE: blobs
env_file:
Expand Down
6 changes: 5 additions & 1 deletion op-node/rollup/interop/interop.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package interop
import (
"context"
"fmt"
"strings"
"sync"
"time"

Expand Down Expand Up @@ -139,7 +140,10 @@ func (d *InteropDeriver) onInteropPendingSafeChangedEvent(x engine.InteropPendin
defer cancel()
if err := d.backend.UpdateLocalSafe(ctx, d.chainID, x.DerivedFrom, x.Ref.BlockRef()); err != nil {
d.log.Debug("Failed to signal derived-from update to interop backend", "derivedFrom", x.DerivedFrom, "block", x.Ref)
// still continue to try and do a cross-safe update
if strings.Contains(err.Error(), "too far behind") {
d.log.Error("Supervisor is too far behind, resetting derivation", "err", err)
d.emitter.Emit(rollup.ResetEvent{Err: fmt.Errorf("supervisor is too far behind: %w", err)})
}
}
// Now that the op-supervisor is aware of the new local-safe block, we want to check if cross-safe changed.
d.emitter.Emit(engine.RequestCrossSafeEvent{})
Expand Down
12 changes: 8 additions & 4 deletions op-supervisor/supervisor/backend/db/fromda/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,10 @@ func (db *DB) AddDerived(derivedFrom eth.BlockRef, derived eth.BlockRef) error {
derived, derived.ParentHash, lastDerived, types.ErrConflict)
}
} else if lastDerived.Number+1 < derived.Number {
return fmt.Errorf("derived block %s (parent: %s) is too new, expected to build on top of %s: %w",
derived, derived.ParentHash, lastDerived, types.ErrOutOfOrder)
return fmt.Errorf("cannot add block (%s derived from %s), last block (%s derived from %s) is too far behind: (%w)",
derived, derivedFrom,
lastDerived, lastDerivedFrom,
types.ErrOutOfOrder)
} else {
return fmt.Errorf("derived block %s is older than current derived block %s: %w",
derived, lastDerived, types.ErrOutOfOrder)
Expand All @@ -89,8 +91,10 @@ func (db *DB) AddDerived(derivedFrom eth.BlockRef, derived eth.BlockRef) error {
}
} else if lastDerivedFrom.Number+1 < derivedFrom.Number {
// adding block that is derived from something too far into the future
return fmt.Errorf("cannot add block %s as derived from %s, still deriving from %s: %w",
derived, derivedFrom, lastDerivedFrom, types.ErrOutOfOrder)
return fmt.Errorf("cannot add block (%s derived from %s), last block (%s derived from %s) is too far behind: (%w)",
derived, derivedFrom,
lastDerived, lastDerivedFrom,
types.ErrOutOfOrder)
} else {
// adding block that is derived from something too old
return fmt.Errorf("cannot add block %s as derived from %s, deriving already at %s: %w",
Expand Down