feat: DA Client remove interface part 3, replace types with new code

.github/workflows/ci.yml

@@ -62,6 +62,7 @@ jobs:
     permissions:
       actions: read
       contents: read
+      packages: read
     uses: ./.github/workflows/test.yml
     secrets: inherit
 

.github/workflows/test.yml

@@ -35,6 +35,9 @@ jobs:
   unit_test:
     name: Run Unit Tests
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: read
     steps:
       - uses: actions/checkout@v6
       - name: set up go
@@ -70,6 +73,9 @@ jobs:
     name: Run E2E System Tests
     needs: build_all-apps
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: read
     steps:
       - uses: actions/checkout@v6
       - name: set up go

.mockery.yaml

@@ -2,15 +2,6 @@ template: testify
 template-data:
   unroll-variadic: true
 packages:
-  github.com/evstack/ev-node/core/da:
-    interfaces:
-      DA:
-        config:
-          pkgname: mocks
-          filename: da.go
-        configs:
-          - dir: ./da/internal/mocks
-          - dir: ./test/mocks
   github.com/evstack/ev-node/core/execution:
     interfaces:
       Executor:
@@ -67,11 +58,18 @@ packages:
           filename: broadcaster_mock.go
   github.com/evstack/ev-node/block/internal/da:
     interfaces:
-      BlobAPI:
+      Client:
         config:
-          dir: ./block/internal/da
-          pkgname: da
-          filename: blob_api_mock.go
+          dir: ./test/mocks
+          pkgname: mocks
+          filename: da.go
+  github.com/evstack/ev-node/pkg/da/types:
+    interfaces:
+      Verifier:
+        config:
+          dir: ./test/mocks
+          pkgname: mocks
+          filename: da_verifier.go
   github.com/evstack/ev-node/pkg/da/jsonrpc:
     interfaces:
       BlobModule:

CHANGELOG.md

@@ -27,6 +27,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 
 - **BREAKING:** Removed unused and confusing metrics from sequencers and block processing, including sequencer-specific metrics (gas price, blob size, transaction status, pending blocks), channel buffer metrics, overly granular error metrics, block production categorization metrics, and sync lag metrics. Essential metrics for DA submission health, block production, and performance monitoring are retained. [#2904](https://github.com/evstack/ev-node/pull/2904)
+- **BREAKING**: Removed `core/da` package and replaced DAClient with internal implementation. The DA client is exposed as `block.FullDAClient`, `block.DAClient`, `block.DAVerifier` without leaking implementation details. [#2910](https://github.com/evstack/ev-node/pull/2910)
+
+## v1.0.0-beta.11
+
+### Improvements
+
+- Loosen syncer validation for allowing swapping sequencer and full node state [#2925](https://github.com/evstack/ev-node/pull/2925)
 
 ## v1.0.0-beta.10
 

CLAUDE.md

@@ -52,7 +52,7 @@ The project uses a zero-dependency core package pattern:
 
 - **Executor** (core/executor.go) - Handles state transitions
 - **Sequencer** (core/sequencer.go) - Orders transactions
-- **DA** (core/da.go) - Data availability layer abstraction
+- **DA** (pkg/da/types) - Data availability layer abstraction
 
 ### Modular Design
 
@@ -120,7 +120,7 @@ go test -race ./package/...
 
 ### Adding a New DA Layer
 
-1. Implement the `DA` interface from `core/da.go`
+1. Implement the `DA` interface from `pkg/da/types`
 2. Add configuration in the appropriate config package
 3. Wire it up in the initialization code
 4. Add tests following existing patterns

RELEASE.md

@@ -97,7 +97,6 @@ Packages must be released in the following order:
 
 These packages only depend on `core` and can be released in parallel after `core`:
 
-1. **github.com/evstack/ev-node/da** - Path: `./da`
 2. **github.com/evstack/ev-node** - Path: `./` (root)
 3. **github.com/evstack/ev-node/execution/evm** - Path: `./execution/evm`
 
@@ -157,7 +156,6 @@ git tag execution/evm/v0.3.0
 git push origin execution/evm/v0.3.0
 
 # Verify all are available
-go list -m github.com/evstack/ev-node/[email protected]
 go list -m github.com/evstack/[email protected]
 go list -m github.com/evstack/ev-node/execution/[email protected]
 ```
@@ -170,7 +168,6 @@ After all dependencies are available:
 
 # Update and release apps/evm
 go get github.com/evstack/ev-node/[email protected]
-go get github.com/evstack/ev-node/[email protected]
 go get github.com/evstack/ev-node/execution/[email protected]
 go get github.com/evstack/[email protected]
 go mod tidy

apps/evm/README.md

@@ -11,7 +11,7 @@ This directory contains the implementation of a single EVM sequencer using Ev-no
 
 1. Both EVM and DA layers must be running before starting the sequencer
    1. For the EVM layer, Reth can be conveniently run using `docker compose` from <path_to>/execution/evm/docker.
-   2. For the DA layer, local-da can be built and run from the `ev-node/da/cmd/local-da` directory.
+   2. For the DA layer, local-da can be built and run from the `ev-node/tools/local-da` directory.
 
 2. Build the sequencer:
 

apps/evm/cmd/post_tx_cmd.go

@@ -11,12 +11,11 @@ import (
 	"github.com/spf13/cobra"
 
 	evblock "github.com/evstack/ev-node/block"
-	"github.com/evstack/ev-node/core/da"
-	"github.com/evstack/ev-node/da/jsonrpc"
 	rollcmd "github.com/evstack/ev-node/pkg/cmd"
 	rollconf "github.com/evstack/ev-node/pkg/config"
+	blobrpc "github.com/evstack/ev-node/pkg/da/jsonrpc"
+	da "github.com/evstack/ev-node/pkg/da/types"
 	genesispkg "github.com/evstack/ev-node/pkg/genesis"
-	seqcommon "github.com/evstack/ev-node/sequencers/common"
 	"github.com/evstack/ev-node/types"
 )
 
@@ -117,12 +116,11 @@ func postTxRunE(cmd *cobra.Command, args []string) error {
 
 	logger.Info().Str("namespace", namespace).Float64("gas_price", gasPrice).Int("tx_size", len(txData)).Msg("posting transaction to DA layer")
 
-	daClient, err := jsonrpc.NewClient(
+	daClient, err := blobrpc.NewClient(
 		cmd.Context(),
-		logger,
 		nodeConfig.DA.Address,
 		nodeConfig.DA.AuthToken,
-		seqcommon.AbsoluteMaxBlobSize,
+		"",
 	)
 	if err != nil {
 		return fmt.Errorf("failed to create DA client: %w", err)
@@ -134,7 +132,7 @@ func postTxRunE(cmd *cobra.Command, args []string) error {
 	blobs := [][]byte{txData}
 	options := []byte(nodeConfig.DA.SubmitOptions)
 
-	dac := evblock.NewDAClient(&daClient.DA, nodeConfig, logger)
+	dac := evblock.NewDAClient(daClient, nodeConfig, logger)
 	result := dac.Submit(cmd.Context(), blobs, gasPrice, namespaceBz, options)
 
 	// Check result

apps/evm/cmd/run.go

@@ -14,21 +14,20 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/evstack/ev-node/block"
-	"github.com/evstack/ev-node/core/da"
 	"github.com/evstack/ev-node/core/execution"
 	coresequencer "github.com/evstack/ev-node/core/sequencer"
-	"github.com/evstack/ev-node/da/jsonrpc"
 	"github.com/evstack/ev-node/execution/evm"
 	"github.com/evstack/ev-node/node"
 	rollcmd "github.com/evstack/ev-node/pkg/cmd"
 	"github.com/evstack/ev-node/pkg/config"
+	blobrpc "github.com/evstack/ev-node/pkg/da/jsonrpc"
+	da "github.com/evstack/ev-node/pkg/da/types"
 	"github.com/evstack/ev-node/pkg/genesis"
 	genesispkg "github.com/evstack/ev-node/pkg/genesis"
 	"github.com/evstack/ev-node/pkg/p2p"
 	"github.com/evstack/ev-node/pkg/p2p/key"
 	"github.com/evstack/ev-node/pkg/store"
 	"github.com/evstack/ev-node/sequencers/based"
-	seqcommon "github.com/evstack/ev-node/sequencers/common"
 	"github.com/evstack/ev-node/sequencers/single"
 
 	"github.com/evstack/ev-node/apps/evm/server"
@@ -56,6 +55,13 @@ var RunCmd = &cobra.Command{
 
 		logger := rollcmd.SetupLogger(nodeConfig.Log)
 
+		blobClient, err := blobrpc.NewClient(context.Background(), nodeConfig.DA.Address, nodeConfig.DA.AuthToken, "")
+		if err != nil {
+			return fmt.Errorf("failed to create blob client: %w", err)
+		}
+
+		daClient := block.NewDAClient(blobClient, nodeConfig, logger)
+
 		// Attach logger to the EVM engine client if available
 		if ec, ok := executor.(*evm.EngineClient); ok {
 			ec.SetLogger(logger.With().Str("module", "engine_client").Logger())
@@ -66,11 +72,6 @@ var RunCmd = &cobra.Command{
 
 		logger.Info().Str("headerNamespace", headerNamespace.HexString()).Str("dataNamespace", dataNamespace.HexString()).Msg("namespaces")
 
-		daJrpc, err := jsonrpc.NewClient(context.Background(), logger, nodeConfig.DA.Address, nodeConfig.DA.AuthToken, seqcommon.AbsoluteMaxBlobSize)
-		if err != nil {
-			return err
-		}
-
 		datastore, err := store.NewDefaultKVStore(nodeConfig.RootDir, nodeConfig.DBPath, evmDbName)
 		if err != nil {
 			return err
@@ -87,7 +88,7 @@ var RunCmd = &cobra.Command{
 		}
 
 		// Create sequencer based on configuration
-		sequencer, err := createSequencer(context.Background(), logger, datastore, &daJrpc.DA, nodeConfig, genesis)
+		sequencer, err := createSequencer(context.Background(), logger, datastore, nodeConfig, genesis, daClient)
 		if err != nil {
 			return err
 		}
@@ -116,7 +117,7 @@ var RunCmd = &cobra.Command{
 
 			forceInclusionServer, err := server.NewForceInclusionServer(
 				forceInclusionAddr,
-				&daJrpc.DA,
+				daClient,
 				nodeConfig,
 				genesis,
 				logger,
@@ -140,7 +141,7 @@ var RunCmd = &cobra.Command{
 			}()
 		}
 
-		return rollcmd.StartNode(logger, cmd, executor, sequencer, &daJrpc.DA, p2pClient, datastore, nodeConfig, genesis, node.NodeOptions{})
+		return rollcmd.StartNode(logger, cmd, executor, sequencer, p2pClient, datastore, nodeConfig, genesis, node.NodeOptions{})
 	},
 }
 
@@ -156,11 +157,10 @@ func createSequencer(
 	ctx context.Context,
 	logger zerolog.Logger,
 	datastore datastore.Batching,
-	da da.DA,
 	nodeConfig config.Config,
 	genesis genesis.Genesis,
+	daClient block.FullDAClient,
 ) (coresequencer.Sequencer, error) {
-	daClient := block.NewDAClient(da, nodeConfig, logger)
 	fiRetriever := block.NewForcedInclusionRetriever(daClient, genesis, logger)
 
 	if nodeConfig.Node.BasedSequencer {
@@ -186,7 +186,7 @@ func createSequencer(
 		ctx,
 		logger,
 		datastore,
-		da,
+		daClient,
 		[]byte(genesis.ChainID),
 		nodeConfig.Node.BlockTime.Duration,
 		nodeConfig.Node.Aggregator,

apps/evm/go.mod

@@ -7,7 +7,6 @@ replace github.com/celestiaorg/go-header => github.com/julienrbrt/go-header v0.0
 replace (
 	github.com/evstack/ev-node => ../../
 	github.com/evstack/ev-node/core => ../../core
-	github.com/evstack/ev-node/da => ../../da
 	github.com/evstack/ev-node/execution/evm => ../../execution/evm
 )
 
@@ -16,7 +15,6 @@ require (
 	github.com/ethereum/go-ethereum v1.16.7
 	github.com/evstack/ev-node v1.0.0-beta.10
 	github.com/evstack/ev-node/core v1.0.0-beta.5
-	github.com/evstack/ev-node/da v0.0.0-00010101000000-000000000000
 	github.com/evstack/ev-node/execution/evm v1.0.0-beta.3
 	github.com/ipfs/go-datastore v0.9.0
 	github.com/rs/zerolog v1.34.0

apps/evm/server/force_inclusion.go

@@ -2,7 +2,6 @@ package server
 
 import (
 	"context"
-	"encoding/binary"
 	"encoding/hex"
 	"encoding/json"
 	"errors"
@@ -15,8 +14,9 @@ import (
 
 	"github.com/rs/zerolog"
 
-	"github.com/evstack/ev-node/core/da"
+	"github.com/evstack/ev-node/block"
 	"github.com/evstack/ev-node/pkg/config"
+	da "github.com/evstack/ev-node/pkg/da/types"
 	"github.com/evstack/ev-node/pkg/genesis"
 	"github.com/evstack/ev-node/types"
 )
@@ -31,7 +31,7 @@ const (
 // that accepts transactions and submits them directly to the DA layer for force inclusion
 type ForceInclusionServer struct {
 	server          *http.Server
-	daClient        da.DA
+	daClient        block.DAClient
 	config          config.Config
 	genesis         genesis.Genesis
 	logger          zerolog.Logger
@@ -43,7 +43,7 @@ type ForceInclusionServer struct {
 // NewForceInclusionServer creates a new force inclusion server
 func NewForceInclusionServer(
 	addr string,
-	daClient da.DA,
+	daClient block.DAClient,
 	cfg config.Config,
 	gen genesis.Genesis,
 	logger zerolog.Logger,
@@ -259,24 +259,17 @@ func (s *ForceInclusionServer) handleSendRawTransaction(w http.ResponseWriter, r
 	options := []byte(s.config.DA.SubmitOptions)
 	gasPrice := -1.0 // auto gas price
 
-	ids, err := s.daClient.SubmitWithOptions(ctx, blobs, gasPrice, s.namespace, options)
-	if err != nil {
-		s.writeError(w, req.ID, InternalError, fmt.Sprintf("failed to submit to DA: %v", err))
-		return
-	}
-
-	if len(ids) == 0 {
-		s.writeError(w, req.ID, InternalError, "no DA IDs returned")
+	result := s.daClient.Submit(ctx, blobs, gasPrice, s.namespace, options)
+	if result.Code != da.StatusSuccess {
+		s.writeError(w, req.ID, InternalError, fmt.Sprintf("failed to submit to DA: %s", result.Message))
 		return
 	}
 
-	// Extract height from the first ID
-	// IDs are structured with height in the first 8 bytes (little-endian uint64)
-	if len(ids[0]) < 8 {
-		s.writeError(w, req.ID, InternalError, "invalid DA ID format")
+	daHeight := result.Height
+	if daHeight == 0 {
+		s.writeError(w, req.ID, InternalError, "invalid DA height returned")
 		return
 	}
-	daHeight := binary.LittleEndian.Uint64(ids[0][:8])
 
 	s.logger.Info().
 		Uint64("da_height", daHeight).