add changes from pr

Author: randygrok

block/submitter.go

@@ -15,17 +15,18 @@ const (
 	noGasPrice        = -1
 )
 
-
-type RetryStrategy struct {
+// retryStrategy manages retry logic with backoff and gas price adjustments for DA submissions
+type retryStrategy struct {
 	attempt         int
 	backoff         time.Duration
 	gasPrice        float64
 	initialGasPrice float64
 	maxAttempts     int
 }
 
-func NewRetryStrategy(initialGasPrice float64) *RetryStrategy {
-	return &RetryStrategy{
+// newRetryStrategy creates a new retryStrategy with the given initial gas price
+func newRetryStrategy(initialGasPrice float64) *retryStrategy {
+	return &retryStrategy{
 		attempt:         0,
 		backoff:         0,
 		gasPrice:        initialGasPrice,
@@ -34,27 +35,32 @@ func NewRetryStrategy(initialGasPrice float64) *RetryStrategy {
 	}
 }
 
-func (r *RetryStrategy) ShouldContinue() bool {
+// ShouldContinue returns true if the retry strategy should continue attempting submissions
+func (r *retryStrategy) ShouldContinue() bool {
 	return r.attempt < r.maxAttempts
 }
 
-func (r *RetryStrategy) NextAttempt() {
+// NextAttempt increments the attempt counter
+func (r *retryStrategy) NextAttempt() {
 	r.attempt++
 }
 
-func (r *RetryStrategy) ResetOnSuccess(gasMultiplier float64) {
+// ResetOnSuccess resets backoff and adjusts gas price downward after a successful submission
+func (r *retryStrategy) ResetOnSuccess(gasMultiplier float64) {
 	r.backoff = 0
 	if gasMultiplier > 0 && r.gasPrice != noGasPrice {
 		r.gasPrice = r.gasPrice / gasMultiplier
 		r.gasPrice = max(r.gasPrice, r.initialGasPrice)
 	}
 }
 
-func (r *RetryStrategy) BackoffOnFailure(m *Manager) {
+// BackoffOnFailure applies exponential backoff after a submission failure
+func (r *retryStrategy) BackoffOnFailure(m *Manager) {
 	r.backoff = m.exponentialBackoff(r.backoff)
 }
 
-func (r *RetryStrategy) BackoffOnMempool(mempoolTTL int, blockTime time.Duration, gasMultiplier float64) {
+// BackoffOnMempool applies mempool-specific backoff and increases gas price when transaction is stuck in mempool
+func (r *retryStrategy) BackoffOnMempool(mempoolTTL int, blockTime time.Duration, gasMultiplier float64) {
 	r.backoff = blockTime * time.Duration(mempoolTTL)
 	if gasMultiplier > 0 && r.gasPrice != noGasPrice {
 		r.gasPrice = r.gasPrice * gasMultiplier
@@ -75,7 +81,7 @@ func handleSuccessfulSubmission[T any](
 	marshaled [][]byte,
 	res *coreda.ResultSubmit,
 	postSubmit func([]T, *coreda.ResultSubmit, float64),
-	retryStrategy *RetryStrategy,
+	retryStrategy *retryStrategy,
 	itemType string,
 ) SubmissionOutcome[T] {
 	m.recordDAMetrics("submission", DAModeSuccess)
@@ -111,7 +117,7 @@ func handleSuccessfulSubmission[T any](
 func handleMempoolFailure(
 	m *Manager,
 	res *coreda.ResultSubmit,
-	retryStrategy *RetryStrategy,
+	retryStrategy *retryStrategy,
 	attempt int,
 ) {
 	m.logger.Error("DA layer submission failed",
@@ -131,7 +137,7 @@ func handleTooBigError[T any](
 	ctx context.Context,
 	remaining []T,
 	marshaled [][]byte,
-	retryStrategy *RetryStrategy,
+	retryStrategy *retryStrategy,
 	postSubmit func([]T, *coreda.ResultSubmit, float64),
 	itemType string,
 	attempt int,
@@ -178,7 +184,7 @@ func handleTooBigError[T any](
 func handleGenericFailure(
 	m *Manager,
 	res *coreda.ResultSubmit,
-	retryStrategy *RetryStrategy,
+	retryStrategy *retryStrategy,
 	attempt int,
 ) {
 	m.logger.Error("DA layer submission failed",
@@ -269,7 +275,7 @@ func submitToDA[T any](
 		return err
 	}
 
-	retryStrategy := NewRetryStrategy(m.gasPrice)
+	retryStrategy := newRetryStrategy(m.gasPrice)
 	remaining := items
 	numSubmitted := 0
 
@@ -341,7 +347,7 @@ func handleSubmissionResult[T any](
 	res coreda.ResultSubmit,
 	remaining []T,
 	marshaled [][]byte,
-	retryStrategy *RetryStrategy,
+	retryStrategy *retryStrategy,
 	postSubmit func([]T, *coreda.ResultSubmit, float64),
 	itemType string,
 ) SubmissionOutcome[T] {

test/e2e/evm_da_restart_e2e_test.go

@@ -11,11 +11,11 @@
 //
 // Test Coverage:
 // TestEvmDARestartWithPendingBlocksE2E - Tests the scenario where:
-//   1. Blocks are created and published to DA
-//   2. DA layer is killed
-//   3. More blocks are created until pending blocks exceed max blob size
-//   4. DA layer is restarted
-//   5. Verification that pending blocks are submitted correctly without infinite loops
+//  1. Blocks are created and published to DA
+//  2. DA layer is killed
+//  3. More blocks are created until pending blocks exceed max blob size
+//  4. DA layer is restarted
+//  5. Verification that pending blocks are submitted correctly without infinite loops
 package e2e
 
 import (
@@ -135,7 +135,7 @@ func TestEvmDARestartWithPendingBlocksE2E(t *testing.T) {
 			currentHeader, err := client.HeaderByNumber(ctx, nil)
 			if err == nil {
 				currentHeight := currentHeader.Number.Uint64()
-				t.Logf("Progress: Block batch %d/%d completed. Current height: %d, Pending txs: %d", 
+				t.Logf("Progress: Block batch %d/%d completed. Current height: %d, Pending txs: %d",
 					block+1, targetBlocks, currentHeight, len(pendingTxHashes))
 			}
 		}
@@ -166,7 +166,7 @@ func TestEvmDARestartWithPendingBlocksE2E(t *testing.T) {
 	// Use an extremely small max blob size (100 bytes) to guarantee StatusTooBig with our large batch
 	sut.ExecCmd(localDABinary, "-max-blob-size", "100")
 	t.Log("✅ DA layer restarted")
-	
+
 	// Wait for DA to be ready
 	time.Sleep(2 * time.Second)
 
@@ -176,8 +176,8 @@ func TestEvmDARestartWithPendingBlocksE2E(t *testing.T) {
 	// Monitor the recovery process for a reasonable amount of time
 	recoveryStart := time.Now()
 	recoveryTimeout := 30 * time.Second // Reduced to 30 seconds to quickly detect infinite loop
-	checkInterval := 2 * time.Second // Check more frequently
-	
+	checkInterval := 2 * time.Second    // Check more frequently
+
 	var recoverySuccess bool
 	var finalTxCount int
 
@@ -194,7 +194,7 @@ func TestEvmDARestartWithPendingBlocksE2E(t *testing.T) {
 		finalTxCount = includedCount
 		progressPct := float64(includedCount) / float64(len(pendingTxHashes)) * 100
 
-		t.Logf("Recovery progress: %d/%d transactions included (%.1f%%) - Elapsed: %v", 
+		t.Logf("Recovery progress: %d/%d transactions included (%.1f%%) - Elapsed: %v",
 			includedCount, len(pendingTxHashes), progressPct, elapsed)
 
 		// Check if all transactions are included
@@ -212,15 +212,15 @@ func TestEvmDARestartWithPendingBlocksE2E(t *testing.T) {
 
 	// Verify that the recovery process completed successfully
 	if !recoverySuccess {
-		t.Logf("⚠️  Recovery incomplete after %v: %d/%d transactions included", 
+		t.Logf("⚠️  Recovery incomplete after %v: %d/%d transactions included",
 			recoveryTimeout, finalTxCount, len(pendingTxHashes))
-		
+
 		// Even if not all transactions are included, let's verify there's no infinite loop
 		// by checking that some progress was made
-		require.Greater(t, finalTxCount, 0, 
+		require.Greater(t, finalTxCount, 0,
 			"At least some pending transactions should be included after DA restart")
-		require.Greater(t, float64(finalTxCount)/float64(len(pendingTxHashes)), 0.5, 
-			"At least 50%% of pending transactions should be included to prove recovery is working")
+		require.Greater(t, float64(finalTxCount)/float64(len(pendingTxHashes)), 0.5,
+			"At least 50% of pending transactions should be included to prove recovery is working")
 	}
 
 	// Verify final block height increased appropriately
@@ -257,4 +257,4 @@ func TestEvmDARestartWithPendingBlocksE2E(t *testing.T) {
 	t.Logf("   ✅ No infinite loops detected during recovery")
 	t.Logf("   ✅ System stability confirmed with final transaction")
 	t.Logf("   🚀 Total test duration: %v", time.Since(blockCreationStart))
-}
+}