small fixes

x/confidentialtransfers/client/cli/tx.go

@@ -298,7 +298,7 @@ func makeWithdrawCmd(cmd *cobra.Command, args []string) error {
 	}
 	address := clientCtx.GetFromAddress().String()
 	denom := args[0]
-	amount, err := strconv.ParseUint(args[2], 10, 64)
+	amount, err := strconv.ParseUint(args[1], 10, 64)
 	if err != nil {
 		return err
 	}
@@ -352,7 +352,7 @@ func makeDepositCmd(cmd *cobra.Command, args []string) error {
 
 	address := clientCtx.GetFromAddress().String()
 	denom := args[0]
-	amount, err := strconv.ParseUint(args[2], 10, 64)
+	amount, err := strconv.ParseUint(args[1], 10, 64)
 	if err != nil {
 		return err
 	}

x/confidentialtransfers/keeper/msg_server.go

@@ -358,6 +358,10 @@ func (m msgServer) Transfer(goCtx context.Context, req *types.MsgTransfer) (*typ
 		return nil, sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, "invalid msg")
 	}
 
+	if instruction.FromAddress == instruction.ToAddress {
+		return nil, sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, "sender and recipient addresses must be different")
+	}
+
 	// Check that sender and recipient accounts exist.
 	senderAccount, exists := m.Keeper.GetAccount(ctx, req.FromAddress, req.Denom)
 	if !exists {

x/confidentialtransfers/types/transfer.go

@@ -64,6 +64,11 @@ func NewTransfer(
 	amount uint64,
 	recipientPubkey *curves.Point,
 	auditors []AuditorInput) (*Transfer, error) {
+
+	if senderAddr == recipientAddr {
+		return &Transfer{}, errors.New("sender and recipient addresses cannot be the same")
+	}
+
 	// Get the current balance of the account from the decryptableBalance
 	aesKey, err := encryption.GetAESKey(*privateKey, denom)
 	if err != nil {