updates

Author: julienrbrt

pkg/sequencers/based/sequencer.go

@@ -40,10 +40,6 @@ type BasedSequencer struct {
 	currentDAEndTime time.Time
 	// Total number of transactions in the current DA epoch (used for timestamp jitter)
 	currentEpochTxCount uint64
-	// lastTimestamp is the floor for timestamps to guarantee monotonicity
-	// after a restart on a node that already had blocks produced with wall-clock time.
-	// Initialised from the last block time in the store at construction.
-	lastTimestamp time.Time
 }
 
 // NewBasedSequencer creates a new based sequencer instance
@@ -68,15 +64,8 @@ func NewBasedSequencer(
 	s := store.New(store.NewEvNodeKVStore(db))
 	daStartHeight := genesis.DAStartHeight
 	if state, err := s.GetState(initCtx); err == nil {
-		if !state.LastBlockTime.IsZero() {
-			bs.lastTimestamp = state.LastBlockTime
-			bs.logger.Debug().
-				Time("last_block_time", state.LastBlockTime).
-				Msg("initialized timestamp floor from last block time")
-		}
 		if state.DAHeight > 0 {
-			// skip already processed epochs
-			daStartHeight = state.DAHeight
+			daStartHeight = state.DAHeight // skip already processed epochs
 		}
 	}
 	bs.SetDAHeight(daStartHeight)
@@ -210,7 +199,6 @@ doneProcessing:
 	// the next epoch starts at nextDaEndTime - N*1ms >= prevDaEndTime.
 	epochStart := s.currentDAEndTime.Add(-time.Duration(s.currentEpochTxCount) * time.Millisecond)
 	timestamp := epochStart.Add(time.Duration(txIndexForTimestamp) * time.Millisecond)
-	s.lastTimestamp = timestamp
 
 	if len(validTxs) == 0 {
 		return nil, block.ErrNoBatch

pkg/sequencers/single/sequencer.go

@@ -66,10 +66,6 @@ type Sequencer struct {
 	currentDAEndTime time.Time
 	// currentEpochTxCount is the total number of txs in the current DA epoch (used for timestamp jitter)
 	currentEpochTxCount uint64
-	// lastCatchUpTimestamp is the floor for catch-up timestamps to guarantee
-	// monotonicity after a restart.  Initialised from the last block time in
-	// the store when catch-up mode is entered.
-	lastCatchUpTimestamp time.Time
 }
 
 // NewSequencer creates a new Single Sequencer
@@ -363,7 +359,6 @@ func (c *Sequencer) GetNextBatch(ctx context.Context, req coresequencer.GetNextB
 	if c.catchUpState.Load() == catchUpInProgress || currentBatchHasForcedTxs {
 		epochStart := c.currentDAEndTime.Add(-time.Duration(c.currentEpochTxCount) * time.Millisecond)
 		timestamp = epochStart.Add(time.Duration(txIndexForTimestamp) * time.Millisecond)
-		c.lastCatchUpTimestamp = timestamp
 	}
 
 	// In catch up modes, only produce blocks for force included txs.
@@ -549,22 +544,23 @@ func (c *Sequencer) updateCatchUpState(ctx context.Context) {
 	}
 
 	// At least one epoch behind - enter catch-up mode.
+	c.catchUpState.Store(catchUpInProgress)
+
 	// Read the last block time from the store so that catch-up timestamps
 	// are guaranteed to be strictly after any previously produced block.
+	// While unlikely, if this happens, this means all catch up blocks will differ from their based sequencer equivalent blocks.
 	s := store.New(store.NewEvNodeKVStore(c.db))
 	state, err := s.GetState(ctx)
 	if err == nil && !state.LastBlockTime.IsZero() {
-		c.lastCatchUpTimestamp = state.LastBlockTime
+		if state.LastBlockTime.After(c.currentDAEndTime) {
+			c.currentDAEndTime = state.LastBlockTime
+		}
+
 		c.logger.Debug().
 			Time("last_block_time", state.LastBlockTime).
 			Msg("initialized catch-up timestamp floor from last block time")
 	}
 
-	if c.lastCatchUpTimestamp.After(c.currentDAEndTime) {
-		c.currentDAEndTime = c.lastCatchUpTimestamp
-	}
-
-	c.catchUpState.Store(catchUpInProgress)
 	c.logger.Warn().
 		Uint64("checkpoint_da_height", currentDAHeight).
 		Uint64("latest_da_height", latestDAHeight).

test/e2e/evm_force_inclusion_e2e_test.go

@@ -601,7 +601,7 @@ func TestEvmSequencerCatchUpBasedSequencerE2E(t *testing.T) {
 	t.Log("Phase 1: Setup - Start Sequencer and Sync Node")
 
 	dockerClient, networkID := tastoradocker.Setup(t)
-	env := setupCommonEVMEnv(t, sut, dockerClient, networkID, WithFullNode())
+	env := SetupCommonEVMEnv(t, sut, dockerClient, networkID, WithFullNode())
 
 	// Create passphrase and JWT secret files for sequencer
 	seqPassphraseFile := createPassphraseFile(t, sequencerHome)
@@ -1020,7 +1020,7 @@ func TestEvmBasedSequencerBaselineE2E(t *testing.T) {
 	t.Log("Setting up fresh based sequencer from genesis")
 
 	dockerClient, networkID := tastoradocker.Setup(t)
-	env := setupCommonEVMEnv(t, sut, dockerClient, networkID, WithFullNode())
+	env := SetupCommonEVMEnv(t, sut, dockerClient, networkID, WithFullNode())
 
 	// Create passphrase and JWT secret files
 	passphraseFile := createPassphraseFile(t, basedSeqHome)