chore: disable feature again. Code cleanup

Author: julienrbrt

apps/evm/cmd/post_tx_cmd.go

@@ -21,9 +21,8 @@ import (
 )
 
 const (
-	flagNamespace  = "namespace"
-	flagGasPrice   = "gas-price"
-	flagSubmitOpts = "submit-options"
+	flagNamespace = "namespace"
+	flagGasPrice  = "gas-price"
 )
 
 // PostTxCmd returns a command to post a signed Ethereum transaction to the DA layer
@@ -61,7 +60,6 @@ Examples:
 	// Add command-specific flags
 	cobraCmd.Flags().String(flagNamespace, "", "DA namespace ID (if not provided, uses config namespace)")
 	cobraCmd.Flags().Float64(flagGasPrice, -1, "Gas price for DA submission (if not provided, uses config gas price)")
-	cobraCmd.Flags().String(flagSubmitOpts, "", "Additional DA submit options (if not provided, uses config submit options)")
 
 	return cobraCmd
 }
@@ -104,6 +102,11 @@ func postTxRunE(cmd *cobra.Command, args []string) error {
 	if namespace == "" {
 		namespace = nodeConfig.DA.GetForcedInclusionNamespace()
 	}
+
+	if namespace == "" {
+		return fmt.Errorf("forced inclusionnamespace cannot be empty")
+	}
+
 	namespaceBz := da.NamespaceFromString(namespace).Bytes()
 
 	// Get gas price (use flag if provided, otherwise use config)
@@ -112,16 +115,6 @@ func postTxRunE(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("failed to get gas-price flag: %w", err)
 	}
 
-	// Get submit options (use flag if provided, otherwise use config)
-	submitOpts, err := cmd.Flags().GetString(flagSubmitOpts)
-	if err != nil {
-		return fmt.Errorf("failed to get submit-options flag: %w", err)
-	}
-
-	if submitOpts == "" {
-		submitOpts = nodeConfig.DA.SubmitOptions
-	}
-
 	logger.Info().Str("namespace", namespace).Float64("gas_price", gasPrice).Int("tx_size", len(txData)).Msg("posting transaction to DA layer")
 
 	daClient, err := jsonrpc.NewClient(
@@ -139,7 +132,7 @@ func postTxRunE(cmd *cobra.Command, args []string) error {
 	logger.Info().Msg("submitting transaction to DA layer...")
 
 	blobs := [][]byte{txData}
-	options := []byte(submitOpts)
+	options := []byte(nodeConfig.DA.SubmitOptions)
 
 	dac := evblock.NewDAClient(&daClient.DA, nodeConfig, logger)
 	result := dac.Submit(cmd.Context(), blobs, gasPrice, namespaceBz, options)
@@ -156,7 +149,7 @@ func postTxRunE(cmd *cobra.Command, args []string) error {
 		genesisPath := filepath.Join(filepath.Dir(nodeConfig.ConfigPath()), "genesis.json")
 		genesis, err := genesispkg.LoadGenesis(genesisPath)
 		if err != nil {
-			return fmt.Errorf("failed to load genesis: %w", err)
+			return fmt.Errorf("failed to load genesis for calculating inclusion time estimate: %w", err)
 		}
 
 		_, epochEnd, _ := types.CalculateEpochBoundaries(result.Height, genesis.DAStartHeight, genesis.DAEpochForcedInclusion)
@@ -205,7 +198,7 @@ func decodeTxFromJSON(input string) ([]byte, error) {
 	input = strings.TrimSpace(input)
 
 	// Try to decode as JSON with "raw" field
-	var txJSON map[string]interface{}
+	var txJSON map[string]any
 	if err := json.Unmarshal([]byte(input), &txJSON); err == nil {
 		if rawTx, ok := txJSON["raw"].(string); ok {
 			return decodeHexTx(rawTx)

core/execution/context_test.go

@@ -0,0 +1,90 @@
+package execution_test
+
+import (
+	"context"
+	"slices"
+	"testing"
+
+	"github.com/evstack/ev-node/core/execution"
+)
+
+// TestWithForceIncludedMask_ContextRoundtrip verifies that the mask
+// can be stored in and retrieved from context correctly
+func TestWithForceIncludedMask_ContextRoundtrip(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		name string
+		mask []bool
+	}{
+		{
+			name: "nil mask",
+			mask: nil,
+		},
+		{
+			name: "empty mask",
+			mask: []bool{},
+		},
+		{
+			name: "single element",
+			mask: []bool{true},
+		},
+		{
+			name: "multiple elements",
+			mask: []bool{true, false, true, false, false},
+		},
+		{
+			name: "all true",
+			mask: []bool{true, true, true},
+		},
+		{
+			name: "all false",
+			mask: []bool{false, false, false},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
+
+			ctx := context.Background()
+
+			// Add mask to context
+			ctxWithMask := execution.WithForceIncludedMask(ctx, tt.mask)
+
+			// Retrieve mask from context
+			retrieved := execution.GetForceIncludedMask(ctxWithMask)
+
+			// Verify it matches
+			if !slices.Equal(tt.mask, retrieved) {
+				t.Errorf("expected mask %v, got %v", tt.mask, retrieved)
+			}
+		})
+	}
+}
+
+// TestGetForceIncludedMask_NoMask verifies that getting a mask from
+// a context without one returns nil
+func TestGetForceIncludedMask_NoMask(t *testing.T) {
+	t.Parallel()
+
+	ctx := context.Background()
+	mask := execution.GetForceIncludedMask(ctx)
+	if mask != nil {
+		t.Errorf("expected nil mask from context without mask, got %v", mask)
+	}
+}
+
+// TestGetForceIncludedMask_WrongType verifies that wrong types in context
+// are handled gracefully
+func TestGetForceIncludedMask_WrongType(t *testing.T) {
+	t.Parallel()
+
+	// Create context with wrong type
+	ctx := context.WithValue(context.Background(), "force_included_mask", "wrong type")
+
+	mask := execution.GetForceIncludedMask(ctx)
+	if mask != nil {
+		t.Errorf("expected nil mask when context has wrong type, got %v", mask)
+	}
+}

execution/evm/execution.go

@@ -257,10 +257,6 @@ func (c *EngineClient) ExecuteTxs(ctx context.Context, txs [][]byte, blockHeight
 	validTxs := make([]string, 0, len(txs))
 	for i, tx := range txs {
 		if len(tx) == 0 {
-			c.logger.Debug().
-				Int("tx_index", i).
-				Uint64("block_height", blockHeight).
-				Msg("skipping empty transaction")
 			continue
 		}
 
@@ -274,7 +270,7 @@ func (c *EngineClient) ExecuteTxs(ctx context.Context, txs [][]byte, blockHeight
 		// Validate that the transaction can be parsed as an Ethereum transaction
 		var ethTx types.Transaction
 		if err := ethTx.UnmarshalBinary(tx); err != nil {
-			c.logger.Warn().
+			c.logger.Debug().
 				Int("tx_index", i).
 				Uint64("block_height", blockHeight).
 				Err(err).
@@ -287,7 +283,7 @@ func (c *EngineClient) ExecuteTxs(ctx context.Context, txs [][]byte, blockHeight
 	}
 
 	if len(validTxs) < len(txs) {
-		c.logger.Info().
+		c.logger.Debug().
 			Int("total_txs", len(txs)).
 			Int("valid_txs", len(validTxs)).
 			Int("filtered_txs", len(txs)-len(validTxs)).

execution/evm/force_included_test.go

@@ -160,80 +160,3 @@ func TestExecuteTxs_ForceIncludedMask(t *testing.T) {
 		})
 	}
 }
-
-// TestWithForceIncludedMask_ContextRoundtrip verifies that the mask
-// can be stored in and retrieved from context correctly
-func TestWithForceIncludedMask_ContextRoundtrip(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		name string
-		mask []bool
-	}{
-		{
-			name: "nil mask",
-			mask: nil,
-		},
-		{
-			name: "empty mask",
-			mask: []bool{},
-		},
-		{
-			name: "single element",
-			mask: []bool{true},
-		},
-		{
-			name: "multiple elements",
-			mask: []bool{true, false, true, false, false},
-		},
-		{
-			name: "all true",
-			mask: []bool{true, true, true},
-		},
-		{
-			name: "all false",
-			mask: []bool{false, false, false},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			t.Parallel()
-
-			ctx := context.Background()
-
-			// Add mask to context
-			ctxWithMask := coreexecution.WithForceIncludedMask(ctx, tt.mask)
-
-			// Retrieve mask from context
-			retrieved := coreexecution.GetForceIncludedMask(ctxWithMask)
-
-			// Verify it matches
-			assert.Equal(t, tt.mask, retrieved)
-		})
-	}
-}
-
-// TestGetForceIncludedMask_NoMask verifies that getting a mask from
-// a context without one returns nil
-func TestGetForceIncludedMask_NoMask(t *testing.T) {
-	t.Parallel()
-
-	ctx := context.Background()
-	mask := coreexecution.GetForceIncludedMask(ctx)
-
-	assert.Nil(t, mask, "expected nil mask from context without mask")
-}
-
-// TestGetForceIncludedMask_WrongType verifies that wrong types in context
-// are handled gracefully
-func TestGetForceIncludedMask_WrongType(t *testing.T) {
-	t.Parallel()
-
-	// Create context with wrong type
-	ctx := context.WithValue(context.Background(), "force_included_mask", "wrong type")
-
-	mask := coreexecution.GetForceIncludedMask(ctx)
-
-	assert.Nil(t, mask, "expected nil mask when context has wrong type")
-}

pkg/config/config.go

@@ -268,10 +268,10 @@ func (c *Config) Validate() error {
 	}
 
 	if len(c.DA.GetForcedInclusionNamespace()) > 0 {
-		if err := validateNamespace(c.DA.GetForcedInclusionNamespace()); err != nil {
-			return fmt.Errorf("could not validate forced inclusion namespace (%s): %w", c.DA.GetForcedInclusionNamespace(), err)
-		}
-		// return fmt.Errorf("forced inclusion is not yet live")
+		// if err := validateNamespace(c.DA.GetForcedInclusionNamespace()); err != nil {
+		// 	return fmt.Errorf("could not validate forced inclusion namespace (%s): %w", c.DA.GetForcedInclusionNamespace(), err)
+		// }
+		return fmt.Errorf("forced inclusion is not yet live")
 
 	}