refactor(block): simplify dual namespace (#2626)

<!--
Please read and fill out this form before submitting your PR.

Please make sure you have reviewed our contributors guide before
submitting your
first PR.

NOTE: PR titles should follow semantic commits:
https://www.conventionalcommits.org/en/v1.0.0/
-->

## Overview

This PR simplifies the namespace migration.

Currently, header and data namespaces after the migration must be
different than the legacy namespace.
Leading to 3 calls until the no data was published on the legacy
namespaces. This requirement wasn't enforced leading to footgun.

We decided to simplify the migration by requiring removing the header
namespace and undeprecating the global namespace. This allows instead of
always having 3 calls to have at most 2.

<!-- 
Please provide an explanation of the PR, including the appropriate
context,
background, goal, and rationale. If there is an issue with this
information,
please provide a tl;dr and link the issue. 

Ex: Closes #<issue number>
-->

Author: julienrbrt

apps/evm/single/cmd/run.go

@@ -47,8 +47,8 @@ var RunCmd = &cobra.Command{
         ec.SetLogger(logger.With().Str("module", "engine_client").Logger())
     }
 
-		headerNamespace := da.PrepareNamespace([]byte(nodeConfig.DA.HeaderNamespace))
-		dataNamespace := da.PrepareNamespace([]byte(nodeConfig.DA.DataNamespace))
+		headerNamespace := da.PrepareNamespace([]byte(nodeConfig.DA.GetNamespace()))
+		dataNamespace := da.PrepareNamespace([]byte(nodeConfig.DA.GetDataNamespace()))
 
 		logger.Info().Str("headerNamespace", hex.EncodeToString(headerNamespace)).Str("dataNamespace", hex.EncodeToString(dataNamespace)).Msg("namespaces")
 

apps/grpc/single/cmd/run.go

@@ -47,8 +47,8 @@ The execution client must implement the Evolve execution gRPC interface.`,
 
 		logger := rollcmd.SetupLogger(nodeConfig.Log)
 
-		headerNamespace := coreda.PrepareNamespace([]byte(nodeConfig.DA.HeaderNamespace))
-		dataNamespace := coreda.PrepareNamespace([]byte(nodeConfig.DA.DataNamespace))
+		headerNamespace := coreda.PrepareNamespace([]byte(nodeConfig.DA.GetNamespace()))
+		dataNamespace := coreda.PrepareNamespace([]byte(nodeConfig.DA.GetDataNamespace()))
 
 		logger.Info().Str("headerNamespace", hex.EncodeToString(headerNamespace)).Str("dataNamespace", hex.EncodeToString(dataNamespace)).Msg("namespaces")
 

apps/testapp/cmd/run.go

@@ -47,8 +47,8 @@ var RunCmd = &cobra.Command{
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 
-		headerNamespace := da.PrepareNamespace([]byte(nodeConfig.DA.HeaderNamespace))
-		dataNamespace := da.PrepareNamespace([]byte(nodeConfig.DA.DataNamespace))
+		headerNamespace := da.PrepareNamespace([]byte(nodeConfig.DA.GetNamespace()))
+		dataNamespace := da.PrepareNamespace([]byte(nodeConfig.DA.GetDataNamespace()))
 
 		logger.Info().Str("headerNamespace", hex.EncodeToString(headerNamespace)).Str("dataNamespace", hex.EncodeToString(dataNamespace)).Msg("namespaces")
 

block/da_speed_test.go

@@ -119,22 +119,21 @@ func setupManagerForTest(t *testing.T, initialDAHeight uint64) (*Manager, *rollm
 			Node: config.NodeConfig{BlockTime: config.DurationWrapper{Duration: blockTime}},
 			DA:   config.DAConfig{BlockTime: config.DurationWrapper{Duration: blockTime}},
 		},
-		genesis:                     genesis.Genesis{ProposerAddress: addr},
-		daHeight:                    new(atomic.Uint64),
-		heightInCh:                  make(chan daHeightEvent),
-		headerStore:                 headerStore,
-		dataStore:                   dataStore,
-		headerCache:                 cache.NewCache[types.SignedHeader](),
-		dataCache:                   cache.NewCache[types.Data](),
-		headerStoreCh:               make(chan struct{}),
-		dataStoreCh:                 make(chan struct{}),
-		retrieveCh:                  make(chan struct{}),
-		logger:                      logger,
-		lastStateMtx:                new(sync.RWMutex),
-		da:                          mockDAClient,
-		namespaceMigrationCompleted: &atomic.Bool{},
-		signer:                      noopSigner,
-		metrics:                     NopMetrics(),
+		genesis:       genesis.Genesis{ProposerAddress: addr},
+		daHeight:      new(atomic.Uint64),
+		heightInCh:    make(chan daHeightEvent),
+		headerStore:   headerStore,
+		dataStore:     dataStore,
+		headerCache:   cache.NewCache[types.SignedHeader](),
+		dataCache:     cache.NewCache[types.Data](),
+		headerStoreCh: make(chan struct{}),
+		dataStoreCh:   make(chan struct{}),
+		retrieveCh:    make(chan struct{}),
+		logger:        logger,
+		lastStateMtx:  new(sync.RWMutex),
+		da:            mockDAClient,
+		signer:        noopSigner,
+		metrics:       NopMetrics(),
 	}
 	manager.daIncludedHeight.Store(0)
 	manager.daHeight.Store(initialDAHeight)

block/manager.go

@@ -44,9 +44,6 @@ const (
 	// defaultMempoolTTL is the number of blocks until transaction is dropped from mempool
 	defaultMempoolTTL = 25
 
-	// Key for storing namespace migration state in the store
-	namespaceMigrationKey = "namespace_migration_completed"
-
 	// Applies to the headerInCh and dataInCh, 10000 is a large enough number for headers per DA block.
 	eventInChLength = 10000
 )
@@ -154,10 +151,6 @@ type Manager struct {
 	// validatorHasherProvider is used to provide the validator hash for the header.
 	// It is used to set the validator hash in the header.
 	validatorHasherProvider types.ValidatorHasherProvider
-
-	// namespaceMigrationCompleted tracks whether we have completed the migration
-	// from legacy namespace to separate header/data namespaces
-	namespaceMigrationCompleted *atomic.Bool
 }
 
 // getInitialState tries to load lastState from Store, and if it's not available it reads genesis.
@@ -394,19 +387,13 @@ func NewManager(
 		aggregatorSignaturePayloadProvider: managerOpts.AggregatorNodeSignatureBytesProvider,
 		syncNodeSignaturePayloadProvider:   managerOpts.SyncNodeSignatureBytesProvider,
 		validatorHasherProvider:            managerOpts.ValidatorHasherProvider,
-		namespaceMigrationCompleted:        &atomic.Bool{},
 	}
 
 	// initialize da included height
 	if height, err := m.store.GetMetadata(ctx, storepkg.DAIncludedHeightKey); err == nil && len(height) == 8 {
 		m.daIncludedHeight.Store(binary.LittleEndian.Uint64(height))
 	}
 
-	// initialize namespace migration state
-	if migrationData, err := m.store.GetMetadata(ctx, namespaceMigrationKey); err == nil && len(migrationData) > 0 {
-		m.namespaceMigrationCompleted.Store(migrationData[0] == 1)
-	}
-
 	// Set the default publishBlock implementation
 	m.publishBlock = m.publishBlockInternal
 
@@ -428,24 +415,6 @@ func NewManager(
 	return m, nil
 }
 
-// setNamespaceMigrationCompleted marks the namespace migration as completed and persists it to disk
-func (m *Manager) setNamespaceMigrationCompleted(ctx context.Context) error {
-	m.namespaceMigrationCompleted.Store(true)
-	return m.store.SetMetadata(ctx, namespaceMigrationKey, []byte{1})
-}
-
-// loadNamespaceMigrationState loads the namespace migration state from persistent storage
-func (m *Manager) loadNamespaceMigrationState(ctx context.Context) (bool, error) {
-	migrationData, err := m.store.GetMetadata(ctx, namespaceMigrationKey)
-	if err != nil {
-		if errors.Is(err, ds.ErrNotFound) {
-			return false, nil // Migration not completed
-		}
-		return false, fmt.Errorf("failed to load migration state: %w", err)
-	}
-	return len(migrationData) > 0 && migrationData[0] == 1, nil
-}
-
 // PendingHeaders returns the pending headers.
 func (m *Manager) PendingHeaders() *PendingHeaders {
 	return m.pendingHeaders