chore: add denom validation for string type denom

Finschia · May 8, 2024 · 0b9cc3c · 0b9cc3c
1 parent c76058c
commit 0b9cc3c
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 10 deletions.
diff --git a/x/fswap/keeper/grpc_query.go b/x/fswap/keeper/grpc_query.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/Finschia/finschia-sdk/store/prefix"
 	sdk "github.com/Finschia/finschia-sdk/types"
+	sdkerrors "github.com/Finschia/finschia-sdk/types/errors"
 	"github.com/Finschia/finschia-sdk/types/query"
 	"github.com/Finschia/finschia-sdk/x/fswap/types"
 )
@@ -23,6 +24,12 @@ func NewQueryServer(keeper Keeper) *QueryServer {
 
 func (s QueryServer) Swapped(ctx context.Context, req *types.QuerySwappedRequest) (*types.QuerySwappedResponse, error) {
 	c := sdk.UnwrapSDKContext(ctx)
+	if err := sdk.ValidateDenom(req.GetFromDenom()); err != nil {
+		return nil, sdkerrors.ErrInvalidRequest.Wrap(err.Error())
+	}
+	if err := sdk.ValidateDenom(req.GetToDenom()); err != nil {
+		return nil, sdkerrors.ErrInvalidRequest.Wrap(err.Error())
+	}
 
 	swapped, err := s.Keeper.getSwapped(c, req.GetFromDenom(), req.GetToDenom())
 	if err != nil {
@@ -37,6 +44,12 @@ func (s QueryServer) Swapped(ctx context.Context, req *types.QuerySwappedRequest
 
 func (s QueryServer) TotalSwappableToCoinAmount(ctx context.Context, req *types.QueryTotalSwappableToCoinAmountRequest) (*types.QueryTotalSwappableToCoinAmountResponse, error) {
 	c := sdk.UnwrapSDKContext(ctx)
+	if err := sdk.ValidateDenom(req.GetFromDenom()); err != nil {
+		return nil, sdkerrors.ErrInvalidRequest.Wrap(err.Error())
+	}
+	if err := sdk.ValidateDenom(req.GetToDenom()); err != nil {
+		return nil, sdkerrors.ErrInvalidRequest.Wrap(err.Error())
+	}
 
 	amount, err := s.Keeper.getSwappableNewCoinAmount(c, req.GetFromDenom(), req.GetToDenom())
 	if err != nil {

diff --git a/x/fswap/types/fswap.go b/x/fswap/types/fswap.go
@@ -9,21 +9,26 @@ import (
 
 // ValidateBasic validates the set of Swap
 func (s *Swap) ValidateBasic() error {
-	if s.FromDenom == "" {
-		return sdkerrors.ErrInvalidRequest.Wrap("from denomination cannot be empty")
+	if err := sdk.ValidateDenom(s.FromDenom); err != nil {
+		return sdkerrors.ErrInvalidRequest.Wrap(err.Error())
 	}
-	if s.ToDenom == "" {
-		return sdkerrors.ErrInvalidRequest.Wrap("to denomination cannot be empty")
+
+	if err := sdk.ValidateDenom(s.ToDenom); err != nil {
+		return sdkerrors.ErrInvalidRequest.Wrap(err.Error())
 	}
+
 	if s.FromDenom == s.ToDenom {
 		return sdkerrors.ErrInvalidRequest.Wrap("from denomination cannot be equal to to denomination")
 	}
+
 	if s.AmountCapForToDenom.LT(sdk.OneInt()) {
 		return sdkerrors.ErrInvalidRequest.Wrap("amount cannot be less than one")
 	}
+
 	if s.SwapRate.IsZero() {
 		return sdkerrors.ErrInvalidRequest.Wrap("swap rate cannot be zero")
 	}
+
 	return nil
 }
 

diff --git a/x/fswap/types/msgs.go b/x/fswap/types/msgs.go
@@ -23,8 +23,8 @@ func (m *MsgSwap) ValidateBasic() error {
 		return sdkerrors.ErrInvalidCoins.Wrap(m.FromCoinAmount.String())
 	}
 
-	if len(m.GetToDenom()) == 0 {
-		return sdkerrors.ErrInvalidRequest.Wrap("invalid denom (empty denom)")
+	if err := sdk.ValidateDenom(m.GetToDenom()); err != nil {
+		return sdkerrors.ErrInvalidRequest.Wrap(err.Error())
 	}
 
 	return nil
@@ -53,12 +53,12 @@ func (m *MsgSwapAll) ValidateBasic() error {
 		return sdkerrors.ErrInvalidAddress.Wrapf("Invalid address (%s)", err)
 	}
 
-	if len(m.GetFromDenom()) == 0 {
-		return sdkerrors.ErrInvalidRequest.Wrap("invalid denom (empty denom)")
+	if err := sdk.ValidateDenom(m.FromDenom); err != nil {
+		return sdkerrors.ErrInvalidRequest.Wrap(err.Error())
 	}
 
-	if len(m.GetToDenom()) == 0 {
-		return sdkerrors.ErrInvalidRequest.Wrap("invalid denom (empty denom)")
+	if err := sdk.ValidateDenom(m.ToDenom); err != nil {
+		return sdkerrors.ErrInvalidRequest.Wrap(err.Error())
 	}
 
 	return nil