fix(state/core_accessor): fix gas estimation logic (#4608)

Author: vgonkivs

state/core_access.go

@@ -184,15 +184,6 @@ func (ca *CoreAccessor) SubmitPayForBlob(
 		feeGrant = user.SetFeeGranter(granter)
 	}
 
-	gas := cfg.GasLimit()
-	if gas == 0 {
-		blobSizes := make([]uint32, len(libBlobs))
-		for i, blob := range libBlobs {
-			blobSizes[i] = uint32(len(blob.Data()))
-		}
-		gas = ca.estimateGasForBlobs(blobSizes, uint32(libBlobs[0].ShareVersion()))
-	}
-
 	// get tx signer account name
 	author, err := ca.getTxAuthorAccAddress(cfg)
 	if err != nil {
@@ -203,6 +194,14 @@ func (ca *CoreAccessor) SubmitPayForBlob(
 		return nil, fmt.Errorf("account for signer %s not found", author)
 	}
 
+	gas := cfg.GasLimit()
+	if gas == 0 {
+		gas, err = ca.estimateGasForBlobs(author.String(), libBlobs)
+		if err != nil {
+			return nil, err
+		}
+	}
+
 	gasPrice, err := ca.estimateGasPrice(ctx, cfg)
 	if err != nil {
 		return nil, err

state/core_access_test.go

@@ -56,11 +56,11 @@ func TestSubmitPayForBlob(t *testing.T) {
 		},
 		{
 			name:     "good blob with user provided gas and fees",
-			blobs:    []*libshare.Blob{blobbyTheBlob},
+			blobs:    []*libshare.Blob{blobbyTheBlob, blobbyTheBlob},
 			gasPrice: 0.005,
 			gasLim: apptypes.DefaultEstimateGas(&apptypes.MsgPayForBlobs{
-				BlobSizes:     []uint32{uint32(blobbyTheBlob.DataLen())},
-				ShareVersions: []uint32{uint32(blobbyTheBlob.ShareVersion())},
+				BlobSizes:     []uint32{uint32(blobbyTheBlob.DataLen()), uint32(blobbyTheBlob.DataLen())},
+				ShareVersions: []uint32{uint32(blobbyTheBlob.ShareVersion()), uint32(blobbyTheBlob.ShareVersion())},
 			}),
 			expErr: nil,
 		},

state/estimate.go

@@ -3,10 +3,12 @@ package state
 import (
 	"context"
 	"errors"
+	"fmt"
 
 	sdktypes "github.com/cosmos/cosmos-sdk/types"
 
 	apptypes "github.com/celestiaorg/celestia-app/v6/x/blob/types"
+	libshare "github.com/celestiaorg/go-square/v3/share"
 )
 
 var ErrGasPriceExceedsLimit = errors.New("state: estimated gas price exceeds max gas price in tx config")
@@ -66,9 +68,10 @@ func (ca *CoreAccessor) estimateGasPriceAndUsage(
 }
 
 // estimateGasForBlobs returns a gas limit that can be applied to the `MsgPayForBlob` transactions.
-func (ca *CoreAccessor) estimateGasForBlobs(blobSizes []uint32, shareVersion uint32) uint64 {
-	return apptypes.DefaultEstimateGas(&apptypes.MsgPayForBlobs{
-		BlobSizes:     blobSizes,
-		ShareVersions: []uint32{shareVersion},
-	})
+func (ca *CoreAccessor) estimateGasForBlobs(signer string, blobs []*libshare.Blob) (uint64, error) {
+	msg, err := apptypes.NewMsgPayForBlobs(signer, 0, blobs...)
+	if err != nil {
+		return 0, fmt.Errorf("failed to create msg pay-for-blobs: %w", err)
+	}
+	return apptypes.DefaultEstimateGas(msg), nil
 }