Merge branch 'main' into claude/issue-2316-20250808-0725

Author: tac0turtle

.gitignore

@@ -15,6 +15,8 @@ build
 coverage.out
 execution/evm/jwttoken
 target
+/.claude/settings.local.json
+
 
 docs/.vitepress/dist
 node_modules

apps/evm/single/main.go

@@ -21,6 +21,9 @@ func main() {
 
 	config.AddGlobalFlags(rootCmd, "evm-single")
 
+	// Add configuration flags to NetInfoCmd so it can read RPC address
+	config.AddFlags(rollcmd.NetInfoCmd)
+
 	rootCmd.AddCommand(
 		cmd.InitCmd(),
 		cmd.RunCmd,

block/manager.go

@@ -43,10 +43,6 @@ const (
 	// defaultMempoolTTL is the number of blocks until transaction is dropped from mempool
 	defaultMempoolTTL = 25
 
-	// maxSubmitAttempts defines how many times evolve will re-try to publish block to DA layer.
-	// This is temporary solution. It will be removed in future versions.
-	maxSubmitAttempts = 30
-
 	// Key for storing namespace migration state in the store
 	namespaceMigrationKey = "namespace_migration_completed"
 
@@ -57,9 +53,6 @@ const (
 var (
 	// dataHashForEmptyTxs to be used while only syncing headers from DA and no p2p to get the Data for no txs scenarios, the syncing can proceed without getting stuck forever.
 	dataHashForEmptyTxs = []byte{110, 52, 11, 156, 255, 179, 122, 152, 156, 165, 68, 230, 187, 120, 10, 44, 120, 144, 29, 63, 179, 55, 56, 118, 133, 17, 163, 6, 23, 175, 160, 29}
-
-	// initialBackoff defines initial value for block submission backoff
-	initialBackoff = 100 * time.Millisecond
 )
 
 // publishBlockFunc defines the function signature for publishing a block.
@@ -776,17 +769,6 @@ func (m *Manager) recordMetrics(data *types.Data) {
 	m.metrics.CommittedHeight.Set(float64(data.Metadata.Height))
 }
 
-func (m *Manager) exponentialBackoff(backoff time.Duration) time.Duration {
-	backoff *= 2
-	if backoff == 0 {
-		backoff = initialBackoff
-	}
-	if backoff > m.config.DA.BlockTime.Duration {
-		backoff = m.config.DA.BlockTime.Duration
-	}
-	return backoff
-}
-
 func (m *Manager) getLastBlockTime() time.Time {
 	m.lastStateMtx.RLock()
 	defer m.lastStateMtx.RUnlock()

block/manager_test.go

@@ -703,24 +703,6 @@ func TestUtilityFunctions(t *testing.T) {
 		require.Equal(input, reconstructed)
 	})
 
-	t.Run("ExponentialBackoff", func(t *testing.T) {
-		require := require.New(t)
-		m, _ := getManager(t, mocks.NewMockDA(t), -1, -1)
-		m.config.DA.BlockTime.Duration = 10 * time.Second
-
-		// Test initial backoff
-		result := m.exponentialBackoff(0)
-		require.Equal(initialBackoff, result)
-
-		// Test doubling
-		result = m.exponentialBackoff(100 * time.Millisecond)
-		require.Equal(200*time.Millisecond, result)
-
-		// Test max cap
-		result = m.exponentialBackoff(20 * time.Second)
-		require.Equal(m.config.DA.BlockTime.Duration, result)
-	})
-
 	t.Run("GetHeaderSignature_NilSigner", func(t *testing.T) {
 		require := require.New(t)
 		m, _ := getManager(t, mocks.NewMockDA(t), -1, -1)
@@ -993,44 +975,10 @@ func TestValidationMethods(t *testing.T) {
 		require.False(result)
 	})
 
-	t.Run("ExponentialBackoff_WithConfig", func(t *testing.T) {
-		require := require.New(t)
-		m, _ := getManager(t, mocks.NewMockDA(t), -1, -1)
-
-		// Set up a config with a specific block time
-		m.config.DA.BlockTime.Duration = 5 * time.Second
-
-		// Test that backoff is capped at config value
-		result := m.exponentialBackoff(10 * time.Second)
-		require.Equal(5*time.Second, result)
-
-		// Test normal doubling
-		result = m.exponentialBackoff(100 * time.Millisecond)
-		require.Equal(200*time.Millisecond, result)
-	})
 }
 
 // TestConfigurationDefaults tests default value handling and edge cases
 func TestConfigurationDefaults(t *testing.T) {
-	t.Run("ExponentialBackoff_EdgeCases", func(t *testing.T) {
-		require := require.New(t)
-		m, _ := getManager(t, mocks.NewMockDA(t), -1, -1)
-
-		// Test with zero block time - should still double the backoff since there's no cap
-		m.config.DA.BlockTime.Duration = 0
-		result := m.exponentialBackoff(100 * time.Millisecond)
-		require.Equal(0*time.Millisecond, result) // Capped at 0
-
-		// Test with very small block time
-		m.config.DA.BlockTime.Duration = 1 * time.Millisecond
-		result = m.exponentialBackoff(100 * time.Millisecond)
-		require.Equal(1*time.Millisecond, result) // Should cap at block time
-
-		// Test normal doubling with larger block time
-		m.config.DA.BlockTime.Duration = 1 * time.Second
-		result = m.exponentialBackoff(100 * time.Millisecond)
-		require.Equal(200*time.Millisecond, result) // Should double
-	})
 
 	t.Run("IsProposer_NilSigner", func(t *testing.T) {
 		require := require.New(t)