merge v0.5.2 (#6)

* Update README.md

* Update README.md

* Update README.md

* add docker examples

* add "daprovider" name to rpc server

* Add methods and response types for daclient api

* add fallback to das with daprovider

* update deps and fix fallback preimages

---------

Co-authored-by: Diego <31937514+Ferret-san@users.noreply.github.com>
Co-authored-by: Diego <diego@celestia.org>
Co-authored-by: chendechen <dechen.chen@debank.com>

Author: 3 people

README.md

@@ -8,7 +8,7 @@ A data availability server for the Arbitrum Nitro stack, leveraging Celestia DA
 
 ## Docker
 
-`FROM ghcr.io/celestiaorg/nitro-das-celestia:v0.4.2`
+`FROM ghcr.io/celestiaorg/nitro-das-celestia:v0.4.3`
 
 
 ## Example usage
@@ -23,6 +23,21 @@ A data availability server for the Arbitrum Nitro stack, leveraging Celestia DA
       --celestia.rpc $CELESTIA_NODE_ENDPOINT 
 ```
 
+## Running Docker Image
+
+```
+docker run --name celestia-server \
+      -p 26657:26657 \
+      -e AUTH_TOKEN=your_token  \
+      -e NAMESPACEID=your_namespace  \
+      -e CELESTIA_NODE_ENDPOINT=your_node_endpoint \
+      ghcr.io/celestiaorg/nitro-das-celestia:v0.4.3
+```
+
+## Example Docker Compose
+
+For an example on how to use the images in conjunction with other containers, check the [docker-compose.yaml](https://github.com/celestiaorg/nitro-das-celestia/blob/main/docker-compose.yaml) in this repository for an example
+
 ## Flags
 
 ```
@@ -61,6 +76,31 @@ Usage of daserver:
       --rpc-server-timeouts.write-timeout duration         the maximum duration before timing out writes of the response (http.Server.WriteTimeout) (default 30s)
 ```
 
+## Running a da server for an Orbit x Celestia chain
+
+Before proceeding, it is highly encouraged to familiarize yourself with [Celestia](https://docs.celestia.org/) and more specifically with [DA Nodes](https://docs.celestia.org/how-to-guides/light-node) (light, full, bridge)
+
+## Running a Batch Poster
+
+If you are running a celestia-sever for a batch poster node, you need to take the following into account:
+
+- if you don't provide a `gas-price` and a `gas-multipler`, you will be automatically opting for gas estimation from your celestia-node
+- you should run this on the same machine as your nitro batch poster node
+- you WILL NOT be able to use a hosted provider for your celestia-node endpoint. You will have to run your own celestia-node in order to post data to Celestia
+- you can get the `auth token` for your node like [this](https://docs.celestia.org/how-to-guides/quick-start#get-your-auth-token)
+- you will need to pick a [namespace](https://docs.celestia.org/tutorials/node-tutorial#namespaces) were to write data to and make sure to use this in other nodes and share with node runners.
+
+## Running a Full Node
+
+If you are running a celestia-server as part of a full node setup for an orbit x celestia da chain, note the folloing:
+
+- you don't need to provide a `gas-price` or a `gas-multiplier`, since the node won't be submitting data to celestia
+- you should run this on the same machine as your nitro full node or block the `store` endpoint if you are not running a batch poster
+- you only need a namespace to use when fetching data from Celestia (the rollup should make this clear and accesible to you), and a celestia-node endpoint (core / consensus endpoints won't work!). If you do not wish to run your own celestia light node, or da bridge node, you can get a hosted endpoint from providers like:
+  - [Quicknode](https://www.quicknode.com/docs/celestia)
+
+
+
 ## Running a Validator
 >[!CAUTION]
 > The celestia server binary won't throw an error if you forget to set the validator config, if you are running validators for your chain, please read carefully

cmd/celestiadaserver.go

@@ -12,15 +12,18 @@ import (
 
 	flag "github.com/spf13/pflag"
 
-	"github.com/ethereum/go-ethereum/log"
+	gethlog "github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/metrics"
 	"github.com/ethereum/go-ethereum/metrics/exp"
 
 	"github.com/offchainlabs/nitro/cmd/genericconf"
 	"github.com/offchainlabs/nitro/cmd/util/confighelpers"
+	"github.com/offchainlabs/nitro/daprovider/daclient"
 	"github.com/offchainlabs/nitro/util/headerreader"
+	"github.com/offchainlabs/nitro/util/rpcclient"
 
-	"github.com/celestiaorg/nitro-das-celestia/das"
+	das "github.com/celestiaorg/nitro-das-celestia/daserver"
+	"github.com/celestiaorg/nitro-das-celestia/daserver/types"
 )
 
 type CelestiaDAServerConfig struct {
@@ -32,6 +35,10 @@ type CelestiaDAServerConfig struct {
 
 	CelestiaDa das.DAConfig `koanf:"celestia"`
 
+	DasClientConfig daclient.ClientConfig `koanf:"das"`
+
+	FallbackEnabled bool `koanf:"fallback-enabled"`
+
 	LogLevel string `koanf:"log-level"`
 	LogType  string `koanf:"log-type"`
 
@@ -47,17 +54,19 @@ var DefaultCelestiaDAServerConfig = CelestiaDAServerConfig{
 	RPCPort:            9876,
 	RPCServerTimeouts:  genericconf.HTTPServerTimeoutConfigDefault,
 	RPCServerBodyLimit: genericconf.HTTPServerBodyLimitDefault,
+	FallbackEnabled:    true,
 	LogLevel:           "INFO",
 	LogType:            "plaintext",
 	Metrics:            false,
 	MetricsServer:      genericconf.MetricsServerConfigDefault,
 	PProf:              false,
 	PprofCfg:           genericconf.PProfDefault,
+	DasClientConfig:    daclient.DefaultClientConfig,
 }
 
 func main() {
 	if err := startup(); err != nil {
-		log.Error("Error running CelestiaDAServer", "err", err)
+		gethlog.Error("Error running CelestiaDAServer", "err", err)
 	}
 }
 
@@ -83,8 +92,12 @@ func parseDAServer(args []string) (*CelestiaDAServerConfig, error) {
 	f.String("log-level", DefaultCelestiaDAServerConfig.LogLevel, "log level, valid values are CRIT, ERROR, WARN, INFO, DEBUG, TRACE")
 	f.String("log-type", DefaultCelestiaDAServerConfig.LogType, "log type (plaintext or json)")
 
+	f.Bool("fallback-enabled", DefaultCelestiaDAServerConfig.FallbackEnabled, "enable fallbacks to arbitrum anytrust")
+
 	das.CelestiaDAConfigAddOptions("celestia", f)
 
+	daclient.ClientConfigAddOptions("das", f)
+
 	k, err := confighelpers.BeginCommonParse(f, args)
 	if err != nil {
 		return nil, err
@@ -117,7 +130,7 @@ func (c *L1ReaderCloser) String() string {
 func startMetrics(cfg *CelestiaDAServerConfig) error {
 	mAddr := fmt.Sprintf("%v:%v", cfg.MetricsServer.Addr, cfg.MetricsServer.Port)
 	pAddr := fmt.Sprintf("%v:%v", cfg.PprofCfg.Addr, cfg.PprofCfg.Port)
-	if cfg.Metrics && !metrics.Enabled {
+	if cfg.Metrics && cfg.PProf && mAddr == pAddr {
 		return fmt.Errorf("metrics must be enabled via command line by adding --metrics, json config has no effect")
 	}
 	if cfg.Metrics && cfg.PProf && mAddr == pAddr {
@@ -154,9 +167,9 @@ func startup() error {
 		flag.Usage()
 		return fmt.Errorf("error parsing log type when creating handler: %w", err)
 	}
-	glogger := log.NewGlogHandler(handler)
+	glogger := gethlog.NewGlogHandler(handler)
 	glogger.Verbosity(logLevel)
-	log.SetDefault(log.NewLogger(glogger))
+	gethlog.SetDefault(gethlog.NewLogger(glogger))
 
 	if err := startMetrics(serverConfig); err != nil {
 		return err
@@ -168,18 +181,32 @@ func startup() error {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	celestiaDA, err := das.NewCelestiaDA(&serverConfig.CelestiaDa)
-	var celestiaReader das.CelestiaReader
-	var celestiaWriter das.CelestiaWriter
+	var celestiaReader types.CelestiaReader
+	var celestiaWriter types.CelestiaWriter
 	var rpcServer *http.Server
 	if serverConfig.EnableRPC {
 		if err != nil {
 			return err
 		}
 		celestiaReader = celestiaDA
 		celestiaWriter = celestiaDA
-		rpcServer, err = das.StartDASRPCServer(ctx, serverConfig.RPCAddr, serverConfig.RPCPort, serverConfig.RPCServerTimeouts, serverConfig.RPCServerBodyLimit, celestiaReader, celestiaWriter)
-		if err != nil {
-			return err
+
+		if serverConfig.FallbackEnabled {
+			clientConfig := serverConfig.DasClientConfig.RPC
+			client, err := daclient.NewClient(ctx, func() *rpcclient.ClientConfig { return &clientConfig })
+			if err != nil {
+				panic(fmt.Sprintf("Failed to create client: %v", err))
+			}
+			defer client.Close()
+			rpcServer, err = das.StartDASRPCServer(ctx, serverConfig.RPCAddr, serverConfig.RPCPort, serverConfig.RPCServerTimeouts, serverConfig.RPCServerBodyLimit, celestiaReader, celestiaWriter, client, true)
+			if err != nil {
+				panic(fmt.Sprintf("Failed to create client: %v", err))
+			}
+		} else {
+			rpcServer, err = das.StartDASRPCServer(ctx, serverConfig.RPCAddr, serverConfig.RPCPort, serverConfig.RPCServerTimeouts, serverConfig.RPCServerBodyLimit, celestiaReader, celestiaWriter, nil, false)
+			if err != nil {
+				return err
+			}
 		}
 	}
 

das/.env.example renamed to daserver/.env.example

@@ -14,6 +14,7 @@ import (
 
 	libshare "github.com/celestiaorg/go-square/v2/share"
 	"github.com/celestiaorg/nitro-das-celestia/celestiagen"
+	"github.com/celestiaorg/nitro-das-celestia/daserver/types"
 	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/ethclient"
@@ -79,6 +80,8 @@ func setupNetworkTest(t *testing.T) (*CelestiaDA, string, func(), context.Contex
 		1024*1024*2, // 2MB body limit
 		celestiaDA,
 		celestiaDA,
+		nil,
+		false,
 	)
 	require.NoError(t, err)
 
@@ -117,7 +120,7 @@ func TestGetProofVerification(t *testing.T) {
 	commitment, err := base64.StdEncoding.DecodeString(os.Getenv("COMMITMENT"))
 	require.NoError(t, err)
 
-	header, err := celestiaDA.Client.Header.GetByHeight(ctx, height)
+	header, _ := celestiaDA.Client.Header.GetByHeight(ctx, height)
 
 	dataBlob, err := celestiaDA.Client.Blob.Get(ctx, height, namespace, commitment)
 	require.NoError(t, err)
@@ -148,17 +151,16 @@ func TestGetProofVerification(t *testing.T) {
 
 	startIndexOds := blobIndex - odsSize*startRow
 
-	blobPointer := BlobPointer{
+	blobPointer := types.BlobPointer{
 		BlockHeight:  height,
 		Start:        uint64(startIndexOds),
 		SharesLength: uint64(sharesLength),
-		TxCommitment: txCommitment,
 		DataRoot:     dataRoot,
 	}
 
 	t.Run("Read Message BlobPointer", func(t *testing.T) {
 		// Read through RPC
-		var readResult ReadResult
+		var readResult types.ReadResult
 		err = client.Call(&readResult, "celestia_read", &blobPointer)
 		require.NoError(t, err)
 		require.NotNil(t, readResult)
@@ -238,7 +240,7 @@ func TestGetProofVerification(t *testing.T) {
 		ethRpc, err := ethclient.Dial(celestiaDA.Cfg.ValidatorConfig.EthClient)
 		require.NoError(t, err)
 
-		packedData, err := verifyProofABI.Inputs.Pack(
+		packedData, _ := verifyProofABI.Inputs.Pack(
 			args.Blobstream,
 			celestiagen.NamespaceNode{
 				Min:    celestiagen.Namespace(args.RowRoot.Min),