Merge pull request #8 from DeBankDeFi/merge_upstream

Merge upstream v0.5.3

Author: cifer76

.github/workflows/release.yml

@@ -28,17 +28,14 @@ jobs:
       - name: Set env
         run: |
           echo "REVISION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-
       - name: Docker build and push
         run: |
           docker build --no-cache -t 294354037686.dkr.ecr.ap-northeast-1.amazonaws.com/nitro-das-celestia:${{ matrix.arch }}-${REVISION} -f Dockerfile .
           docker push 294354037686.dkr.ecr.ap-northeast-1.amazonaws.com/nitro-das-celestia:${{ matrix.arch }}-${REVISION}
-
       - name: Lark Notification
         continue-on-error: true
         run: |
           notiv3 "Blockchain nitro image pushed 🎉" 294354037686.dkr.ecr.ap-northeast-1.amazonaws.com/nitro-das-celestia:${{ matrix.arch }}-${REVISION}
-
   merge-docker-manifest:
     runs-on: [self-hosted, ops]
     needs: build-artifacts
@@ -51,7 +48,6 @@ jobs:
       - name: Set env
         run: |
           echo "REVISION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-
       - name: Merge manifest
         run: |
           docker pull --platform=linux/amd64 294354037686.dkr.ecr.ap-northeast-1.amazonaws.com/nitro-das-celestia:amd64-${REVISION}

Dockerfile

@@ -4,7 +4,7 @@
 #
 # Separating the builder and runtime image allows the runtime image to be
 # considerably smaller because it doesn't need to have Golang installed.
-ARG BUILDER_IMAGE=docker.io/golang:1.23.6-alpine
+ARG BUILDER_IMAGE=docker.io/golang:1.24.6-alpine
 ARG RUNTIME_IMAGE=docker.io/alpine:3.19.1
 ARG TARGETOS
 ARG TARGETARCH

cmd/celestiadaserver.go

@@ -54,7 +54,7 @@ var DefaultCelestiaDAServerConfig = CelestiaDAServerConfig{
 	RPCPort:            9876,
 	RPCServerTimeouts:  genericconf.HTTPServerTimeoutConfigDefault,
 	RPCServerBodyLimit: genericconf.HTTPServerBodyLimitDefault,
-	FallbackEnabled:    true,
+	FallbackEnabled:    false,
 	LogLevel:           "INFO",
 	LogType:            "plaintext",
 	Metrics:            false,

daserver/celestia.go

@@ -12,8 +12,9 @@ import (
 	"sync"
 	"time"
 
-	node "github.com/celestiaorg/celestia-node/api/rpc/client"
+	txclient "github.com/celestiaorg/celestia-node/api/client"
 	"github.com/celestiaorg/celestia-node/blob"
+	"github.com/celestiaorg/celestia-node/nodebuilder/p2p"
 	"github.com/celestiaorg/celestia-node/state"
 	libshare "github.com/celestiaorg/go-square/v2/share"
 	"github.com/celestiaorg/nitro-das-celestia/celestiagen"
@@ -38,7 +39,15 @@ type DAConfig struct {
 	NamespaceId        string          `koanf:"namespace-id" `
 	AuthToken          string          `koanf:"auth-token" reload:"hot"`
 	ReadAuthToken      string          `koanf:"read-auth-token" reload:"hot"`
+	CoreToken          string          `koanf:"core-token" reload:"hot"`
+	CoreURL            string          `koanf:"core-url" reload:"hot"`
+	CoreNetwork        string          `koanf:"core-network" reload:"hot"`
+	KeyName            string          `koanf:"key-name" reload:"hot"`
+	KeyPath            string          `koanf:"key-path" reload:"hot"`
+	BackendName        string          `koanf:"backend-name" reload:"hot"`
 	NoopWriter         bool            `koanf:"noop-writer" reload:"hot"`
+	EnableDATLS        bool            `koanf:"enable-da-tls" reload:"hot"`
+	EnableCoreTLS      bool            `koanf:"enable-core-tls" reload:"hot"`
 	ValidatorConfig    ValidatorConfig `koanf:"validator-config" reload:"hot"`
 	ReorgOnReadFailure bool            `koanf:"dangerous-reorg-on-read-failure"`
 	CacheCleanupTime   time.Duration   `koanf:"cache-time"`
@@ -87,8 +96,8 @@ func IsCelestiaMessageHeaderByte(header byte) bool {
 
 type CelestiaDA struct {
 	Cfg        *DAConfig
-	Client     *node.Client
-	ReadClient *node.Client
+	Client     *txclient.Client
+	ReadClient *txclient.Client
 
 	Namespace *libshare.Namespace
 
@@ -104,6 +113,14 @@ func CelestiaDAConfigAddOptions(prefix string, f *pflag.FlagSet) {
 	f.String(prefix+".namespace-id", "", "Celestia Namespace to post data to")
 	f.String(prefix+".auth-token", "", "Auth token for Celestia Node")
 	f.String(prefix+".read-auth-token", "", "Auth token for Celestia Node")
+	f.String(prefix+".core-token", "", "Auth token for Core Celestia Node Endpoint")
+	f.String(prefix+".core-url", "", "URL to Celestia Core endpoint")
+	f.String(prefix+".core-network", "celestia", "Celestia Network to use")
+	f.String(prefix+".key-name", "my_key", "key name to use")
+	f.String(prefix+".key-path", "./keys", "key path to use")
+	f.String(prefix+".backend-name", "test", "keyring backend to use")
+	f.Bool(prefix+".enable-da-tls", false, "enable TLS for DA node")
+	f.Bool(prefix+".enable-core-tls", false, "enable TLS for Core node")
 	f.Bool(prefix+".noop-writer", false, "Noop writer (disable posting to celestia)")
 	f.String(prefix+".validator-config"+".eth-rpc", "", "Parent chain connection, only used for validation")
 	f.String(prefix+".validator-config"+".blobstream", "", "Blobstream address, only used for validation")
@@ -116,21 +133,62 @@ func NewCelestiaDA(cfg *DAConfig) (*CelestiaDA, error) {
 	if cfg == nil {
 		return nil, errors.New("celestia cfg cannot be blank")
 	}
-	daClient, err := node.NewClient(context.Background(), cfg.Rpc, cfg.AuthToken)
+
+	// Create a keyring
+	_, err := txclient.KeyringWithNewKey(txclient.KeyringConfig{
+		KeyName:     cfg.KeyName,
+		BackendName: cfg.BackendName,
+	}, cfg.KeyPath)
 	if err != nil {
 		return nil, err
 	}
 
-	var readClient *node.Client
-	if cfg.ReadRpc != "" && cfg.ReadAuthToken != "" {
-		readClient, err = node.NewClient(context.Background(), cfg.ReadRpc, cfg.ReadAuthToken)
-		if err != nil {
-			return nil, err
-		}
-	} else {
-		readClient = daClient
+	// Configure the client
+	clientCfg := txclient.Config{
+		ReadConfig: txclient.ReadConfig{
+			BridgeDAAddr: cfg.Rpc,
+			DAAuthToken:  cfg.AuthToken,
+			EnableDATLS:  cfg.EnableDATLS,
+		},
+		SubmitConfig: txclient.SubmitConfig{
+			DefaultKeyName: cfg.KeyName,
+			Network:        p2p.Network(cfg.CoreNetwork),
+			CoreGRPCConfig: txclient.CoreGRPCConfig{
+				Addr:       cfg.CoreURL,
+				TLSEnabled: cfg.EnableCoreTLS,
+				AuthToken:  cfg.CoreToken,
+			},
+		},
 	}
 
+	readClient, err := txclient.NewReadClient(context.Background(), clientCfg.ReadConfig)
+	if err != nil {
+		log.Error("DEBUG: Failed to create celestia client", "err", err, "BridgeDAAddr", clientCfg.ReadConfig.BridgeDAAddr, "CoreAddr", clientCfg.SubmitConfig.CoreGRPCConfig.Addr)
+		return nil, err
+	}
+
+	celestiaClient := &txclient.Client{
+		ReadClient: *readClient,
+	}
+	// if cfg.ReadRpc != "" && cfg.ReadAuthToken != "" {
+	// 	log.Info("DEBUG: Configuring read client", "cfg.ReadRpc", cfg.ReadRpc)
+	// 	readClientCfg := txclient.Config{
+	// 		ReadConfig: txclient.ReadConfig{
+	// 			BridgeDAAddr: cfg.ReadRpc,
+	// 			DAAuthToken:  cfg.ReadAuthToken,
+	// 			EnableDATLS:  cfg.EnableDATLS,
+	// 		},
+	// 	}
+	// 	log.Info("DEBUG: About to create read client", "ReadBridgeDAAddr", readClientCfg.ReadConfig.BridgeDAAddr)
+	// 	readClient, err = txclient.New(context.Background(), readClientCfg, kr)
+	// 	if err != nil {
+	// 		log.Error("DEBUG: Failed to create read client", "err", err, "ReadBridgeDAAddr", readClientCfg.ReadConfig.BridgeDAAddr)
+	// 		return nil, err
+	// 	}
+	// } else {
+	// 	readClient = celestiaClient
+	// }
+
 	if cfg.NamespaceId == "" {
 		return nil, errors.New("namespace id cannot be blank")
 	}
@@ -146,8 +204,8 @@ func NewCelestiaDA(cfg *DAConfig) (*CelestiaDA, error) {
 
 	da := &CelestiaDA{
 		Cfg:        cfg,
-		Client:     daClient,
-		ReadClient: readClient,
+		Client:     celestiaClient,
+		ReadClient: celestiaClient,
 		Namespace:  &namespace,
 	}
 

daserver/proof.go

@@ -4,7 +4,7 @@ import (
 	"math/big"
 
 	"github.com/celestiaorg/celestia-node/nodebuilder/blobstream"
-	"github.com/tendermint/tendermint/crypto/merkle"
+	"github.com/cometbft/cometbft/crypto/merkle"
 )
 
 type Namespace struct {