diff --git a/nodebuilder/state/state.go b/nodebuilder/state/state.go
index d431c0e776..949d7f9a26 100644
--- a/nodebuilder/state/state.go
+++ b/nodebuilder/state/state.go
@@ -96,7 +96,7 @@ type Module interface {
 	GrantFee(
 		ctx context.Context,
 		grantee state.AccAddress,
-		amont state.Int,
+		amount,
 		fee state.Int,
 		gasLim uint64,
 	) (*state.TxResponse, error)
@@ -178,7 +178,7 @@ type API struct {
 		GrantFee func(
 			ctx context.Context,
 			grantee state.AccAddress,
-			amount state.Int,
+			amount,
 			fee state.Int,
 			gasLim uint64,
 		) (*state.TxResponse, error) `perm:"write"`
@@ -289,11 +289,11 @@ func (api *API) Balance(ctx context.Context) (*state.Balance, error) {
 func (api *API) GrantFee(
 	ctx context.Context,
 	grantee state.AccAddress,
-	amount state.Int,
+	amount,
 	fee state.Int,
 	gasLim uint64,
 ) (*state.TxResponse, error) {
-	return api.Internal.GrantFee(ctx, grantee,amount, fee, gasLim)
+	return api.Internal.GrantFee(ctx, grantee, amount, fee, gasLim)
 }
 
 func (api *API) RevokeGrantFee(
diff --git a/state/core_access.go b/state/core_access.go
index aee3b1aad4..f2604f5404 100644
--- a/state/core_access.go
+++ b/state/core_access.go
@@ -9,7 +9,6 @@ import (
 	"time"
 
 	sdkErrors "cosmossdk.io/errors"
-	"github.com/celestiaorg/celestia-app/pkg/appconsts"
 	"github.com/cosmos/cosmos-sdk/api/tendermint/abci"
 	nodeservice "github.com/cosmos/cosmos-sdk/client/grpc/node"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
@@ -28,9 +27,9 @@ import (
 
 	"github.com/celestiaorg/celestia-app/app"
 	apperrors "github.com/celestiaorg/celestia-app/app/errors"
+	"github.com/celestiaorg/celestia-app/pkg/appconsts"
 	appblob "github.com/celestiaorg/celestia-app/x/blob"
 	apptypes "github.com/celestiaorg/celestia-app/x/blob/types"
-	blobtypes "github.com/celestiaorg/celestia-app/x/blob/types"
 	libhead "github.com/celestiaorg/go-header"
 
 	"github.com/celestiaorg/celestia-node/blob"
@@ -244,7 +243,7 @@ func (ca *CoreAccessor) SubmitPayForBlob(
 
 	var lastErr error
 	for attempt := 0; attempt < maxRetries; attempt++ {
-		options := []blobtypes.TxBuilderOption{apptypes.SetGasLimit(gasLim), withFee(fee)}
+		options := []apptypes.TxBuilderOption{apptypes.SetGasLimit(gasLim), withFee(fee)}
 		if feeGrant != nil {
 			options = append(options, feeGrant)
 		}
@@ -648,7 +647,7 @@ func withFee(fee Int) apptypes.TxBuilderOption {
 	return apptypes.SetFeeAmount(gasFee)
 }
 
-func (ca *CoreAccessor) getGranter(ctx context.Context) (blobtypes.TxBuilderOption, error) {
+func (ca *CoreAccessor) getGranter(ctx context.Context) (apptypes.TxBuilderOption, error) {
 	addr, err := ca.signer.GetSignerInfo().GetAddress()
 	if err != nil {
 		return nil, err