fix test, build and lint

Author: tac0turtle

README.md

@@ -11,6 +11,7 @@ Ev-node is the basis of the Evolve Stack. For more in-depth information about Ev
 ## Using Evolve
 
 Evolve supports multiple sync modes:
+
 - **Hybrid sync**: Sync from both DA layer and P2P network (default when peers are configured)
 - **DA-only sync**: Sync exclusively from DA layer by leaving P2P peers empty (see [Configuration Guide](docs/learn/config.md#da-only-sync-mode))
 - **P2P-priority sync**: Prioritize P2P with DA as fallback

block/CLAUDE.md

@@ -9,6 +9,7 @@ The block package is the core of ev-node's block management system. It handles b
 ## Core Components
 
 ### Manager (`manager.go`)
+
 - **Purpose**: Central orchestrator for all block operations
 - **Key Responsibilities**:
   - Transaction aggregation into blocks
@@ -18,6 +19,7 @@ The block package is the core of ev-node's block management system. It handles b
   - P2P block/header gossiping
 
 ### Aggregation (`aggregation.go`, `lazy_aggregation_test.go`)
+
 - **Purpose**: Collects transactions from mempool and creates blocks
 - **Modes**:
   - **Normal Mode**: Produces blocks at regular intervals (BlockTime)
@@ -28,6 +30,7 @@ The block package is the core of ev-node's block management system. It handles b
   - `normalAggregationLoop`: Regular block production
 
 ### Synchronization (`sync.go`, `sync_test.go`)
+
 - **Purpose**: Keeps the node synchronized with the network
 - **Key Functions**:
   - `SyncLoop`: Main synchronization loop
@@ -36,6 +39,7 @@ The block package is the core of ev-node's block management system. It handles b
   - Handles header and data caching
 
 ### Data Availability (`da_includer.go`, `submitter.go`, `retriever.go`)
+
 - **DA Includer**: Manages DA blob inclusion proofs and validation
 - **Submitter**: Handles block submission to the DA layer with retry logic
 - **Retriever**: Fetches blocks from the DA layer
@@ -45,6 +49,7 @@ The block package is the core of ev-node's block management system. It handles b
   - Batch submission optimization
 
 ### Storage (`store.go`, `store_test.go`)
+
 - **Purpose**: Persistent storage for blocks and state
 - **Key Features**:
   - Block height tracking
@@ -53,6 +58,7 @@ The block package is the core of ev-node's block management system. It handles b
   - Migration support for namespace changes
 
 ### Pending Blocks (`pending_base.go`, `pending_headers.go`, `pending_data.go`)
+
 - **Purpose**: Manages blocks awaiting DA inclusion or validation
 - **Components**:
   - **PendingBase**: Base structure for pending blocks
@@ -64,6 +70,7 @@ The block package is the core of ev-node's block management system. It handles b
   - Memory-efficient caching
 
 ### Metrics (`metrics.go`, `metrics_helpers.go`)
+
 - **Purpose**: Performance monitoring and observability
 - **Key Metrics**:
   - Block production times
@@ -74,20 +81,23 @@ The block package is the core of ev-node's block management system. It handles b
 ## Key Workflows
 
 ### Block Production Flow
+
 1. Transactions collected from mempool
 2. Block created with proper header and data
 3. Block executed through executor
 4. Block submitted to DA layer
 5. Block gossiped to P2P network
 
 ### Synchronization Flow
+
 1. Headers received from P2P network
 2. Headers validated and cached
 3. Block data retrieved from DA layer
 4. Blocks applied to state
 5. Sync progress updated
 
 ### DA Submission Flow
+
 1. Block prepared for submission
 2. Blob created with block data
 3. Submission attempted with retries
@@ -97,47 +107,55 @@ The block package is the core of ev-node's block management system. It handles b
 ## Configuration
 
 ### Time Parameters
+
 - `BlockTime`: Target time between blocks (default: 1s)
 - `DABlockTime`: DA layer block time (default: 6s)
 - `LazyBlockTime`: Max time between blocks in lazy mode (default: 60s)
 
 ### Limits
+
 - `maxSubmitAttempts`: Max DA submission retries (30)
 - `defaultMempoolTTL`: Blocks until tx dropped (25)
 
 ## Testing Strategy
 
 ### Unit Tests
+
 - Test individual components in isolation
 - Mock external dependencies (DA, executor, sequencer)
 - Focus on edge cases and error conditions
 
 ### Integration Tests
+
 - Test component interactions
 - Verify block flow from creation to storage
 - Test synchronization scenarios
 
 ### Performance Tests (`da_speed_test.go`)
+
 - Measure DA submission performance
 - Test batch processing efficiency
 - Validate metrics accuracy
 
 ## Common Development Tasks
 
 ### Adding a New DA Feature
+
 1. Update DA interfaces in `core/da`
 2. Modify `da_includer.go` for inclusion logic
 3. Update `submitter.go` for submission flow
 4. Add retrieval logic in `retriever.go`
 5. Update tests and metrics
 
 ### Modifying Block Production
+
 1. Update aggregation logic in `aggregation.go`
 2. Adjust timing in Manager configuration
 3. Update metrics collection
 4. Test both normal and lazy modes
 
 ### Implementing New Sync Strategy
+
 1. Modify `SyncLoop` in `sync.go`
 2. Update pending block handling
 3. Adjust cache strategies
@@ -182,4 +200,4 @@ The block package is the core of ev-node's block management system. It handles b
 - Log with structured fields
 - Return errors with context
 - Use metrics for observability
-- Test error conditions thoroughly
+- Test error conditions thoroughly

block/da_includer.go

@@ -74,7 +74,12 @@ func (m *Manager) incrementDAIncludedHeight(ctx context.Context) error {
 
 	// Update sequencer metrics if the sequencer supports it
 	if seq, ok := m.sequencer.(MetricsRecorder); ok {
-		seq.RecordMetrics(m.gasPrice, 0, coreda.StatusSuccess, m.pendingHeaders.numPendingHeaders(), newHeight)
+		gasPrice, err := m.da.GasPrice(ctx)
+		if err != nil {
+			m.logger.Error().Err(err).Msg("failed to get gas price")
+			return err
+		}
+		seq.RecordMetrics(gasPrice, 0, coreda.StatusSuccess, m.pendingHeaders.numPendingHeaders(), newHeight)
 	}
 
 	return nil

block/da_includer_test.go

@@ -421,10 +421,14 @@ func TestIncrementDAIncludedHeight_WithMetricsRecorder(t *testing.T) {
 	expectedDAIncludedHeight := startDAIncludedHeight + 1
 	m.daIncludedHeight.Store(startDAIncludedHeight)
 
+	// Set up mock DA
+	mockDA := mocks.NewMockDA(t)
+	mockDA.On("GasPrice", mock.Anything).Return(1.5, nil).Once()
+	m.da = mockDA
+
 	// Set up mock sequencer with metrics
 	mockSequencer := new(MockSequencerWithMetrics)
 	m.sequencer = mockSequencer
-	m.gasPrice = 1.5 // Set a test gas price
 
 	// Mock the store calls needed for PendingHeaders initialization
 	// First, clear the existing Height mock from newTestManager
@@ -462,6 +466,7 @@ func TestIncrementDAIncludedHeight_WithMetricsRecorder(t *testing.T) {
 	store.AssertExpectations(t)
 	exec.AssertExpectations(t)
 	mockSequencer.AssertExpectations(t)
+	mockDA.AssertExpectations(t)
 }
 
 // Note: It is not practical to unit test a CompareAndSwap failure for incrementDAIncludedHeight

block/manager_test.go

@@ -47,8 +47,6 @@ func getManager(t *testing.T, da da.DA, gasPrice float64, gasMultiplier float64)
 		headerCache:              cache.NewCache[types.SignedHeader](),
 		dataCache:                cache.NewCache[types.Data](),
 		logger:                   logger,
-		gasPrice:                 gasPrice,
-		gasMultiplier:            gasMultiplier,
 		lastStateMtx:             &sync.RWMutex{},
 		metrics:                  NopMetrics(),
 		store:                    mockStore,
@@ -212,6 +210,7 @@ func Test_submitBlocksToDA_BlockMarshalErrorCase1(t *testing.T) {
 	ctx := context.Background()
 
 	mockDA := mocks.NewMockDA(t)
+	mockDA.On("GasPrice", mock.Anything).Return(1.0, nil).Maybe()
 	m, _ := getManager(t, mockDA, -1, -1)
 
 	header1, data1 := types.GetRandomBlock(uint64(1), 5, chainID)
@@ -250,6 +249,7 @@ func Test_submitBlocksToDA_BlockMarshalErrorCase2(t *testing.T) {
 	ctx := context.Background()
 
 	mockDA := mocks.NewMockDA(t)
+	mockDA.On("GasPrice", mock.Anything).Return(1.0, nil).Maybe()
 	m, _ := getManager(t, mockDA, -1, -1)
 
 	header1, data1 := types.GetRandomBlock(uint64(1), 5, chainID)

block/publish_block_p2p_test.go

@@ -215,8 +215,6 @@ func setupBlockManager(t *testing.T, ctx context.Context, workDir string, mainKV
 		nil,
 		nil,
 		NopMetrics(),
-		1.,
-		1.,
 		DefaultManagerOptions(),
 	)
 	require.NoError(t, err)

block/submitter.go

@@ -85,7 +85,7 @@ func submitToDA[T any](
 	submittedAll := false
 	var backoff time.Duration
 	attempt := 0
-	
+
 	// Get gas price from DA layer
 	initialGasPrice, err := m.da.GasPrice(ctx)
 	if err != nil {
@@ -144,7 +144,7 @@ func submitToDA[T any](
 			remaining = notSubmitted
 			marshaled = notSubmittedMarshaled
 			backoff = 0
-			
+
 			// Get gas multiplier from DA layer and adjust price
 			gasMultiplier, multErr := m.da.GasMultiplier(ctx)
 			if multErr != nil {
@@ -161,7 +161,7 @@ func submitToDA[T any](
 			// Record failed DA submission (will retry)
 			m.recordDAMetrics("submission", DAModeFail)
 			backoff = m.config.DA.BlockTime.Duration * time.Duration(m.config.DA.MempoolTTL)
-			
+
 			// Get gas multiplier from DA layer and increase price for retry
 			gasMultiplier, multErr := m.da.GasMultiplier(ctx)
 			if multErr != nil {

block/submitter_test.go

@@ -46,8 +46,10 @@ func newTestManagerWithDA(t *testing.T, da *mocks.MockDA) (m *Manager) {
 	)
 
 	// Set up DA mock to return gas parameters
-	da.On("GasPrice", mock.Anything).Return(1.0, nil).Maybe()
-	da.On("GasMultiplier", mock.Anything).Return(2.0, nil).Maybe()
+	if da != nil {
+		da.On("GasPrice", mock.Anything).Return(1.0, nil).Maybe()
+		da.On("GasMultiplier", mock.Anything).Return(2.0, nil).Maybe()
+	}
 
 	return &Manager{
 		da:             da,
@@ -192,6 +194,8 @@ func TestSubmitDataToDA_Failure(t *testing.T) {
 				daError:  tc.daError,
 				mockDASetup: func(da *mocks.MockDA, gasPriceHistory *[]float64, daError error) {
 					da.ExpectedCalls = nil
+					da.On("GasPrice", mock.Anything).Return(1.0, nil).Maybe()
+					da.On("GasMultiplier", mock.Anything).Return(2.0, nil).Maybe()
 					da.On("SubmitWithOptions", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).
 						Run(func(args mock.Arguments) { *gasPriceHistory = append(*gasPriceHistory, args.Get(2).(float64)) }).
 						Return(nil, daError)
@@ -227,6 +231,8 @@ func TestSubmitHeadersToDA_Failure(t *testing.T) {
 				daError:  tc.daError,
 				mockDASetup: func(da *mocks.MockDA, gasPriceHistory *[]float64, daError error) {
 					da.ExpectedCalls = nil
+					da.On("GasPrice", mock.Anything).Return(1.0, nil).Maybe()
+					da.On("GasMultiplier", mock.Anything).Return(2.0, nil).Maybe()
 					da.On("SubmitWithOptions", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).
 						Run(func(args mock.Arguments) { *gasPriceHistory = append(*gasPriceHistory, args.Get(2).(float64)) }).
 						Return(nil, daError)

docs/learn/config.md

@@ -62,12 +62,14 @@ Evolve supports running nodes that sync exclusively from the Data Availability (
 **To enable DA-only sync mode:**
 
 1. **Leave P2P peers empty** (default behavior):
+
    ```yaml
    p2p:
      peers: ""  # Empty or omit this field entirely
    ```
-   
+
 2. **Configure DA connection** (required):
+
    ```yaml
    da:
      address: "your-da-service:port"
@@ -78,6 +80,7 @@ Evolve supports running nodes that sync exclusively from the Data Availability (
 3. **Optional**: You can still configure P2P listen address for potential future connections, but without peers, no P2P networking will occur.
 
 When running in DA-only mode, the node will:
+
 - ✅ Sync blocks and headers from the DA layer
 - ✅ Validate transactions and maintain state
 - ✅ Serve RPC requests