Merge pull request #5 from DeBankDeFi/debank-v0.4.3

merge v0.4.3

Author: triple-CCC

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.5-alpine
+ARG BUILDER_IMAGE=docker.io/golang:1.23.6-alpine
 ARG RUNTIME_IMAGE=docker.io/alpine:3.19.1
 ARG TARGETOS
 ARG TARGETARCH
@@ -42,11 +42,7 @@ ARG UID=10001
 ARG USER_NAME=apollo
 ENV APOLLO_HOME=/home/${USER_NAME}
 
-ENV RPC_ADDR=""
-ENV RPC_PORT=""
 ENV AUTH_TOKEN=""
-ENV GAS_PRICE=""
-ENV GAS_MULTIPLIER=""
 ENV NAMESPACEID=""
 ENV CELESTIA_NODE_ENDPOINT=""
 
@@ -69,4 +65,4 @@ USER ${USER_NAME}
 
 # Expose ports:
 EXPOSE 1317 9090 26657 1095 8080 26658
-ENTRYPOINT ["sh", "-c", "/bin/celestia-server --enable-rpc --rpc-addr $RPC_ADDR --rpc-port $RPC_PORT --celestia.auth-token $AUTH_TOKEN --celestia.gas-price $GAS_PRICE --celestia.gas-multiplier $GAS_MULTIPLIER --celestia.namespace-id $NAMESPACEID --celestia.rpc $CELESTIA_NODE_ENDPOINT"]
+ENTRYPOINT ["sh", "-c", "/bin/celestia-server --celestia.auth-token $AUTH_TOKEN --celestia.namespace-id $NAMESPACEID --celestia.rpc $CELESTIA_NODE_ENDPOINT"]

README.md

@@ -8,19 +8,19 @@ A data availability server for the Arbitrum Nitro stack, leveraging Celestia DA
 
 ## Docker
 
-`FROM ghcr.io/celestiaorg/nitro-das-celestia:v0.4.0`
+`FROM ghcr.io/celestiaorg/nitro-das-celestia:v0.4.2`
 
 
 ## Example usage
 
 ```
 ./celestia-server --enable-rpc --rpc-addr $RPC_ADDR \
-      --rpc-port $RPC_PORT --celestia.auth-token $AUTH_TOKEN \
+      --rpc-port $RPC_PORT \
+      --celestia.auth-token $AUTH_TOKEN \
       --celestia.gas-price $GAS_PRICE \
       --celestia.gas-multiplier $GAS_MULTIPLIER \
       --celestia.namespace-id $NAMESPACEID \
-      --celestia.rpc $CELESTIA_NODE_ENDPOINT \
-      --celestia.keyname $KEYNAME
+      --celestia.rpc $CELESTIA_NODE_ENDPOINT 
 ```
 
 ## Flags

cmd/celestiadaserver.go

@@ -42,7 +42,7 @@ type CelestiaDAServerConfig struct {
 }
 
 var DefaultCelestiaDAServerConfig = CelestiaDAServerConfig{
-	EnableRPC:          false,
+	EnableRPC:          true,
 	RPCAddr:            "localhost",
 	RPCPort:            9876,
 	RPCServerTimeouts:  genericconf.HTTPServerTimeoutConfigDefault,

das/celestia.go

@@ -55,7 +55,6 @@ var (
 	celestiaSuccessCounter             = metrics.NewRegisteredCounter("celestia/action/celestia_success", nil)
 	celestiaFailureCounter             = metrics.NewRegisteredCounter("celestia/action/celestia_failure", nil)
 	celestiaGasRetries                 = metrics.NewRegisteredCounter("celestia/action/gas_retries", nil)
-	celestiaBlobInclusionRetries       = metrics.NewRegisteredCounter("celestia/action/inclusion_retries", nil)
 
 	celestiaValidationLastSuccesfulActionGauge = metrics.NewRegisteredGauge("celestia/validation/last_success", nil)
 	celestiaValidationSuccessCounter           = metrics.NewRegisteredCounter("celestia/validation/blobstream_success", nil)
@@ -241,33 +240,6 @@ func (c *CelestiaDA) Store(ctx context.Context, message []byte) ([]byte, error)
 		celestiaLastNonDefaultGasprice.Update(gasPrice)
 	}
 
-	proofs, err := c.ReadClient.Blob.GetProof(ctx, height, *c.Namespace, dataBlob.Commitment)
-	if err != nil {
-		celestiaFailureCounter.Inc(1)
-		log.Warn("Error retrieving proof", "err", err)
-		return nil, err
-	}
-
-	proofRetries := 0
-	for proofs == nil {
-		log.Warn("Retrieved empty proof from GetProof, fetching again...", "proofRetries", proofRetries)
-		time.Sleep(time.Millisecond * 100)
-		proofs, err = c.ReadClient.Blob.GetProof(ctx, height, *c.Namespace, dataBlob.Commitment)
-		if err != nil {
-			celestiaFailureCounter.Inc(1)
-			log.Warn("Error retrieving proof", "err", err)
-			return nil, err
-		}
-		proofRetries++
-		celestiaBlobInclusionRetries.Inc(1)
-	}
-
-	included, err := c.ReadClient.Blob.Included(ctx, height, *c.Namespace, proofs, dataBlob.Commitment)
-	if err != nil || !included {
-		celestiaFailureCounter.Inc(1)
-		log.Warn("Error checking for inclusion", "err", err, "proof", proofs)
-		return nil, err
-	}
 	log.Info("Succesfully posted blob", "height", height, "commitment", hex.EncodeToString(dataBlob.Commitment))
 
 	// we fetch the blob so that we can get the correct start index in the square
@@ -363,13 +335,6 @@ func (c *CelestiaDA) Store(ctx context.Context, message []byte) ([]byte, error)
 }
 
 func (c *CelestiaDA) Read(ctx context.Context, blobPointer *BlobPointer) (*ReadResult, error) {
-	// Wait until our client is synced
-	err := c.ReadClient.Header.SyncWait(ctx)
-	if err != nil {
-		log.Error("trouble with client sync", "err", err)
-		return nil, err
-	}
-
 	header, err := c.ReadClient.Header.GetByHeight(ctx, blobPointer.BlockHeight)
 	if err != nil {
 		log.Error("could not fetch header", "err", err)

docker-compose.yaml

@@ -0,0 +1,43 @@
+services:
+  celestia:
+      image:  ghcr.io/celestiaorg/celestia-node:v0.21.9
+      container_name: 'celestia'
+      environment:
+        - NODE_TYPE=light
+        - P2P_NETWORK=mocha
+        - RPC_URL=rpc-mocha.pops.one
+        - RPC_PORT=9090
+        - NETWORK=mocha
+      command:
+        - "celestia"
+        - "light"  # node type: light, bridge, or full
+        - "start"
+        - "--core.ip"
+        - "consensus-full-mocha-4.celestia-mocha.com"
+        - "--core.port"
+        - "9090"
+        - "--p2p.network"
+        - "mocha"
+        - "--rpc.skip-auth"
+        - "--rpc.addr"
+        - "0.0.0.0"
+      ports:
+        - "2121:2121"
+        - "26658:26658"
+      volumes:
+        - ${HOME}/.celestia-light-mocha-4:/home/celestia
+
+  celestia-server-mocha:
+      image: celestia-server:latest
+      container_name: celestia-server
+      environment:
+      - CELESTIA_AUTH_TOKEN=${CELESTIA_AUTH_TOKEN:-}
+      entrypoint: ["/bin/celestia-server", "--celestia.auth-token", \"$CELESTIA_AUTH_TOKEN\", "--celestia.namespace-id", "000008e5f679bf7116cb", "--celestia.rpc", "http://celestia:26658"]
+      ports:
+        - "1317:1317"
+        - "9090:9090"
+        - "26657:26657"
+        - "1095:1095"
+        - "8080:8080"
+      depends_on:
+        - celestia