Skip to content
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.

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

Backup sequencer: fix catchup issues #2247

Merged
merged 2 commits into from
Jan 14, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions go/host/enclave/guardian.go
Original file line number Diff line number Diff line change
Expand Up @@ -440,8 +440,8 @@ func (g *Guardian) catchupWithL1() error {
func (g *Guardian) catchupWithL2() error {
// while we are behind the L2 head and still running:
for g.running.Load() && g.state.GetStatus() == L2Catchup {
if g.hostData.IsSequencer {
return errors.New("l2 catchup is not supported for sequencer")
if g.hostData.IsSequencer && g.isActiveSequencer {
return errors.New("l2 catchup is not supported for active sequencer")
}
// request the next batch by sequence number (based on what the enclave has been fed so far)
prevHead := g.state.GetEnclaveL2Head()
Expand Down
2 changes: 1 addition & 1 deletion integration/simulation/devnetwork/dev_network.go
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ func (s *InMemDevNetwork) Start() {
s.startNodes()

// sleep to allow the nodes to start
time.Sleep(15 * time.Second)
time.Sleep(30 * time.Second) // it takes a while for the secret exchanges etc. to sort themselves out

seqClient, err := obsclient.Dial(s.SequencerRPCAddress())
if err != nil {
Expand Down
1 change: 0 additions & 1 deletion tools/walletextension/rpcapi/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ func UnauthenticatedTenRPCCall[R any](ctx context.Context, w *services.Services,
return resp, err
})
})

if err != nil {
audit(w, "RPC call failed. method=%s args=%v error=%+v time=%d", method, args, err, time.Since(requestStartTime).Milliseconds())
return nil, err
Expand Down
Loading