fix duplicate token query

irisnet · Apr 18, 2024 · b0bffe8 · b0bffe8
1 parent bb6bbfe
commit b0bffe8
Showing 1 changed file with 12 additions and 18 deletions.
diff --git a/modules/token/client/cli/tx.go b/modules/token/client/cli/tx.go
@@ -33,6 +33,8 @@ func NewTxCmd() *cobra.Command {
 		GetCmdBurnToken(),
 		GetCmdTransferTokenOwner(),
 		GetCmdSwapFeeToken(),
+		GetCmdSwapToErc20(),
+		GetCmdSwapFromErc20(),
 	)
 
 	return txCmd
@@ -436,10 +438,14 @@ func GetCmdSwapToErc20() *cobra.Command {
 			}
 
 			from := clientCtx.GetFromAddress().String()
-			paidAmount, _, err := parseMainCoin(clientCtx, args[0])
+			paidAmount, token, err := parseMainCoin(clientCtx, args[0])
 			if err != nil {
 				return err
 			}
+			if len(token.GetContract()) <= 0 {
+				return fmt.Errorf("corresponding erc20 contract of %s does not exist", paidAmount.Denom)
+			}
+
 			receiver, err := cmd.Flags().GetString(FlagTo)
 			if err != nil {
 				return err
@@ -455,14 +461,6 @@ func GetCmdSwapToErc20() *cobra.Command {
 				Receiver: receiver,
 			}
 
-			token, err := queryToken(clientCtx, paidAmount.Denom)
-			if err != nil {
-				return err
-			}
-			if len(token.GetContract()) <= 0 {
-				return fmt.Errorf("corresponding erc20 contract of %s does not exist", paidAmount.Denom)
-			}
-
 			if err := msg.ValidateBasic(); err != nil {
 				return err
 			}
@@ -501,10 +499,14 @@ func GetCmdSwapFromErc20() *cobra.Command {
 			}
 
 			from := clientCtx.GetFromAddress().String()
-			wantedAmount, _, err := parseMainCoin(clientCtx, args[0])
+			wantedAmount, token, err := parseMainCoin(clientCtx, args[0])
 			if err != nil {
 				return err
 			}
+			if len(token.GetContract()) <= 0 {
+				return fmt.Errorf("corresponding erc20 contract of %s does not exist", wantedAmount.Denom)
+			}
+
 			receiver, err := cmd.Flags().GetString(FlagTo)
 			if err != nil {
 				return err
@@ -520,14 +522,6 @@ func GetCmdSwapFromErc20() *cobra.Command {
 				Receiver:     receiver,
 			}
 
-			token, err := queryToken(clientCtx, wantedAmount.Denom)
-			if err != nil {
-				return err
-			}
-			if len(token.GetContract()) <= 0 {
-				return fmt.Errorf("corresponding erc20 contract of %s does not exist", wantedAmount.Denom)
-			}
-
 			if err := msg.ValidateBasic(); err != nil {
 				return err
 			}