feat: enhance single sequencer with context management and testing improvements

This commit introduces context management in the sequencer's initialization and submission processes, ensuring better control over timeouts. Additionally, it adds new tests to validate the behavior of the sequencer when handling rollup transactions before data availability (DA) submission, improving overall test coverage and reliability.

Author: tzdybal

rollups/testapp/cmd/run.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"context"
 	"os"
 	"path/filepath"
 
@@ -74,7 +75,10 @@ var RunCmd = &cobra.Command{
 			return err
 		}
 
+		ctx, cancel := context.WithCancel(context.Background())
+		defer cancel()
 		sequencer, err := single.NewSequencer(
+			ctx,
 			logger,
 			datastore,
 			daJrpc,

sequencers/single/go.mod

@@ -16,6 +16,7 @@ require (
 	github.com/rollkit/rollkit v0.0.0-00010101000000-000000000000
 	github.com/rollkit/rollkit/core v0.0.0-00010101000000-000000000000
 	github.com/rollkit/rollkit/da v0.0.0-00010101000000-000000000000
+	github.com/stretchr/testify v1.10.0
 	google.golang.org/protobuf v1.36.5
 )
 
@@ -25,18 +26,22 @@ require (
 	github.com/bytedance/sonic/loader v0.2.4 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/cloudwego/base64x v0.1.5 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/jbenet/goprocess v0.1.4 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.9 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
 	github.com/prometheus/common v0.62.0 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
 	github.com/rs/zerolog v1.33.0 // indirect
+	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	golang.org/x/arch v0.0.0-20210923205945-b76863e36670 // indirect
 	golang.org/x/sys v0.31.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

sequencers/single/sequencer.go

@@ -56,8 +56,6 @@ func NewSequencer(
 	metrics *Metrics,
 	proposer bool,
 ) (*Sequencer, error) {
-	loadCtx, cancel := context.WithTimeout(ctx, 10*time.Second)
-	defer cancel()
 
 	dalc := dac.NewDAClient(da, -1, -1, daNamespace, nil, logger)
 
@@ -73,8 +71,9 @@ func NewSequencer(
 		proposer:         proposer,
 	}
 
-	err := s.queue.Load(loadCtx)
-	if err != nil {
+	loadCtx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+	if err := s.queue.Load(loadCtx); err != nil {
 		return nil, fmt.Errorf("failed to load batch queue from DB: %w", err)
 	}
 
@@ -112,6 +111,7 @@ func (c *Sequencer) daSubmissionLoop(ctx context.Context) {
 	for {
 		select {
 		case <-ctx.Done():
+			c.logger.Info("DA submission loop stopped")
 			return
 		case batch := <-c.daSubmissionChan:
 			err := c.submitBatchToDA(ctx, batch)

sequencers/single/sequencer_test.go

@@ -1,6 +1,7 @@
 package single
 
 import (
+	"bytes"
 	"context"
 	"errors"
 	"fmt"
@@ -12,14 +13,18 @@ import (
 
 	coreda "github.com/rollkit/rollkit/core/da"
 	coresequencer "github.com/rollkit/rollkit/core/sequencer"
+	damocks "github.com/rollkit/rollkit/da/mocks"
+	"github.com/stretchr/testify/mock"
 )
 
 func TestNewSequencer(t *testing.T) {
 	// Create a new sequencer with mock DA client
 	dummyDA := coreda.NewDummyDA(100_000_000, 0, 0)
 	metrics, _ := NopMetrics()
 	db := ds.NewMapDatastore()
-	seq, err := NewSequencer(log.NewNopLogger(), db, dummyDA, []byte("namespace"), []byte("rollup1"), 10*time.Second, metrics, false)
+	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
+	defer cancel()
+	seq, err := NewSequencer(ctx, log.NewNopLogger(), db, dummyDA, []byte("namespace"), []byte("rollup1"), 10*time.Second, metrics, false)
 	if err != nil {
 		t.Fatalf("Failed to create sequencer: %v", err)
 	}
@@ -48,7 +53,9 @@ func TestSequencer_SubmitRollupBatchTxs(t *testing.T) {
 	metrics, _ := NopMetrics()
 	dummyDA := coreda.NewDummyDA(100_000_000, 0, 0)
 	db := ds.NewMapDatastore()
-	seq, err := NewSequencer(log.NewNopLogger(), db, dummyDA, []byte("namespace"), []byte("rollup1"), 10*time.Second, metrics, false)
+	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
+	defer cancel()
+	seq, err := NewSequencer(ctx, log.NewNopLogger(), db, dummyDA, []byte("namespace"), []byte("rollup1"), 10*time.Second, metrics, false)
 	if err != nil {
 		t.Fatalf("Failed to create sequencer: %v", err)
 	}
@@ -216,3 +223,59 @@ func TestSequencer_VerifyBatch(t *testing.T) {
 		t.Fatal("Expected status to be false for invalid batch hash")
 	}
 }
+
+func TestSequencer_GetNextBatch_BeforeDASubmission(t *testing.T) {
+	// Initialize a new sequencer with mock DA
+	metrics, _ := NopMetrics()
+	mockDA := &damocks.DA{}
+	db := ds.NewMapDatastore()
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+	seq, err := NewSequencer(ctx, log.NewNopLogger(), db, mockDA, []byte("namespace"), []byte("rollup1"), 1*time.Second, metrics, false)
+	if err != nil {
+		t.Fatalf("Failed to create sequencer: %v", err)
+	}
+	defer func() {
+		err := db.Close()
+		if err != nil {
+			t.Fatalf("Failed to close sequencer: %v", err)
+		}
+	}()
+
+	// Set up mock expectations
+	mockDA.On("MaxBlobSize", mock.Anything).Return(uint64(100_000_000), nil)
+	mockDA.On("GasPrice", mock.Anything).Return(float64(0), nil)
+	mockDA.On("GasMultiplier", mock.Anything).Return(float64(0), nil)
+	mockDA.On("Submit", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).
+		Return(nil, errors.New("mock DA always rejects submissions"))
+
+	// Submit a batch
+	rollupId := []byte("rollup1")
+	tx := []byte("transaction1")
+	res, err := seq.SubmitRollupBatchTxs(context.Background(), coresequencer.SubmitRollupBatchTxsRequest{
+		RollupId: rollupId,
+		Batch:    &coresequencer.Batch{Transactions: [][]byte{tx}},
+	})
+	if err != nil {
+		t.Fatalf("Failed to submit rollup transaction: %v", err)
+	}
+	if res == nil {
+		t.Fatal("Expected response to not be nil")
+	}
+	time.Sleep(100 * time.Millisecond)
+
+	// Try to get the batch before DA submission
+	nextBatchResp, err := seq.GetNextBatch(context.Background(), coresequencer.GetNextBatchRequest{RollupId: rollupId})
+	if err != nil {
+		t.Fatalf("Failed to get next batch: %v", err)
+	}
+	if len(nextBatchResp.Batch.Transactions) != 1 {
+		t.Fatalf("Expected 1 transaction, got %d", len(nextBatchResp.Batch.Transactions))
+	}
+	if !bytes.Equal(nextBatchResp.Batch.Transactions[0], tx) {
+		t.Fatal("Expected transaction to match submitted transaction")
+	}
+
+	// Verify all mock expectations were met
+	mockDA.AssertExpectations(t)
+}