updates

Author: julienrbrt

pkg/da/app/client.go

@@ -166,6 +166,17 @@ func (c *Client) Retrieve(ctx context.Context, height uint64, namespace []byte)
 				},
 			}
 		}
+		if strings.Contains(err.Error(), "is not available, lowest height is") {
+			c.logger.Debug().Uint64("height", height).Err(err).Msg("block is pruned or unavailable")
+			return datypes.ResultRetrieve{
+				BaseResult: datypes.BaseResult{
+					Code:      datypes.StatusNotFound,
+					Message:   datypes.ErrBlobNotFound.Error(),
+					Height:    height,
+					Timestamp: time.Now(),
+				},
+			}
+		}
 		c.logger.Error().Err(err).Uint64("height", height).Msg("failed to get block")
 		return datypes.ResultRetrieve{
 			BaseResult: datypes.BaseResult{
@@ -375,6 +386,9 @@ type rpcError struct {
 }
 
 func (e *rpcError) Error() string {
+	if e.Data != "" {
+		return fmt.Sprintf("RPC error %d: %s: %s", e.Code, e.Message, e.Data)
+	}
 	return fmt.Sprintf("RPC error %d: %s", e.Code, e.Message)
 }
 

pkg/da/app/client_test.go

@@ -147,7 +147,7 @@ func TestClient_Retrieve(t *testing.T) {
 
 		client := createTestClient(server.URL)
 		result := client.Retrieve(ctx, 100, ns.Bytes())
-		assert.Equal(t, datypes.StatusError, result.Code)
+		assert.Equal(t, datypes.StatusNotFound, result.Code)
 	})
 
 	t.Run("future height", func(t *testing.T) {
@@ -501,7 +501,7 @@ func TestRPCTypes(t *testing.T) {
 			Message: "Invalid Request",
 			Data:    "extra data",
 		}
-		assert.Equal(t, "RPC error -32600: Invalid Request", err.Error())
+		assert.Equal(t, "RPC error -32600: Invalid Request: extra data", err.Error())
 	})
 }
 

pkg/da/factory/factory.go

@@ -10,7 +10,6 @@ import (
 	"fmt"
 	"io"
 	"net/http"
-	"net/url"
 	"strings"
 	"time"
 
@@ -62,6 +61,9 @@ type Config struct {
 // Note: celestia-app client does not support proof operations
 // (GetProofs/Validate). Use celestia-node client for full functionality.
 func NewClient(ctx context.Context, cfg Config) (datypes.BlobClient, error) {
+	// Sanitize address to remove any surrounding quotes that might have been included from config
+	cfg.Address = strings.Trim(strings.TrimSpace(cfg.Address), "\"'")
+
 	// Always use node client in aggregator mode
 	if cfg.IsAggregator {
 		cfg.Logger.Debug().
@@ -273,27 +275,3 @@ func IsNodeAddress(ctx context.Context, address string) bool {
 func IsAppAddress(ctx context.Context, address string) bool {
 	return detectClientType(ctx, address) == ClientTypeApp
 }
-
-// ValidateAddress checks if the address is valid and returns the detected client type.
-// It makes an HTTP request to detect the service type.
-func ValidateAddress(ctx context.Context, address string) (ClientType, error) {
-	if strings.TrimSpace(address) == "" {
-		return ClientTypeAuto, fmt.Errorf("DA address cannot be empty")
-	}
-
-	// Try to parse as URL
-	u, err := url.Parse(address)
-	if err != nil {
-		// Try with http:// prefix
-		u, err = url.Parse("http://" + address)
-		if err != nil {
-			return ClientTypeAuto, fmt.Errorf("invalid DA address format: %w", err)
-		}
-	}
-
-	if u.Host == "" {
-		return ClientTypeAuto, fmt.Errorf("DA address must include host")
-	}
-
-	return detectClientType(ctx, address), nil
-}

pkg/da/factory/factory_test.go

@@ -196,45 +196,6 @@ func TestIsAppAddress(t *testing.T) {
 	}
 }
 
-func TestValidateAddress(t *testing.T) {
-	ctx := context.Background()
-
-	tests := []struct {
-		name        string
-		address     string
-		expectError bool
-		expectType  ClientType
-	}{
-		{
-			name:        "empty address",
-			address:     "",
-			expectError: true,
-		},
-		{
-			name:        "whitespace address",
-			address:     "   ",
-			expectError: true,
-		},
-		{
-			name:        "address without host",
-			address:     "http://",
-			expectError: true,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			clientType, err := ValidateAddress(ctx, tt.address)
-			if tt.expectError {
-				require.Error(t, err)
-			} else {
-				require.NoError(t, err)
-				assert.Equal(t, tt.expectType, clientType)
-			}
-		})
-	}
-}
-
 func TestNewClient_AggregatorMode(t *testing.T) {
 	// In aggregator mode, should always use node client regardless of address
 	cfg := Config{