fix: fixed namespaceID parsing from toml

da/celestia/celestia.go

@@ -21,12 +21,6 @@ import (
 	pb "github.com/dymensionxyz/dymint/types/pb/dymint"
 )
 
-const (
-	defaultTxPollingRetryDelay = 20 * time.Second
-	defaultSubmitRetryDelay    = 10 * time.Second
-	defaultTxPollingAttempts   = 5
-)
-
 type CNCClientI interface {
 	SubmitPFD(ctx context.Context, namespaceID [8]byte, blob []byte, fee int64, gasLimit uint64) (*cnc.TxResponse, error)
 	NamespacedShares(ctx context.Context, namespaceID [8]byte, height uint64) ([][]byte, error)
@@ -50,16 +44,6 @@ type DataAvailabilityLayerClient struct {
 var _ da.DataAvailabilityLayerClient = &DataAvailabilityLayerClient{}
 var _ da.BatchRetriever = &DataAvailabilityLayerClient{}
 
-// Config stores Celestia DALC configuration parameters.
-type Config struct {
-	BaseURL     string        `json:"base_url"`
-	AppNodeURL  string        `json:"app_node_url"`
-	Timeout     time.Duration `json:"timeout"`
-	Fee         int64         `json:"fee"`
-	GasLimit    uint64        `json:"gas_limit"`
-	NamespaceID [8]byte       `json:"namespace_id"`
-}
-
 // WithCNCClient sets CNC client.
 func WithCNCClient(client CNCClientI) da.Option {
 	return func(daLayerClient da.DataAvailabilityLayerClient) {
@@ -99,16 +83,16 @@ func WithSubmitRetryDelay(delay time.Duration) da.Option {
 func (c *DataAvailabilityLayerClient) Init(config []byte, pubsubServer *pubsub.Server, kvStore store.KVStore, logger log.Logger, options ...da.Option) error {
 	c.logger = logger
 
-	if len(config) > 0 {
-		err := json.Unmarshal(config, &c.config)
-		if err != nil {
-			return err
-		}
+	if len(config) <= 0 {
+		return errors.New("config is empty")
+	}
+	err := json.Unmarshal(config, &c.config)
+	if err != nil {
+		return err
 	}
 
 	c.pubsubServer = pubsubServer
 	// Set defaults
-	var err error
 	c.txPollingRetryDelay = defaultTxPollingRetryDelay
 	c.txPollingAttempts = defaultTxPollingAttempts
 	c.submitRetryDelay = defaultSubmitRetryDelay

da/celestia/config.go

@@ -0,0 +1,68 @@
+package celestia
+
+import (
+	"encoding/hex"
+	"encoding/json"
+	"time"
+)
+
+const (
+	defaultTxPollingRetryDelay = 20 * time.Second
+	defaultSubmitRetryDelay    = 10 * time.Second
+	defaultTxPollingAttempts   = 5
+)
+
+// Config stores Celestia DALC configuration parameters.
+type Config struct {
+	BaseURL     string        `json:"base_url"`
+	AppNodeURL  string        `json:"app_node_url"`
+	Timeout     time.Duration `json:"timeout"`
+	Fee         int64         `json:"fee"`
+	GasLimit    uint64        `json:"gas_limit"`
+	NamespaceID [8]byte       //`json:"namespace_id"`
+}
+
+// Define an auxiliary type to prevent infinite recursion in UnmarshalJSON
+type auxConfig struct {
+	BaseURL     string        `json:"base_url"`
+	AppNodeURL  string        `json:"app_node_url"`
+	Timeout     time.Duration `json:"timeout"`
+	Fee         int64         `json:"fee"`
+	GasLimit    uint64        `json:"gas_limit"`
+	NamespaceID string        `json:"namespace_id"` // In the auxiliary type, NamespaceID is a string
+}
+
+var CelestiaDefaultConfig = Config{
+	BaseURL:     "http://127.0.0.1:26659",
+	AppNodeURL:  "",
+	Timeout:     30 * time.Second,
+	Fee:         20000,
+	GasLimit:    20000000,
+	NamespaceID: [8]byte{0, 0, 0, 0, 0, 0, 255, 255},
+}
+
+// UnmarshalJSON on Config type
+func (c *Config) UnmarshalJSON(data []byte) error {
+	var aux auxConfig
+	if err := json.Unmarshal(data, &aux); err != nil {
+		return err
+	}
+
+	// Decode NamespaceID from string to byte array
+	namespaceBytes, err := hex.DecodeString(aux.NamespaceID)
+	if err != nil {
+		return err
+	}
+
+	// Copy the decoded bytes into NamespaceID
+	copy(c.NamespaceID[:], namespaceBytes)
+
+	// Copy other fields
+	c.BaseURL = aux.BaseURL
+	c.AppNodeURL = aux.AppNodeURL
+	c.Timeout = aux.Timeout
+	c.Fee = aux.Fee
+	c.GasLimit = aux.GasLimit
+
+	return nil
+}

da/da_test.go

@@ -37,16 +37,26 @@ func TestLifecycle(t *testing.T) {
 			t.Skip("TODO")
 		}
 		t.Run(dalc, func(t *testing.T) {
-			doTestLifecycle(t, registry.GetClient(dalc))
+			doTestLifecycle(t, dalc)
 		})
 	}
 }
 
-func doTestLifecycle(t *testing.T, dalc da.DataAvailabilityLayerClient) {
+func doTestLifecycle(t *testing.T, daType string) {
+	var err error
 	require := require.New(t)
 	pubsubServer := pubsub.NewServer()
 	pubsubServer.Start()
-	err := dalc.Init([]byte{}, pubsubServer, nil, test.NewLogger(t))
+
+	dacfg := []byte{}
+	dalc := registry.GetClient(daType)
+
+	if daType == "celestia" {
+		dacfg, err = json.Marshal(celestia.CelestiaDefaultConfig)
+		require.NoError(err)
+	}
+
+	err = dalc.Init(dacfg, pubsubServer, nil, test.NewLogger(t))
 	require.NoError(err)
 
 	err = dalc.Start()