fix: eliminate gas price/multiplier duplication (#2539)

closes #2316

This PR eliminates the duplication of gas price and gas multiplier by
using the DA interface as the single source of truth.

## Changes
- Remove `gasPrice` and `gasMultiplier` fields from Manager struct
- Update `submitToDA` function to call DA interface methods
- Remove gas parameters from `NewManager` constructor
- Update tests to mock DA interface methods
- Add proper error handling with fallback defaults

## Benefits
- Single source of truth for gas parameters
- Enables dynamic gas pricing by DA implementations
- Reduces configuration complexity
- Maintains backward compatibility

Generated with [Claude Code](https://claude.ai/code)

---------

Co-authored-by: claude[bot] <209825114+claude[bot]@users.noreply.github.com>
Co-authored-by: Marko <[email protected]>
Co-authored-by: tac0turtle <[email protected]>
Co-authored-by: Marko <[email protected]>

Author: 4 people

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.Warn().Err(err).Msg("failed to get gas price from DA layer, using default for metrics")
+			gasPrice = 0.0 // Use default gas price for metrics
+		}
+		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.go

@@ -144,8 +144,6 @@ type Manager struct {
 	// in the DA
 	daIncludedHeight atomic.Uint64
 	da               coreda.DA
-	gasPrice         float64
-	gasMultiplier    float64
 
 	sequencer     coresequencer.Sequencer
 	lastBatchData [][]byte
@@ -303,8 +301,6 @@ func NewManager(
 	headerBroadcaster broadcaster[*types.SignedHeader],
 	dataBroadcaster broadcaster[*types.Data],
 	seqMetrics *Metrics,
-	gasPrice float64,
-	gasMultiplier float64,
 	managerOpts ManagerOptions,
 ) (*Manager, error) {
 	s, err := getInitialState(ctx, genesis, signer, store, exec, logger, managerOpts)
@@ -395,8 +391,6 @@ func NewManager(
 		sequencer:                   sequencer,
 		exec:                        exec,
 		da:                          da,
-		gasPrice:                    gasPrice,
-		gasMultiplier:               gasMultiplier,
 		txNotifyCh:                  make(chan struct{}, 1), // Non-blocking channel
 		signaturePayloadProvider:    managerOpts.SignaturePayloadProvider,
 		validatorHasherProvider:     managerOpts.ValidatorHasherProvider,

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

@@ -11,11 +11,23 @@ import (
 )
 
 const (
-	submissionTimeout = 60 * time.Second
-	noGasPrice        = -1
-	initialBackoff    = 100 * time.Millisecond
+	submissionTimeout    = 60 * time.Second
+	noGasPrice           = -1
+	initialBackoff       = 100 * time.Millisecond
+	defaultGasPrice      = 0.0
+	defaultGasMultiplier = 1.0
 )
 
+// getGasMultiplier fetches the gas multiplier from DA layer with fallback to default value
+func (m *Manager) getGasMultiplier(ctx context.Context) float64 {
+	gasMultiplier, err := m.da.GasMultiplier(ctx)
+	if err != nil {
+		m.logger.Warn().Err(err).Msg("failed to get gas multiplier from DA layer, using default")
+		return defaultGasMultiplier
+	}
+	return gasMultiplier
+}
+
 // retryStrategy manages retry logic with backoff and gas price adjustments for DA submissions
 type retryStrategy struct {
 	attempt         int
@@ -221,7 +233,13 @@ func submitToDA[T any](
 		return err
 	}
 
-	retryStrategy := newRetryStrategy(m.gasPrice, m.config.DA.BlockTime.Duration, m.config.DA.MaxSubmitAttempts)
+	gasPrice, err := m.da.GasPrice(ctx)
+	if err != nil {
+		m.logger.Warn().Err(err).Msg("failed to get gas price from DA layer, using default")
+		gasPrice = defaultGasPrice
+	}
+
+	retryStrategy := newRetryStrategy(gasPrice, m.config.DA.BlockTime.Duration, m.config.DA.MaxSubmitAttempts)
 	remaining := items
 	numSubmitted := 0
 
@@ -293,10 +311,10 @@ func handleSubmissionResult[T any](
 ) submissionOutcome[T] {
 	switch res.Code {
 	case coreda.StatusSuccess:
-		return handleSuccessfulSubmission(m, remaining, marshaled, &res, postSubmit, retryStrategy, itemType)
+		return handleSuccessfulSubmission(ctx, m, remaining, marshaled, &res, postSubmit, retryStrategy, itemType)
 
 	case coreda.StatusNotIncludedInBlock, coreda.StatusAlreadyInMempool:
-		return handleMempoolFailure(m, &res, retryStrategy, retryStrategy.attempt, remaining, marshaled)
+		return handleMempoolFailure(ctx, m, &res, retryStrategy, retryStrategy.attempt, remaining, marshaled)
 
 	case coreda.StatusContextCanceled:
 		m.logger.Info().Int("attempt", retryStrategy.attempt).Msg("DA layer submission canceled due to context cancellation")
@@ -315,6 +333,7 @@ func handleSubmissionResult[T any](
 }
 
 func handleSuccessfulSubmission[T any](
+	ctx context.Context,
 	m *Manager,
 	remaining []T,
 	marshaled [][]byte,
@@ -335,7 +354,10 @@ func handleSuccessfulSubmission[T any](
 	notSubmittedMarshaled := marshaled[res.SubmittedCount:]
 
 	postSubmit(submitted, res, retryStrategy.gasPrice)
-	retryStrategy.ResetOnSuccess(m.gasMultiplier)
+
+	gasMultiplier := m.getGasMultiplier(ctx)
+
+	retryStrategy.ResetOnSuccess(gasMultiplier)
 
 	m.logger.Debug().Dur("backoff", retryStrategy.backoff).Float64("gasPrice", retryStrategy.gasPrice).Msg("resetting DA layer submission options")
 
@@ -349,6 +371,7 @@ func handleSuccessfulSubmission[T any](
 }
 
 func handleMempoolFailure[T any](
+	ctx context.Context,
 	m *Manager,
 	res *coreda.ResultSubmit,
 	retryStrategy *retryStrategy,
@@ -359,8 +382,9 @@ func handleMempoolFailure[T any](
 	m.logger.Error().Str("error", res.Message).Int("attempt", attempt).Msg("DA layer submission failed")
 
 	m.recordDAMetrics("submission", DAModeFail)
-	retryStrategy.BackoffOnMempool(int(m.config.DA.MempoolTTL), m.config.DA.BlockTime.Duration, m.gasMultiplier)
 
+	gasMultiplier := m.getGasMultiplier(ctx)
+	retryStrategy.BackoffOnMempool(int(m.config.DA.MempoolTTL), m.config.DA.BlockTime.Duration, gasMultiplier)
 	m.logger.Info().Dur("backoff", retryStrategy.backoff).Float64("gasPrice", retryStrategy.gasPrice).Msg("retrying DA layer submission with")
 
 	return submissionOutcome[T]{
@@ -402,7 +426,8 @@ func handleTooBigError[T any](
 		if totalSubmitted > 0 {
 			newRemaining := remaining[totalSubmitted:]
 			newMarshaled := marshaled[totalSubmitted:]
-			retryStrategy.ResetOnSuccess(m.gasMultiplier)
+			gasMultiplier := m.getGasMultiplier(ctx)
+			retryStrategy.ResetOnSuccess(gasMultiplier)
 
 			return submissionOutcome[T]{
 				RemainingItems:   newRemaining,