fix nits

Author: vgonkivs

api/docgen/examples.go

@@ -23,6 +23,7 @@ import (
 	"golang.org/x/text/language"
 
 	appfibre "github.com/celestiaorg/celestia-app/v8/fibre"
+	libhead "github.com/celestiaorg/go-header"
 	libshare "github.com/celestiaorg/go-square/v4/share"
 	"github.com/celestiaorg/rsmt2d"
 
@@ -200,11 +201,9 @@ func init() {
 	add(&exampleUploadResult)
 
 	exampleSubmitResult := fibre2.SubmitResult{
-		BlobID:              id,
-		ValidatorSignatures: []fibre2.ValidatorSignature{[]byte("validator_signature_bytes")},
-		Height:              42,
-		TxHash:              "A5CF62609391B17E0340A6E07BD15860AFA4BE7F5DAF28F2E22A1C3B0CE85E64",
-		PaymentPromise:      exampleUploadResult.PaymentPromise,
+		UploadResult: exampleUploadResult,
+		Height:       42,
+		TxHash:       "A5CF62609391B17E0340A6E07BD15860AFA4BE7F5DAF28F2E22A1C3B0CE85E64",
 	}
 	add(&exampleSubmitResult)
 

fibre/service.go

@@ -47,7 +47,11 @@ func (s *Service) Submit(
 	ns libshare.Namespace,
 	data []byte,
 	options *txclient.TxConfig,
-) (_ *user.TxResponse, _ *appfibre.SignedPaymentPromise, _ appfibre.BlobID, err error) {
+) (_ *user.TxResponse, _ *appfibre.SignedPaymentPromise, err error) {
+	if s == nil {
+		return nil, nil, ErrClientNotAvailable
+	}
+
 	start := time.Now()
 	defer func() {
 		s.metrics.observeSubmit(ctx, time.Since(start), len(data), err)
@@ -57,23 +61,23 @@ func (s *Service) Submit(
 
 	blob, err := appfibre.NewBlob(data, appfibre.DefaultBlobConfigV0())
 	if err != nil {
-		return nil, nil, nil, err
+		return nil, nil, err
 	}
 
 	promise, err := s.upload(ctx, ns, blob)
 	if err != nil {
 		log.Errorw("uploading blob", "err", err, "namespace", ns.ID())
-		return nil, nil, nil, err
+		return nil, nil, err
 	}
 
 	protoPromise, err := promise.ToProto()
 	if err != nil {
-		return nil, nil, nil, err
+		return nil, nil, err
 	}
 
 	signer, err := s.txClient.GetTxAuthorAccAddress(options)
 	if err != nil {
-		return nil, nil, nil, fmt.Errorf("getting signer address: %w", err)
+		return nil, nil, fmt.Errorf("getting signer address: %w", err)
 	}
 
 	msg := &fibretypes.MsgPayForFibre{
@@ -84,7 +88,7 @@ func (s *Service) Submit(
 	resp, err := s.txClient.SubmitMessage(ctx, msg, options)
 	if err != nil {
 		log.Errorw("submitting blob", "err", err, "namespace", promise.Namespace)
-		return nil, nil, nil, err
+		return nil, nil, err
 	}
 
 	// go does not allow slicing a function return value directly (e.g., f()[:]).
@@ -96,7 +100,7 @@ func (s *Service) Submit(
 		"tx-hash", resp.TxHash,
 		"signatures", len(promise.ValidatorSignatures),
 	)
-	return resp, promise, blob.ID(), nil
+	return resp, promise, nil
 }
 
 func (s *Service) Upload(
@@ -105,6 +109,10 @@ func (s *Service) Upload(
 	data []byte,
 	_ *txclient.TxConfig,
 ) (_ *appfibre.SignedPaymentPromise, _ appfibre.BlobID, err error) {
+	if s == nil {
+		return nil, nil, ErrClientNotAvailable
+	}
+
 	start := time.Now()
 	defer func() {
 		s.metrics.observeUpload(ctx, time.Since(start), len(data), err)
@@ -125,15 +133,17 @@ func (s *Service) Upload(
 	return promise, blob.ID(), nil
 }
 
-func (s *Service) Get(ctx context.Context, blobID []byte) (*appfibre.Blob, error) {
-	blbID := appfibre.BlobID(blobID)
-	err := blbID.Validate()
+func (s *Service) Download(ctx context.Context, blobID appfibre.BlobID) (*appfibre.Blob, error) {
+	if s == nil {
+		return nil, ErrClientNotAvailable
+	}
+
+	err := blobID.Validate()
 	if err != nil {
 		return nil, fmt.Errorf("invalid blob ID: %w", err)
 	}
-	log.Debugw("downloading fibre blob", "commitment", blbID.Commitment())
 
-	return s.fibreClient.Download(ctx, blbID)
+	return s.fibreClient.Download(ctx, blobID)
 }
 
 func (s *Service) upload(

nodebuilder/fibre/fibre.go

@@ -5,6 +5,7 @@ import (
 
 	sdktypes "github.com/cosmos/cosmos-sdk/types"
 
+	appfibre "github.com/celestiaorg/celestia-app/v8/fibre"
 	libshare "github.com/celestiaorg/go-square/v4/share"
 
 	"github.com/celestiaorg/celestia-node/fibre"
@@ -20,32 +21,34 @@ var _ Module = (*API)(nil)
 //
 //go:generate mockgen -destination=mocks/api.go -package=mocks . Module
 type Module interface {
-	// Submit submits a blob via the Fibre network.
+	// Submit submits a v0 Fibre blob via the Fibre network.
 	// It performs the full Fibre flow: uploads blob data to FSPs, aggregates validator
 	// availability signatures, and submits MsgPayForFibre on-chain.
 	// Returns the submission result including the on-chain height and transaction hash.
 	// Requires the node to be connected to a core endpoint with Fibre support.
-	Submit(_ context.Context, _ libshare.Namespace, _ []byte, _ *txclient.TxConfig) (*SubmitResult, error)
-	// Upload performs the off-chain portion of Fibre blob submission only.
+	// NOTE: Currently only v0 Fibre blobs are supported.
+	Submit(context.Context, libshare.Namespace, []byte, *txclient.TxConfig) (*SubmitResult, error)
+	// Upload performs the off-chain portion of v0 Fibre blob submission only.
 	// It encodes the blob, constructs a payment promise, uploads encoded rows to FSPs,
 	// and aggregates validator availability signatures. It does NOT submit MsgPayForFibre on-chain.
-	// Use blob.SubmitFibreBlob for the full submit flow.
-	Upload(_ context.Context, _ libshare.Namespace, _ []byte, _ *txclient.TxConfig) (*UploadResult, error)
-	// Get retrieves a Fibre blob from FSPs by blobID.
+	// Use fibre.Submit for the full submit flow.
+	// NOTE: Currently only v0 Fibre blobs are supported.
+	Upload(context.Context, libshare.Namespace, []byte, *txclient.TxConfig) (*UploadResult, error)
+	// Download retrieves a Fibre blob from FSPs by blobID.
 	// It reconstructs the original blob data from the encoded rows stored off-chain.
-	Get(ctx context.Context, blobID []byte) (*GetBlobResult, error)
+	Download(context.Context, appfibre.BlobID) (*GetBlobResult, error)
 	// QueryEscrowAccount returns the escrow account details for the given signer address,
 	// including total balance and available (spendable) balance.
-	QueryEscrowAccount(ctx context.Context, signer string) (*fibre.EscrowAccount, error)
+	QueryEscrowAccount(_ context.Context, signer string) (*fibre.EscrowAccount, error)
 	// Deposit adds funds to the node's Fibre escrow account.
 	// The signer is resolved from cfg (SignerAddress or KeyName) or the node's default account.
-	Deposit(ctx context.Context, amount sdktypes.Coin, cfg *txclient.TxConfig) error
+	Deposit(context.Context, sdktypes.Coin, *txclient.TxConfig) error
 	// Withdraw requests a withdrawal from the node's Fibre escrow account.
 	// The signer is resolved from cfg (SignerAddress or KeyName) or the node's default account.
 	// The withdrawal enters an unbonding period before funds become claimable.
-	Withdraw(ctx context.Context, amount sdktypes.Coin, cfg *txclient.TxConfig) error
+	Withdraw(context.Context, sdktypes.Coin, *txclient.TxConfig) error
 	// PendingWithdrawals returns all pending (not yet claimable) withdrawals for the given signer.
-	PendingWithdrawals(ctx context.Context, signer string) ([]fibre.PendingWithdrawal, error)
+	PendingWithdrawals(_ context.Context, signer string) ([]fibre.PendingWithdrawal, error)
 }
 
 // API is a wrapper around Module for the RPC.
@@ -63,9 +66,9 @@ type API struct {
 			data []byte,
 			config *txclient.TxConfig,
 		) (*UploadResult, error) `perm:"write"`
-		Get func(
+		Download func(
 			ctx context.Context,
-			blobID []byte,
+			blobID appfibre.BlobID,
 		) (*GetBlobResult, error) `perm:"read"`
 		QueryEscrowAccount func(
 			ctx context.Context,
@@ -106,8 +109,8 @@ func (api *API) Upload(
 	return api.Internal.Upload(ctx, ns, data, options)
 }
 
-func (api *API) Get(ctx context.Context, blobID []byte) (*GetBlobResult, error) {
-	return api.Internal.Get(ctx, blobID)
+func (api *API) Download(ctx context.Context, blobID appfibre.BlobID) (*GetBlobResult, error) {
+	return api.Internal.Download(ctx, blobID)
 }
 
 func (api *API) QueryEscrowAccount(ctx context.Context, signer string) (*fibre.EscrowAccount, error) {

nodebuilder/fibre/mocks/api.go

@@ -5,6 +5,7 @@ import (
 
 	sdktypes "github.com/cosmos/cosmos-sdk/types"
 
+	appfibre "github.com/celestiaorg/celestia-app/v8/fibre"
 	libshare "github.com/celestiaorg/go-square/v4/share"
 
 	"github.com/celestiaorg/celestia-node/fibre"
@@ -28,23 +29,26 @@ func (m *module) Submit(
 	data []byte,
 	options *txclient.TxConfig,
 ) (*SubmitResult, error) {
-	resp, pp, id, err := m.service.Submit(ctx, ns, data, options)
+	resp, pp, err := m.service.Submit(ctx, ns, data, options)
 	if err != nil {
 		return nil, err
 	}
 
-	submitRes := &SubmitResult{
-		BlobID:         id,
-		Height:         uint64(resp.Height),
-		TxHash:         resp.TxHash,
+	blobID := appfibre.NewBlobID(uint8(pp.BlobVersion), pp.Commitment)
+	uploadRes := UploadResult{
+		BlobID:         blobID,
 		PaymentPromise: toNodePaymentPromise(pp.PaymentPromise),
 	}
-
-	submitRes.ValidatorSignatures = make([]ValidatorSignature, len(pp.ValidatorSignatures))
+	uploadRes.ValidatorSignatures = make([]ValidatorSignature, len(pp.ValidatorSignatures))
 	for i, sig := range pp.ValidatorSignatures {
-		submitRes.ValidatorSignatures[i] = sig
+		uploadRes.ValidatorSignatures[i] = sig
 	}
-	return submitRes, nil
+
+	return &SubmitResult{
+		UploadResult: uploadRes,
+		Height:       uint64(resp.Height),
+		TxHash:       resp.TxHash,
+	}, nil
 }
 
 func (m *module) Upload(
@@ -70,8 +74,8 @@ func (m *module) Upload(
 	return uploadRes, nil
 }
 
-func (m *module) Get(ctx context.Context, blobID []byte) (*GetBlobResult, error) {
-	blob, err := m.service.Get(ctx, blobID)
+func (m *module) Download(ctx context.Context, blobID appfibre.BlobID) (*GetBlobResult, error) {
+	blob, err := m.service.Download(ctx, blobID)
 	if err != nil {
 		return nil, err
 	}

nodebuilder/fibre/module.go

@@ -6,6 +6,7 @@ import (
 
 	sdktypes "github.com/cosmos/cosmos-sdk/types"
 
+	appfibre "github.com/celestiaorg/celestia-app/v8/fibre"
 	libshare "github.com/celestiaorg/go-square/v4/share"
 
 	"github.com/celestiaorg/celestia-node/fibre"
@@ -34,7 +35,7 @@ func (s *stubbedFibreModule) Upload(
 	return nil, errFibreNotAvailable
 }
 
-func (s *stubbedFibreModule) Get(context.Context, []byte) (*GetBlobResult, error) {
+func (s *stubbedFibreModule) Download(context.Context, appfibre.BlobID) (*GetBlobResult, error) {
 	return nil, errFibreNotAvailable
 }
 

nodebuilder/fibre/stub.go

@@ -25,16 +25,11 @@ type UploadResult struct {
 // SubmitResult is the result of a full Fibre blob submission including on-chain MsgPayForFibre.
 // It extends UploadResult with chain inclusion details (height and transaction hash).
 type SubmitResult struct {
-	// BlobID is the Fibre blob identifier for the submitted blob.
-	BlobID appfibre.BlobID `json:"blob_id"`
-	// ValidatorSignatures are attestations from validators confirming blob availability.
-	ValidatorSignatures []ValidatorSignature `json:"validator_signatures"`
+	UploadResult
 	// Height is the block height at which MsgPayForFibre was included on-chain.
 	Height uint64 `json:"height"`
 	// TxHash is the transaction hash of the on-chain MsgPayForFibre.
 	TxHash string `json:"tx_hash"`
-	// PaymentPromise is the signed promise used for on-chain fee settlement.
-	PaymentPromise *PaymentPromise `json:"payment_promise,omitempty"`
 }
 
 // PaymentPromise represents the signed payment promise between a user and the Fibre network.