Skip to content

feat(sequencer): catchup from base#3057

Draft
julienrbrt wants to merge 9 commits intomainfrom
julien/catchup-base
Draft

feat(sequencer): catchup from base#3057
julienrbrt wants to merge 9 commits intomainfrom
julien/catchup-base

Conversation

@julienrbrt
Copy link
Member

Closes: #3016

Opus did a pretty good job. I'll be improving it.

@github-actions
Copy link
Contributor

github-actions bot commented Feb 9, 2026

The latest Buf updates on your PR. Results from workflow CI / buf-check (pull_request).

BuildFormatLintBreakingUpdated (UTC)
✅ passed⏩ skipped✅ passed✅ passedFeb 13, 2026, 8:06 PM

@claude
Copy link
Contributor

claude bot commented Feb 9, 2026

Claude finished @julienrbrt's task in 1m 54s —— View job


Code Review: Sequencer Catch-up Feature

I've completed a comprehensive review of this PR implementing the sequencer catch-up mechanism. The implementation addresses an important gap in handling sequencer downtime, but there are several critical issues that must be addressed before merging.


Critical Issues

1. Data Race on Catch-up State Fields 🔴 [sequencer.go:67-70]

Issue: The currentDAEndTime field (line 70) is accessed concurrently without synchronization:

  • Writes occur in fetchNextDAEpoch (line 485)
  • Reads occur in GetNextBatch (line 370)
  • Both can execute concurrently from the block production loop

While catchingUp uses atomic.Bool, time.Time is a struct and requires proper synchronization.

Impact: Data race leading to potential timestamp corruption and undefined behavior.

Fix Required: Replace currentDAEndTime time.Time with an atomic pointer:

currentDAEndTime atomic.Pointer[time.Time]

Then update reads/writes accordingly:

// Write (line 485):
c.currentDAEndTime.Store(&forcedTxsEvent.Timestamp.UTC())

// Read (line 370):
if daEndTime := c.currentDAEndTime.Load(); daEndTime != nil {
    timestamp = daEndTime.Add(-time.Duration(remainingForcedTxs) * time.Millisecond)
}

Fix this data race →


2. Non-Monotonic Block Timestamps During Catch-up 🔴 [sequencer.go:366-378]

Issue: The timestamp logic has a fundamental flaw that will cause execution layer rejection:

  1. Multiple blocks per epoch: When a single DA epoch contains many forced inclusion transactions that span multiple blocks, all blocks get the same daEndTime timestamp (line 376). The subtraction logic (-time.Duration(remainingForcedTxs) * time.Millisecond) tries to differentiate timestamps, but:

    • It's based on remaining tx count, not consumed tx count
    • Multiple blocks can still have identical timestamps if they consume the same number of txs
  2. Empty DA epochs: When an epoch has no forced transactions, currentDAEndTime is never updated (line 484-486 only updates if timestamp is non-zero), causing subsequent blocks to reuse stale timestamps.

Impact: Most blockchain execution layers (EVM, Cosmos SDK, etc.) require strictly monotonically increasing block timestamps. Duplicate timestamps will cause execution to reject blocks and halt the chain.

Example Failure Scenario:

Epoch 100 (end time: T1):
  - Block 1: forced tx A, B → timestamp = T1 - 2ms
  - Block 2: forced tx C, D → timestamp = T1 - 2ms (DUPLICATE!)
  
Execution layer rejects Block 2 → chain halts

Fix Required: This needs a more sophisticated timestamping strategy:

  • Track the last assigned timestamp in catch-up mode
  • Ensure each new block timestamp is strictly greater than the previous
  • Consider using microsecond increments or the actual transaction count consumed
  • Handle empty epochs by advancing time based on expected block time

Fix timestamp monotonicity →


3. Insufficient Test Coverage for Edge Cases 🟡

The test suite (64.54% coverage) is missing critical scenarios:

Missing Tests:

  1. Multiple blocks from single epoch: No test verifies monotonic timestamps when one epoch produces 2+ blocks
  2. Empty epoch handling: No test for empty DA epochs during catch-up
  3. Concurrent access: No race detector tests for the data race mentioned above
  4. Timestamp validation: Tests don't verify timestamps are strictly increasing

Existing Test Gap [sequencer_test.go:1406-1462]:
TestSequencer_CatchUp_UsesDATimestamp only tests a single block per epoch and doesn't verify timestamp monotonicity across multiple blocks.

Recommendation: Add tests for:

  • Multi-block epoch scenarios
  • Empty epoch timestamp handling
  • Run tests with -race flag to catch concurrency issues

High Priority Issues

4. Magic Number for Catch-up Threshold [sequencer.go:569]

Issue: The 30-second threshold is hardcoded without clear justification:

if missedEpochs <= 1 {
    // Within the current or next epoch — normal operation

Problem: This logic is purely epoch-based (missedEpochs), the 30-second value mentioned in Gemini's review doesn't appear in the final code. However, the epoch-based detection could still trigger false positives if DA epoch size is small.

Recommendation: Add configuration parameter for catch-up threshold or document why epoch-based detection is sufficient.


5. Syncer DA Height Advancement Logic Complexity [syncer.go:780-806]

Issue: The DA height advancement logic in the syncer is complex and has subtle edge cases:

if epochSize > 0 && gap > epochSize {
    // Advance by one epoch
    _, epochEnd, _ := types.CalculateEpochBoundaries(...)
    nextEpochStart := epochEnd + 1
    if nextEpochStart > event.DaHeight {
        nextEpochStart = event.DaHeight  // Safety clamp
    }
    newState.DAHeight = nextEpochStart
}

Concerns:

  1. The safety clamp (if nextEpochStart > event.DaHeight) suggests there's an edge case where epoch boundaries could exceed the event height
  2. The comment says "shouldn't happen" but implements defensive code
  3. Unclear what happens if CalculateEpochBoundaries returns unexpected values

Recommendation:

  • Add explicit error handling for the edge case instead of silent clamping
  • Add logging when the safety clamp is triggered
  • Add unit tests specifically for this edge case

Medium Priority Issues

6. GetLatestDAHeight Called Without Retry [sequencer.go:548]

Issue: Network call to GetLatestDAHeight has no retry logic:

latestDAHeight, err := c.daClient.GetLatestDAHeight(ctx)
if err != nil {
    c.logger.Warn().Err(err).Msg("failed to get latest DA height for catch-up detection, skipping check")
    return  // Silently skips catch-up detection
}

Problem: Transient network failures will prevent catch-up detection entirely, leaving the sequencer in normal mode when it should be catching up.

Impact: Sequencer might produce blocks with mempool transactions during what should be catch-up mode, creating divergence from base sequencing behavior.

Recommendation: Add retry logic with exponential backoff, similar to other DA calls.


7. DA Client GetLatestDAHeight Missing Error Mapping [client.go:304-316]

Issue: New GetLatestDAHeight method doesn't map errors to status codes like other methods do:

func (c *client) GetLatestDAHeight(ctx context.Context) (uint64, error) {
    header, err := c.headerAPI.NetworkHead(headCtx)
    if err != nil {
        return 0, fmt.Errorf("failed to get DA network head: %w", err)
    }
    // ...
}

Compare to Retrieve which maps errors to specific status codes (lines 220-258).

Recommendation: Return a datypes.Result type for consistency and proper error categorization.


8. Checkpoint Persistence Could Fail Silently During Catch-up [sequencer.go:349]

Issue: Checkpoint save errors during catch-up are returned but not specially handled:

if err := c.checkpointStore.Save(ctx, c.checkpoint); err != nil {
    return nil, fmt.Errorf("failed to save checkpoint: %w", err)
}

Problem: During catch-up with rapid block production, checkpoint failures could indicate disk/DB issues that should trigger different behavior than normal mode.

Recommendation: Add monitoring/metrics for checkpoint save failures during catch-up mode specifically.


Low Priority / Suggestions

9. Inconsistent Logger Usage in Tests [sequencer_test.go:1245, 1309, 1457, 1676]

Multiple tests use zerolog.New(zerolog.NewTestWriter(t)) while others use zerolog.Nop().

Recommendation: Use zerolog.NewTestWriter(t) consistently for better debugging when tests fail, or zerolog.Nop() if logs aren't needed.


10. Documentation Could Be Clearer on Catch-up Exit Conditions

The code has two exit conditions for catch-up:

  1. ErrHeightFromFuture from DA layer
  2. Implicit via epoch gap detection

Recommendation: Add more detailed comments explaining both exit paths and their implications.


Positive Aspects ✅

  1. Excellent test coverage breadth: Tests cover detection, mempool skipping, timestamp usage, exit conditions, and multi-epoch replay
  2. Good documentation: Comments clearly explain the catch-up rationale and behavior
  3. Syncer DA height logic is well-reasoned: The incremental epoch advancement (lines 780-806) correctly handles the forced inclusion verification gap
  4. Atomic bool usage: catchingUp is correctly implemented with atomic operations
  5. Checkpoint-based recovery: Solid foundation for crash recovery during catch-up

Summary

This PR implements a critical feature for sequencer resilience, but has two blocking issues that must be fixed:

  1. 🔴 Data race on currentDAEndTime - will cause undefined behavior
  2. 🔴 Non-monotonic timestamps - will halt the chain when execution layer rejects duplicate timestamps

Additionally, several high-priority improvements are recommended around error handling, testing, and edge case coverage.

The syncer-side DA height advancement logic is well-designed and correctly handles the catch-up block verification challenge.

Recommendation

Do not merge until the two critical issues are resolved and additional tests are added for multi-block epochs and timestamp monotonicity.


@gemini-code-assist
Copy link
Contributor

Summary of Changes

Hello @julienrbrt, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request implements a critical "catch-up" feature for the sequencer, designed to enhance its resilience and consistency following periods of inactivity or downtime. By intelligently replaying missed Data Availability (DA) epochs, the sequencer can resynchronize its state, ensuring that all forced inclusion transactions are processed in the correct order and with accurate timestamps, thereby maintaining a consistent view of the blockchain's history, even when operating in a decentralized environment. This mechanism allows the sequencer to seamlessly transition back to normal operation without compromising data integrity.

Highlights

  • Sequencer Catch-up Mechanism: Introduced a new mechanism allowing the sequencer to "catch up" on missed Data Availability (DA) epochs after extended downtime.
  • Forced Inclusion Priority: During catch-up, the sequencer temporarily processes only forced inclusion transactions, ensuring consistency with base sequencing nodes and temporarily skipping mempool transactions.
  • DA Height Synchronization: Modified syncer.go to incrementally advance the DAHeight by one epoch during catch-up, preventing issues with forced inclusion transaction verification.
  • Timestamp Alignment: Block timestamps generated during catch-up are now aligned with the DA epoch's end timestamp for historical accuracy.
  • Comprehensive Testing: Added extensive unit tests covering various catch-up scenarios, including detection, mempool skipping, timestamp usage, exit conditions, and multi-epoch replay.

🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console.

Changelog
  • block/internal/syncing/syncer.go
    • Updated the logic for DAHeight updates to handle large discrepancies between event.DaHeight and newState.DAHeight. When a significant gap (more than one epoch) is detected, newState.DAHeight is now advanced by exactly one epoch per block, rather than jumping directly to event.DaHeight. This ensures correct verification of forced inclusion transactions during sequencer catch-up.
    • Added detailed comments explaining the new DAHeight update strategy and its importance for catch-up blocks and forced inclusion verification.
  • pkg/sequencers/single/sequencer.go
    • Added catchingUp (boolean) and currentDAEndTime (time.Time) to the Sequencer struct to manage the catch-up state and store the DA epoch's end timestamp.
    • Modified GetNextBatch to conditionally skip fetching transactions from the mempool when the sequencer is in catchingUp mode. This ensures that only forced inclusion transactions are included in batches during catch-up.
    • Updated GetNextBatch to use sequencer.currentDAEndTime as the block timestamp when catchingUp is true, aligning block timestamps with the historical DA epoch.
    • Introduced a public IsCatchingUp() method to query the sequencer's current catch-up status.
    • Modified fetchNextDAEpoch to store the forcedTxsEvent.Timestamp in currentDAEndTime and to call a new updateCatchUpState method to manage the catchingUp flag. It also now exits catch-up mode if StatusHeightFromFuture is returned by the DA client.
    • Implemented a new private method updateCatchUpState that determines whether the sequencer should be in catch-up mode based on the timestamp of the fetched DA epoch. It enters catch-up if the epoch timestamp is significantly in the past (more than one epoch's wall-clock duration) and exits if it's recent.
  • pkg/sequencers/single/sequencer_test.go
    • Added a comprehensive suite of tests (TestSequencer_CatchUp_...) to validate the new catch-up functionality. These tests cover:
    • Detection of old epochs and entering catch-up mode.
    • Skipping mempool transactions during catch-up.
    • Using DA epoch timestamps for blocks during catch-up.
    • Exiting catch-up mode when the DA head is reached (either a recent epoch or HeightFromFuture).
    • Scenarios where catch-up is not triggered (recent epoch, no forced inclusion configured).
    • Multi-epoch replay scenarios.
    • Correct advancement of the internal checkpoint (DAHeight) during catch-up.
Activity
  • The pull request addresses and closes issue https://github.com/evstack/ev-node/issues/3016.
  • The author indicates that this work builds upon a previous attempt by "Opus", aiming for improvement.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@codecov
Copy link

codecov bot commented Feb 9, 2026

Codecov Report

❌ Patch coverage is 64.54545% with 39 lines in your changes missing coverage. Please review.
✅ Project coverage is 61.97%. Comparing base (b92e97e) to head (a30ea68).

Files with missing lines Patch % Lines
block/internal/syncing/syncer.go 22.22% 13 Missing and 1 partial ⚠️
block/internal/da/tracing.go 0.00% 10 Missing ⚠️
block/internal/da/client.go 0.00% 9 Missing ⚠️
pkg/sequencers/single/sequencer.go 91.78% 4 Missing and 2 partials ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #3057      +/-   ##
==========================================
+ Coverage   61.92%   61.97%   +0.04%     
==========================================
  Files         111      111              
  Lines       11113    11218     +105     
==========================================
+ Hits         6882     6952      +70     
- Misses       3492     3527      +35     
  Partials      739      739              
Flag Coverage Δ
combined 61.97% <64.54%> (+0.04%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request introduces a robust catch-up mechanism for the sequencer, designed to handle restarts after extended downtime. While the overall approach for consuming and verifying catch-up blocks in the syncer, including the incremental advancement of DAHeight, is well-implemented and tested, the implementation of catch-up mode in the single sequencer has significant flaws. Specifically, it produces non-monotonic block timestamps when multiple blocks are generated for a single DA epoch or when empty epochs are encountered, which will likely cause the execution layer to reject blocks and halt the chain. Additionally, there is a data race on the new catch-up state fields due to a lack of synchronization primitives. Minor suggestions for code clarity and testing experience were also noted.

Comment on lines 362 to 365
timestamp := time.Now()
if c.catchingUp && !c.currentDAEndTime.IsZero() {
timestamp = c.currentDAEndTime
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

security-high high

During catch-up mode, the sequencer uses the timestamp from the last fetched DA epoch as the block timestamp. However, multiple blocks can be produced for a single DA epoch (e.g., if the epoch contains many transactions that don't fit in one block). In this case, all blocks produced for that epoch will have the exact same timestamp (c.currentDAEndTime). Furthermore, if an empty DA epoch is encountered, c.currentDAEndTime is not updated, causing the next block to reuse the timestamp from the previous non-empty epoch.

Most blockchain execution layers (like EVM) require that each new block has a timestamp strictly greater than its parent. If the sequencer produces multiple blocks with the same timestamp, the execution layer will reject them, halting the block production process and causing a Denial of Service.

Comment on lines 60 to 63
catchingUp bool
// currentDAEndTime is the DA epoch end timestamp from the last fetched epoch.
// Used as the block timestamp during catch-up to match based sequencing behavior.
currentDAEndTime time.Time
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

security-medium medium

The fields catchingUp and currentDAEndTime are accessed concurrently without proper synchronization. GetNextBatch and fetchNextDAEpoch (which update these fields) can be called by the block production loop, while IsCatchingUp() can be called concurrently by other components (e.g., RPC, monitoring, or metrics).

In Go, concurrent read/write access to non-atomic fields is a data race, which leads to undefined behavior. Specifically, a race on time.Time (which is a struct) can result in a corrupted timestamp being read, potentially leading to invalid blocks and a Denial of Service.

Comment on lines 533 to 535
if catchUpThreshold < 30*time.Second {
catchUpThreshold = 30 * time.Second
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The value 30*time.Second is used as a minimum threshold for the catch-up logic. To improve readability and maintainability, consider defining this as a named constant at the package level, for example: const minCatchUpThreshold = 30 * time.Second, and using that constant here. This makes the intent of the value clearer and centralizes its definition.

// This test uses maxBytes to limit how many txs are fetched, triggering the unprocessed txs scenario.
func TestSequencer_CatchUp_DetectsOldEpoch(t *testing.T) {
ctx := context.Background()
logger := zerolog.New(zerolog.NewConsoleWriter())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Using zerolog.New(zerolog.NewConsoleWriter()) in tests can lead to verbose output in the console during test runs. It's generally better to use a logger that integrates with the testing framework, such as zerolog.New(zerolog.NewTestWriter(t)), which only shows logs for failed tests, or zerolog.Nop() if logs are not needed. This practice is followed in other new tests in this file (e.g., TestSequencer_CatchUp_UsesDATimestamp). Applying this consistently would improve the developer experience. This comment also applies to lines 1309, 1457, and 1676.

Suggested change
logger := zerolog.New(zerolog.NewConsoleWriter())
logger := zerolog.New(zerolog.NewTestWriter(t))

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[FEATURE] Sequencer catchup on restart from base

1 participant