fix(assets,delegation): stateless validate cli

ExocoreNetwork · May 30, 2024 · 0649300 · 0649300
1 parent 79df9e5
commit 0649300
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/x/assets/client/cli/query.go b/x/assets/client/cli/query.go
@@ -204,9 +204,14 @@ func QueStakerAssetInfos() *cobra.Command {
 				return err
 			}
 
+			stakerID := args[0]
+			if _, _, err := types.ValidateID(stakerID, false, false); err != nil {
+				return errorsmod.Wrap(types.ErrInvalidCliCmdArg, err.Error())
+			}
+
 			queryClient := types.NewQueryClient(clientCtx)
 			req := &types.QueryStakerAssetInfo{
-				StakerID: strings.ToLower(args[0]),
+				StakerID: strings.ToLower(stakerID),
 			}
 			res, err := queryClient.QueStakerAssetInfos(context.Background(), req)
 			if err != nil {
@@ -340,9 +345,14 @@ func QueStakerExoCoreAddr() *cobra.Command {
 				return err
 			}
 
+			stakerID := args[0]
+			if _, _, err := types.ValidateID(stakerID, false, false); err != nil {
+				return errorsmod.Wrap(types.ErrInvalidCliCmdArg, err.Error())
+			}
+
 			queryClient := types.NewQueryClient(clientCtx)
 			req := &types.QueryStakerExCoreAddr{
-				Staker: strings.ToLower(args[0]),
+				Staker: strings.ToLower(stakerID),
 			}
 			res, err := queryClient.QueStakerExoCoreAddr(context.Background(), req)
 			if err != nil {

diff --git a/x/delegation/client/cli/query.go b/x/delegation/client/cli/query.go
@@ -85,11 +85,18 @@ func QueryDelegationInfo() *cobra.Command {
 			if err != nil {
 				return err
 			}
-
+			stakerID := strings.ToLower(args[0])
+			if _, _, err := types.ValidateID(stakerID, false, false); err != nil {
+				return errorsmod.Wrap(types.ErrInvalidCliCmdArg, err.Error())
+			}
+			assetID := strings.ToLower(args[1])
+			if _, _, err := types.ValidateID(assetID, false, false); err != nil {
+				return errorsmod.Wrap(types.ErrInvalidCliCmdArg, err.Error())
+			}
 			queryClient := delegationtype.NewQueryClient(clientCtx)
 			req := &delegationtype.DelegationInfoReq{
-				StakerID: strings.ToLower(args[0]),
-				AssetID:  strings.ToLower(args[1]),
+				StakerID: strings.ToLower(stakerID),
+				AssetID:  strings.ToLower(assetID),
 			}
 			res, err := queryClient.QueryDelegationInfo(context.Background(), req)
 			if err != nil {