feat(pkg/da): support celestia-app

.mockery.yaml

@@ -76,21 +76,16 @@ packages:
           dir: ./test/mocks
           pkgname: mocks
           filename: da.go
-      Verifier:
-        config:
-          dir: ./test/mocks
-          pkgname: mocks
-          filename: da.go
-  github.com/evstack/ev-node/pkg/da/jsonrpc:
+  github.com/evstack/ev-node/pkg/da/node:
     interfaces:
       BlobModule:
         config:
-          dir: ./pkg/da/jsonrpc/mocks
+          dir: ./pkg/da/node/mocks
           pkgname: mocks
           filename: blob_module_mock.go
       HeaderModule:
         config:
-          dir: ./pkg/da/jsonrpc/mocks
+          dir: ./pkg/da/node/mocks
           pkgname: mocks
           filename: header_module_mock.go
   github.com/evstack/ev-node/block:

CHANGELOG.md

@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- Support fetching from Celestia App instead of only Celestia Node. [#3095](https://github.com/evstack/ev-node/pull/3095)
 - Node pruning support. [#2984](https://github.com/evstack/ev-node/pull/2984)
   - Two different sort of pruning implemented:
     _Classic pruning_ (`all`): prunes given `HEAD-n` blocks from the databases, including store metadatas.

apps/evm/cmd/post_tx_cmd.go

@@ -13,7 +13,7 @@ import (
 	evblock "github.com/evstack/ev-node/block"
 	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"
+	"github.com/evstack/ev-node/pkg/da/node"
 	da "github.com/evstack/ev-node/pkg/da/types"
 	genesispkg "github.com/evstack/ev-node/pkg/genesis"
 	"github.com/evstack/ev-node/types"
@@ -116,7 +116,7 @@ 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 := blobrpc.NewClient(
+	daClient, err := node.NewClient(
 		cmd.Context(),
 		nodeConfig.DA.Address,
 		nodeConfig.DA.AuthToken,

apps/evm/cmd/run.go

@@ -21,7 +21,7 @@ import (
 	"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"
+	"github.com/evstack/ev-node/pkg/da/factory"
 	da "github.com/evstack/ev-node/pkg/da/types"
 	"github.com/evstack/ev-node/pkg/genesis"
 	genesispkg "github.com/evstack/ev-node/pkg/genesis"
@@ -60,7 +60,12 @@ var RunCmd = &cobra.Command{
 			return err
 		}
 
-		blobClient, err := blobrpc.NewClient(context.Background(), nodeConfig.DA.Address, nodeConfig.DA.AuthToken, "")
+		blobClient, err := factory.NewClient(context.Background(), factory.Config{
+			Address:      nodeConfig.DA.Address,
+			AuthToken:    nodeConfig.DA.AuthToken,
+			Logger:       logger,
+			IsAggregator: nodeConfig.Node.Aggregator,
+		})
 		if err != nil {
 			return fmt.Errorf("failed to create blob client: %w", err)
 		}
@@ -148,7 +153,7 @@ func createSequencer(
 	datastore datastore.Batching,
 	nodeConfig config.Config,
 	genesis genesis.Genesis,
-	daClient block.FullDAClient,
+	daClient block.DAClient,
 	executor execution.Executor,
 ) (coresequencer.Sequencer, error) {
 	if nodeConfig.Node.BasedSequencer {

apps/evm/server/force_inclusion_test.go

@@ -73,6 +73,10 @@ func (m *mockDA) HasForcedInclusionNamespace() bool {
 	return true
 }
 
+func (m *mockDA) GetLatestDAHeight(ctx context.Context) (uint64, error) {
+	return 0, nil
+}
+
 func TestForceInclusionServer_handleSendRawTransaction_Success(t *testing.T) {
 	testHeight := uint64(100)
 

apps/grpc/cmd/run.go

@@ -16,7 +16,7 @@ import (
 	"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"
+	"github.com/evstack/ev-node/pkg/da/factory"
 	da "github.com/evstack/ev-node/pkg/da/types"
 	"github.com/evstack/ev-node/pkg/genesis"
 	rollgenesis "github.com/evstack/ev-node/pkg/genesis"
@@ -108,7 +108,12 @@ func createSequencer(
 	genesis genesis.Genesis,
 	executor execution.Executor,
 ) (coresequencer.Sequencer, error) {
-	blobClient, err := blobrpc.NewClient(ctx, nodeConfig.DA.Address, nodeConfig.DA.AuthToken, "")
+	blobClient, err := factory.NewClient(ctx, factory.Config{
+		Address:      nodeConfig.DA.Address,
+		AuthToken:    nodeConfig.DA.AuthToken,
+		Logger:       logger,
+		IsAggregator: nodeConfig.Node.Aggregator,
+	})
 	if err != nil {
 		return nil, fmt.Errorf("failed to create blob client: %w", err)
 	}

apps/testapp/cmd/run.go

@@ -16,7 +16,7 @@ import (
 	"github.com/evstack/ev-node/node"
 	"github.com/evstack/ev-node/pkg/cmd"
 	"github.com/evstack/ev-node/pkg/config"
-	blobrpc "github.com/evstack/ev-node/pkg/da/jsonrpc"
+	"github.com/evstack/ev-node/pkg/da/factory"
 	da "github.com/evstack/ev-node/pkg/da/types"
 	"github.com/evstack/ev-node/pkg/genesis"
 	"github.com/evstack/ev-node/pkg/p2p/key"
@@ -111,7 +111,12 @@ func createSequencer(
 	genesis genesis.Genesis,
 	executor execution.Executor,
 ) (coresequencer.Sequencer, error) {
-	blobClient, err := blobrpc.NewClient(ctx, nodeConfig.DA.Address, nodeConfig.DA.AuthToken, "")
+	blobClient, err := factory.NewClient(ctx, factory.Config{
+		Address:      nodeConfig.DA.Address,
+		AuthToken:    nodeConfig.DA.AuthToken,
+		Logger:       logger,
+		IsAggregator: nodeConfig.Node.Aggregator,
+	})
 	if err != nil {
 		return nil, fmt.Errorf("failed to create blob client: %w", err)
 	}