refactoring!(state): extend SubmitPayForBlob method (#1963)

celestiaorg · May 29, 2023 · fecaebf · fecaebf
1 parent 9359b65
commit fecaebf
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 26 deletions.
diff --git a/api/gateway/state.go b/api/gateway/state.go
@@ -9,6 +9,9 @@ import (
 	"github.com/cosmos/cosmos-sdk/types"
 	"github.com/gorilla/mux"
 
+	"github.com/celestiaorg/celestia-app/pkg/appconsts"
+	apptypes "github.com/celestiaorg/celestia-app/x/blob/types"
+
 	"github.com/celestiaorg/celestia-node/state"
 )
 
@@ -137,8 +140,15 @@ func (h *Handler) handleSubmitPFB(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	fee := types.NewInt(req.Fee)
+
+	blob := &apptypes.Blob{
+		NamespaceId:  nID,
+		Data:         data,
+		ShareVersion: uint32(appconsts.DefaultShareVersion),
+	}
+
 	// perform request
-	txResp, err := h.state.SubmitPayForBlob(r.Context(), nID, data, fee, req.GasLimit)
+	txResp, err := h.state.SubmitPayForBlob(r.Context(), fee, req.GasLimit, blob)
 	if err != nil {
 		writeError(w, http.StatusInternalServerError, submitPFBEndpoint, err)
 		return

diff --git a/nodebuilder/node/admin.go b/nodebuilder/node/admin.go
@@ -8,7 +8,7 @@ import (
 	logging "github.com/ipfs/go-log/v2"
 )
 
-const APIVersion = "v0.1.0"
+const APIVersion = "v0.1.1"
 
 type module struct {
 	tp Type

diff --git a/nodebuilder/state/mocks/api.go b/nodebuilder/state/mocks/api.go
diff --git a/nodebuilder/state/state.go b/nodebuilder/state/state.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	"github.com/celestiaorg/nmt/namespace"
+	apptypes "github.com/celestiaorg/celestia-app/x/blob/types"
 
 	"github.com/celestiaorg/celestia-node/state"
 )
@@ -44,10 +44,9 @@ type Module interface {
 	// SubmitPayForBlob builds, signs and submits a PayForBlob transaction.
 	SubmitPayForBlob(
 		ctx context.Context,
-		nID namespace.ID,
-		data []byte,
 		fee state.Int,
 		gasLim uint64,
+		blobs ...*apptypes.Blob,
 	) (*state.TxResponse, error)
 
 	// CancelUnbondingDelegation cancels a user's pending undelegation from a validator.
@@ -113,10 +112,9 @@ type API struct {
 		SubmitTx         func(ctx context.Context, tx state.Tx) (*state.TxResponse, error) `perm:"write"`
 		SubmitPayForBlob func(
 			ctx context.Context,
-			nID namespace.ID,
-			data []byte,
 			fee state.Int,
 			gasLim uint64,
+			blobs ...*apptypes.Blob,
 		) (*state.TxResponse, error) `perm:"write"`
 		CancelUnbondingDelegation func(
 			ctx context.Context,
@@ -192,12 +190,11 @@ func (api *API) SubmitTx(ctx context.Context, tx state.Tx) (*state.TxResponse, e
 
 func (api *API) SubmitPayForBlob(
 	ctx context.Context,
-	nID namespace.ID,
-	data []byte,
 	fee state.Int,
 	gasLim uint64,
+	blobs ...*apptypes.Blob,
 ) (*state.TxResponse, error) {
-	return api.Internal.SubmitPayForBlob(ctx, nID, data, fee, gasLim)
+	return api.Internal.SubmitPayForBlob(ctx, fee, gasLim, blobs...)
 }
 
 func (api *API) CancelUnbondingDelegation(

diff --git a/state/core_access.go b/state/core_access.go
@@ -20,11 +20,9 @@ import (
 	"google.golang.org/grpc/credentials/insecure"
 
 	"github.com/celestiaorg/celestia-app/app"
-	"github.com/celestiaorg/celestia-app/pkg/appconsts"
 	"github.com/celestiaorg/celestia-app/x/blob"
 	apptypes "github.com/celestiaorg/celestia-app/x/blob/types"
 	libhead "github.com/celestiaorg/go-header"
-	"github.com/celestiaorg/nmt/namespace"
 
 	"github.com/celestiaorg/celestia-node/header"
 )
@@ -158,17 +156,19 @@ func (ca *CoreAccessor) constructSignedTx(
 
 func (ca *CoreAccessor) SubmitPayForBlob(
 	ctx context.Context,
-	nID namespace.ID,
-	data []byte,
 	fee Int,
 	gasLim uint64,
+	blobs ...*apptypes.Blob,
 ) (*TxResponse, error) {
-	b := &apptypes.Blob{NamespaceId: nID, Data: data, ShareVersion: uint32(appconsts.DefaultShareVersion)}
+	if len(blobs) == 0 {
+		return nil, errors.New("state: no blobs provided")
+	}
+
 	response, err := blob.SubmitPayForBlob(
 		ctx,
 		ca.signer,
 		ca.coreConn,
-		[]*apptypes.Blob{b},
+		blobs,
 		apptypes.SetGasLimit(gasLim),
 		withFee(fee),
 	)