Skip to content

feat: Subscribe to forced inclusion ns events #3146

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
alpe merged 26 commits into from
Mar 18, 2026
Merged

feat: Subscribe to forced inclusion ns events #3146

Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
092cde0
Use subscription with forced inclusion; refactorings
alpe Mar 5, 2026
a878f8d
Fix compile errors in tests after rebase
alpe Mar 9, 2026
f20b7ae
Include timestamp for subscription events
alpe Mar 9, 2026
de64d82
Doc update
alpe Mar 9, 2026
239157f
Apply review feedback
alpe Mar 10, 2026
9df4ff9
Updates - WIP
alpe Mar 10, 2026
d245558
Updates
alpe Mar 11, 2026
2d4cd71
No fetch when in cache
alpe Mar 11, 2026
d3bc9ed
Merge branch 'main' into alex/2803_best_2worlds_fi_rebased2
alpe Mar 11, 2026
e918607
Updates
alpe Mar 11, 2026
175c904
Merge branch 'main' into alex/2803_best_2worlds_fi_rebased2
alpe Mar 11, 2026
aca762f
Review feedback
alpe Mar 11, 2026
20bb79d
Review feedback
alpe Mar 13, 2026
c22f38e
Merge branch 'main' into alex/2803_best_2worlds_fi_rebased2
alpe Mar 13, 2026
6ffc4be
Minor fixes
alpe Mar 13, 2026
214a784
Minor udpates for tests
alpe Mar 13, 2026
eb65f0f
Fix tests
alpe Mar 13, 2026
53c991f
Fix test
alpe Mar 13, 2026
a56fa63
Review feedback
alpe Mar 13, 2026
c31af08
Merge branch 'main' into alex/2803_best_2worlds_fi_rebased2
alpe Mar 13, 2026
6552a82
Handle edge case in catch up
alpe Mar 13, 2026
86359c3
Review feedback
alpe Mar 16, 2026
2614471
Review feedback
alpe Mar 16, 2026
29b3de3
Linter
alpe Mar 16, 2026
bd3ccd1
Stop fi retriever in tests
alpe Mar 16, 2026
8bb221b
Update changelog
alpe Mar 16, 2026
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
Prev Previous commit
Next Next commit
Stop fi retriever in tests
  • Loading branch information
@alpe
alpe committed Mar 16, 2026
commit bd3ccd1b37bffdf328d02e923a2ba5ab98f6bbf2
49 changes: 31 additions & 18 deletions pkg/sequencers/single/sequencer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,9 @@ func newTestSequencer(t *testing.T, db ds.Batching, daClient block.FullDAClient)
mockExec,
)
require.NoError(t, err)
t.Cleanup(func() {
seq.fiRetriever.Stop()
})
return seq
}

Expand All @@ -115,10 +118,9 @@ func TestSequencer_SubmitBatchTxs(t *testing.T) {
logger := zerolog.Nop()
mockExec := createDefaultMockExecutor(t)
seq, err := NewSequencer(logger, db, dummyDA, config.DefaultConfig(), Id, 1000, genesis.Genesis{}, mockExec)
if err != nil {
t.Fatalf("Failed to create sequencer: %v", err)
}
require.NoError(t, err)
defer func() {
seq.fiRetriever.Stop()
err := db.Close()
if err != nil {
t.Fatalf("Failed to close sequencer: %v", err)
Expand Down Expand Up @@ -167,6 +169,7 @@ func TestSequencer_SubmitBatchTxs_EmptyBatch(t *testing.T) {
seq, err := NewSequencer(logger, db, dummyDA, config.DefaultConfig(), Id, 1000, genesis.Genesis{}, mockExec)
require.NoError(t, err, "Failed to create sequencer")
defer func() {
seq.fiRetriever.Stop()
err := db.Close()
require.NoError(t, err, "Failed to close sequencer")
}()
Expand Down Expand Up @@ -224,6 +227,7 @@ func TestSequencer_GetNextBatch_NoLastBatch(t *testing.T) {
require.NoError(t, err)

defer func() {
seq.fiRetriever.Stop()
err := db.Close()
if err != nil {
t.Fatalf("Failed to close sequencer: %v", err)
Expand Down Expand Up @@ -339,10 +343,9 @@ func TestSequencer_GetNextBatch_BeforeDASubmission(t *testing.T) {
Id := []byte("test1")
mockExec := createDefaultMockExecutor(t)
seq, err := NewSequencer(logger, db, dummyDA, config.DefaultConfig(), Id, 1000, genesis.Genesis{}, mockExec)
if err != nil {
t.Fatalf("Failed to create sequencer: %v", err)
}
require.NoError(t, err)
defer func() {
seq.fiRetriever.Stop()
err := db.Close()
if err != nil {
t.Fatalf("Failed to close sequencer: %v", err)
Expand Down Expand Up @@ -420,6 +423,7 @@ func TestSequencer_GetNextBatch_ForcedInclusionAndBatch_MaxBytes(t *testing.T) {
createDefaultMockExecutor(t),
)
require.NoError(t, err)
defer seq.fiRetriever.Stop()

// Submit batch txs that are 40 bytes each
batchTx1 := make([]byte, 40)
Expand Down Expand Up @@ -513,7 +517,7 @@ func TestSequencer_GetNextBatch_ForcedInclusion_ExceedsMaxBytes(t *testing.T) {
createDefaultMockExecutor(t),
)
require.NoError(t, err)

defer seq.fiRetriever.Stop()
// Request batch with maxBytes = 120
getReq := coresequencer.GetNextBatchRequest{
Id: []byte("test-chain"),
Expand Down Expand Up @@ -588,6 +592,7 @@ func TestSequencer_GetNextBatch_AlwaysCheckPendingForcedInclusion(t *testing.T)
createDefaultMockExecutor(t),
)
require.NoError(t, err)
defer seq.fiRetriever.Stop()

// Submit a batch tx
batchTx := make([]byte, 50)
Expand Down Expand Up @@ -663,6 +668,7 @@ func TestSequencer_QueueLimit_Integration(t *testing.T) {
createDefaultMockExecutor(t),
)
require.NoError(t, err)
defer seq.fiRetriever.Stop()

// Test successful batch submission within limit
batch1 := createTestBatch(t, 3)
Expand Down Expand Up @@ -779,7 +785,7 @@ func TestSequencer_DAFailureAndQueueThrottling_Integration(t *testing.T) {
createDefaultMockExecutor(t),
)
require.NoError(t, err)

defer seq.fiRetriever.Stop()
ctx := t.Context()

// Phase 1: Normal operation - send some batches successfully
Expand Down Expand Up @@ -940,6 +946,7 @@ func TestSequencer_CheckpointPersistence_CrashRecovery(t *testing.T) {
createDefaultMockExecutor(t),
)
require.NoError(t, err)
defer seq1.fiRetriever.Stop()

// First call - get all forced txs (they fit in maxBytes=200)
getReq := coresequencer.GetNextBatchRequest{
Expand Down Expand Up @@ -970,6 +977,7 @@ func TestSequencer_CheckpointPersistence_CrashRecovery(t *testing.T) {
createDefaultMockExecutor(t),
)
require.NoError(t, err)
defer seq2.fiRetriever.Stop()

// Verify checkpoint was loaded from disk
assert.Equal(t, uint64(0), seq2.checkpoint.TxIndex, "TxIndex should be loaded from disk")
Expand Down Expand Up @@ -1039,6 +1047,7 @@ func TestSequencer_GetNextBatch_EmptyDABatch_IncreasesDAHeight(t *testing.T) {
createDefaultMockExecutor(t),
)
require.NoError(t, err)
defer seq.fiRetriever.Stop()

req := coresequencer.GetNextBatchRequest{
Id: seq.Id,
Expand Down Expand Up @@ -1149,7 +1158,7 @@ func TestSequencer_GetNextBatch_WithGasFiltering(t *testing.T) {
mockExec,
)
require.NoError(t, err)

defer seq.fiRetriever.Stop()
// Manually set up cached forced txs to simulate DA fetch
seq.cachedForcedInclusionTxs = forcedTxs
seq.checkpoint.DAHeight = 100
Expand Down Expand Up @@ -1233,6 +1242,7 @@ func TestSequencer_GetNextBatch_GasFilterError(t *testing.T) {
mockExec,
)
require.NoError(t, err)
defer seq.fiRetriever.Stop()

// Set up cached txs
forcedTxs := [][]byte{[]byte("tx1"), []byte("tx2")}
Expand Down Expand Up @@ -1309,7 +1319,7 @@ func TestSequencer_CatchUp_DetectsOldEpoch(t *testing.T) {
createDefaultMockExecutor(t),
)
require.NoError(t, err)

defer seq.fiRetriever.Stop()
// Submit a mempool transaction
_, err = seq.SubmitBatchTxs(ctx, coresequencer.SubmitBatchTxsRequest{
Id: []byte("test-chain"),
Expand Down Expand Up @@ -1396,7 +1406,7 @@ func TestSequencer_CatchUp_SkipsMempoolDuringCatchUp(t *testing.T) {
createDefaultMockExecutor(t),
)
require.NoError(t, err)

defer seq.fiRetriever.Stop()
// Submit several mempool transactions
for range 5 {
_, err = seq.SubmitBatchTxs(ctx, coresequencer.SubmitBatchTxsRequest{
Expand Down Expand Up @@ -1478,7 +1488,7 @@ func TestSequencer_CatchUp_UsesDATimestamp(t *testing.T) {
createDefaultMockExecutor(t),
)
require.NoError(t, err)

defer seq.fiRetriever.Stop()
req := coresequencer.GetNextBatchRequest{
Id: []byte("test-chain"),
MaxBytes: 1000000,
Expand Down Expand Up @@ -1545,6 +1555,7 @@ func TestSequencer_CatchUp_ExitsCatchUpAtDAHead(t *testing.T) {
createDefaultMockExecutor(t),
)
require.NoError(t, err)
defer seq.fiRetriever.Stop()

// Submit mempool tx
_, err = seq.SubmitBatchTxs(ctx, coresequencer.SubmitBatchTxsRequest{
Expand Down Expand Up @@ -1621,7 +1632,7 @@ func TestSequencer_CatchUp_HeightFromFutureExitsCatchUp(t *testing.T) {
createDefaultMockExecutor(t),
)
require.NoError(t, err)

defer seq.fiRetriever.Stop()
req := coresequencer.GetNextBatchRequest{
Id: []byte("test-chain"),
MaxBytes: 1000000,
Expand Down Expand Up @@ -1677,7 +1688,7 @@ func TestSequencer_CatchUp_NoCatchUpWhenRecentEpoch(t *testing.T) {
createDefaultMockExecutor(t),
)
require.NoError(t, err)

defer seq.fiRetriever.Stop()
// Submit a mempool tx
_, err = seq.SubmitBatchTxs(ctx, coresequencer.SubmitBatchTxsRequest{
Id: []byte("test-chain"),
Expand Down Expand Up @@ -1759,7 +1770,7 @@ func TestSequencer_CatchUp_MultiEpochReplay(t *testing.T) {
createDefaultMockExecutor(t),
)
require.NoError(t, err)

defer seq.fiRetriever.Stop()
// Submit mempool txs
_, err = seq.SubmitBatchTxs(ctx, coresequencer.SubmitBatchTxsRequest{
Id: []byte("test-chain"),
Expand Down Expand Up @@ -1837,7 +1848,7 @@ func TestSequencer_CatchUp_NoForcedInclusionConfigured(t *testing.T) {
createDefaultMockExecutor(t),
)
require.NoError(t, err)

defer seq.fiRetriever.Stop()
// Submit mempool tx
_, err = seq.SubmitBatchTxs(ctx, coresequencer.SubmitBatchTxsRequest{
Id: []byte("test-chain"),
Expand Down Expand Up @@ -1914,6 +1925,7 @@ func TestSequencer_CatchUp_CheckpointAdvancesDuringCatchUp(t *testing.T) {
createDefaultMockExecutor(t),
)
require.NoError(t, err)
defer seq.fiRetriever.Stop()

// Initial checkpoint
assert.Equal(t, uint64(100), seq.checkpoint.DAHeight)
Expand Down Expand Up @@ -2039,7 +2051,7 @@ func TestSequencer_CatchUp_MonotonicTimestamps(t *testing.T) {
mockExec,
)
require.NoError(t, err)

defer seq.fiRetriever.Stop()
req := coresequencer.GetNextBatchRequest{
Id: []byte("test-chain"),
MaxBytes: 1000000,
Expand Down Expand Up @@ -2143,7 +2155,7 @@ func TestSequencer_CatchUp_MonotonicTimestamps_EmptyEpoch(t *testing.T) {
createDefaultMockExecutor(t),
)
require.NoError(t, err)

defer seq.fiRetriever.Stop()
req := coresequencer.GetNextBatchRequest{
Id: []byte("test-chain"),
MaxBytes: 1000000,
Expand Down Expand Up @@ -2227,6 +2239,7 @@ func TestSequencer_GetNextBatch_GasFilteringPreservesUnprocessedTxs(t *testing.T
mockExec,
)
require.NoError(t, err)
defer seq.fiRetriever.Stop()

// Set up cached forced inclusion txs: 4 transactions of 50 bytes each
tx0 := make([]byte, 50)
Expand Down
Loading