normalize DA endpoint at startup

Author: tac0turtle

apps/evm/cmd/run.go

@@ -61,7 +61,7 @@ var RunCmd = &cobra.Command{
 
 		var daClient block.FullDAClient
 		if nodeConfig.DAEnabled() {
-			blobClient, err := blobrpc.NewWSClient(cmd.Context(), logger, nodeConfig.DA.Address, nodeConfig.DA.AuthToken, "")
+			blobClient, err := blobrpc.NewWSClient(cmd.Context(), logger, nodeConfig.GetDAAddress(), nodeConfig.DA.AuthToken, "")
 			if err != nil {
 				return fmt.Errorf("failed to create blob client: %w", err)
 			}

apps/testapp/cmd/run.go

@@ -125,7 +125,7 @@ func createSequencer(
 		return solo.NewSoloSequencer(logger, []byte(genesis.ChainID), executor), nil
 	}
 
-	blobClient, err := blobrpc.NewWSClient(ctx, logger, nodeConfig.DA.Address, nodeConfig.DA.AuthToken, "")
+	blobClient, err := blobrpc.NewWSClient(ctx, logger, nodeConfig.GetDAAddress(), nodeConfig.DA.AuthToken, "")
 	if err != nil {
 		return nil, fmt.Errorf("failed to create blob client: %w", err)
 	}

docs/learn/config.md

@@ -472,7 +472,7 @@ da:
 ### DA Service Address
 
 **Description:**
-The network address (host:port) of the Data Availability layer service. A full follower with this value unset syncs exclusively through P2P and does not create a DA client. Aggregators must configure this value.
+The network address (host:port) of the Data Availability layer service. A full follower with this value unset syncs exclusively through P2P and does not create a DA client. Aggregators must configure this value before startup.
 
 **YAML:**
 

pkg/cmd/run_node.go

@@ -38,6 +38,9 @@ func ParseConfig(cmd *cobra.Command) (rollconf.Config, error) {
 	if err := nodeConfig.Validate(); err != nil {
 		return rollconf.Config{}, fmt.Errorf("failed to validate node config: %w", err)
 	}
+	if nodeConfig.Node.Aggregator && nodeConfig.GetDAAddress() == "" {
+		return rollconf.Config{}, fmt.Errorf("DA address is required when aggregator mode is enabled")
+	}
 
 	return nodeConfig, nil
 }
@@ -152,7 +155,7 @@ func StartNode(
 
 	var daClient block.FullDAClient
 	if nodeConfig.DAEnabled() {
-		blobClient, err := blobrpc.NewWSClient(ctx, logger, nodeConfig.DA.Address, nodeConfig.DA.AuthToken, "")
+		blobClient, err := blobrpc.NewWSClient(ctx, logger, nodeConfig.GetDAAddress(), nodeConfig.DA.AuthToken, "")
 		if err != nil {
 			return fmt.Errorf("failed to create blob client: %w", err)
 		}

pkg/cmd/run_node_test.go

@@ -174,6 +174,20 @@ func TestAggregatorFlagInvariants(t *testing.T) {
 	}
 }
 
+func TestParseConfig_AggregatorRequiresDAAddress(t *testing.T) {
+	executor, sequencer, keyProvider, nodeKey, ds, stopDAHeightTicker := createTestComponents(context.Background(), t)
+	defer stopDAHeightTicker()
+
+	nodeConfig := rollconf.DefaultConfig()
+	nodeConfig.RootDir = t.TempDir()
+
+	cmd := newRunNodeCmd(t.Context(), executor, sequencer, keyProvider, nodeKey, ds, nodeConfig)
+	require.NoError(t, cmd.ParseFlags([]string{"start", "--rollkit.node.aggregator"}))
+
+	_, err := ParseConfig(cmd)
+	require.EqualError(t, err, "DA address is required when aggregator mode is enabled")
+}
+
 func TestPromotableFlagInvariants(t *testing.T) {
 	flagVariants := [][]string{{
 		"--rollkit.node.promotable=false",

pkg/config/config.go

@@ -273,7 +273,12 @@ type DAConfig struct {
 // DAEnabled reports whether this node should initialize a DA client. Full
 // followers without a DA address sync exclusively through P2P.
 func (c Config) DAEnabled() bool {
-	return !c.Node.Light && strings.TrimSpace(c.DA.Address) != ""
+	return !c.Node.Light && c.GetDAAddress() != ""
+}
+
+// GetDAAddress returns the configured DA address without surrounding whitespace.
+func (c Config) GetDAAddress() string {
+	return strings.TrimSpace(c.DA.Address)
 }
 
 // GetNamespace returns the namespace for header submissions.
@@ -511,10 +516,6 @@ func (c *Config) Validate() error {
 		return fmt.Errorf("promotable mode cannot be combined with light node mode")
 	}
 
-	if c.Node.Aggregator && strings.TrimSpace(c.DA.Address) == "" {
-		return fmt.Errorf("DA address is required when aggregator mode is enabled")
-	}
-
 	// Promotable mode and Raft both control leader/follower role switching.
 	// Combining them needs a composed elector that gates Raft leadership on the execution-selected proposer.
 	if c.Node.Promotable && c.Raft.Enable {

pkg/config/config_test.go

@@ -63,6 +63,14 @@ func TestDAEnabled(t *testing.T) {
 			expectedEnabled: true,
 			expectedAddress: "http://da.example:7980",
 		},
+		{
+			name: "follower with whitespace around DA address",
+			configure: func(cfg *Config) {
+				cfg.DA.Address = "  http://da.example:7980\n"
+			},
+			expectedEnabled: true,
+			expectedAddress: "http://da.example:7980",
+		},
 		{
 			name: "aggregator without DA address does not initialize DA",
 			configure: func(cfg *Config) {
@@ -90,18 +98,17 @@ func TestDAEnabled(t *testing.T) {
 			}
 
 			assert.Equal(t, tt.expectedEnabled, cfg.DAEnabled())
-			assert.Equal(t, tt.expectedAddress, cfg.DA.Address)
+			assert.Equal(t, tt.expectedAddress, cfg.GetDAAddress())
 		})
 	}
 }
 
-func TestConfigValidate_AggregatorRequiresDAAddress(t *testing.T) {
+func TestConfigValidate_AggregatorCanBeInitializedWithoutDAAddress(t *testing.T) {
 	cfg := DefaultConfig()
 	cfg.RootDir = t.TempDir()
 	cfg.Node.Aggregator = true
 
-	err := cfg.Validate()
-	require.EqualError(t, err, "DA address is required when aggregator mode is enabled")
+	require.NoError(t, cfg.Validate())
 }
 
 func TestAddFlags(t *testing.T) {

test/e2e/base_test.go

@@ -21,6 +21,8 @@ import (
 
 var binaryPath string
 
+const localDAAddress = "http://localhost:7980"
+
 func init() {
 	flag.StringVar(&binaryPath, "binary", "testapp", "testapp binary")
 }
@@ -72,6 +74,7 @@ func TestBasic(t *testing.T) {
 		"--evnode.signer.passphrase_file="+passphraseFile,
 		"--evnode.node.block_time=5ms",
 		"--evnode.da.block_time=15ms",
+		"--evnode.da.address="+localDAAddress,
 		fmt.Sprintf("--kv-endpoint=127.0.0.1:%d", kvPort),
 	)
 
@@ -174,6 +177,7 @@ func TestNodeRestartPersistence(t *testing.T) {
 		"--evnode.signer.passphrase_file="+passphraseFile,
 		"--evnode.node.block_time=5ms",
 		"--evnode.da.block_time=15ms",
+		"--evnode.da.address="+localDAAddress,
 		fmt.Sprintf("--kv-endpoint=127.0.0.1:%d", kvPort),
 	)
 	sut.AwaitNodeUp(t, "http://127.0.0.1:7331", 2*time.Second)
@@ -214,6 +218,7 @@ func TestNodeRestartPersistence(t *testing.T) {
 		"--evnode.signer.passphrase_file="+passphraseFile,
 		"--evnode.node.block_time=5ms",
 		"--evnode.da.block_time=15ms",
+		"--evnode.da.address="+localDAAddress,
 		fmt.Sprintf("--kv-endpoint=127.0.0.1:%d", kvPort),
 	)
 	sut.AwaitNodeUp(t, "http://127.0.0.1:7331", 2*time.Second)