fix ibc logic

x/cronos/handler_test.go

@@ -118,7 +118,7 @@ func (suite *CronosTestSuite) TestMsgTransferTokens() {
 			"Correct address with non supported coin denom",
 			types.NewMsgTransferTokens(suite.address.String(), "to", sdk.NewCoins(sdk.NewCoin("fake", sdk.NewInt(1)))),
 			func() {},
-			errors.New("coin fake is not supported"),
+			errors.New("the coin fake is neither an ibc voucher or a cronos token"),
 		},
 	}
 	for _, tc := range testCases {

x/cronos/keeper/ibc.go

@@ -127,6 +127,9 @@ func (k Keeper) IbcTransferCoins(ctx sdk.Context, from, destination string, coin
 			}
 
 		default:
+			if !types.IsValidIBCDenom(c.Denom) && !types.IsValidCronosDenom(c.Denom) {
+				return fmt.Errorf("the coin %s is neither an ibc voucher or a cronos token", c.Denom)
+			}
 			_, found := k.GetContractByDenom(ctx, c.Denom)
 			if !found {
 				return fmt.Errorf("coin %s is not supported", c.Denom)
@@ -153,8 +156,19 @@ func (k Keeper) IbcTransferCoins(ctx sdk.Context, from, destination string, coin
 }
 
 func (k Keeper) ibcSendTransfer(ctx sdk.Context, sender sdk.AccAddress, destination string, coin sdk.Coin) error {
-	// Coin needs to be a voucher so that we can extract the channel id from the denom
-	channelID, err := k.GetSourceChannelID(ctx, coin.Denom)
+	// We extract the channel id from the coin denom
+	channelDenom := ""
+	if types.IsSourceCoin(coin.Denom) {
+		// If coin is source, we can only transfer to crypto.org chain
+		// we are using the cro denom to extract the channel id
+		// TODO: support arbitrary channel?
+		channelDenom = k.GetParams(ctx).IbcCroDenom
+	} else {
+		// If it is not source, then coin is a voucher so we can extract the channel id from the denom
+		channelDenom = coin.Denom
+	}
+
+	channelID, err := k.GetSourceChannelID(ctx, channelDenom)
 	if err != nil {
 		return err
 	}

x/cronos/keeper/ibc_test.go

@@ -169,9 +169,18 @@ func (suite *KeeperTestSuite) TestIbcTransferCoins() {
 			"Correct address with non supported coin denom",
 			address.String(),
 			"to",
+			sdk.NewCoins(sdk.NewCoin("ibc/BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", sdk.NewInt(1))),
+			func() {},
+			errors.New("coin ibc/BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA is not supported"),
+			func() {},
+		},
+		{
+			"Correct address with incorrect coin denom",
+			address.String(),
+			"to",
 			sdk.NewCoins(sdk.NewCoin("fake", sdk.NewInt(1))),
 			func() {},
-			errors.New("coin fake is not supported"),
+			errors.New("the coin fake is neither an ibc voucher or a cronos token"),
 			func() {},
 		},
 		{
@@ -227,7 +236,7 @@ func (suite *KeeperTestSuite) TestIbcTransferCoins() {
 				// Add support for the IBC token
 				suite.app.CronosKeeper.SetAutoContractForDenom(suite.ctx, "incorrect", common.HexToAddress("0x11"))
 			},
-			errors.New("incorrect is invalid: ibc cro denom is invalid"),
+			errors.New("the coin incorrect is neither an ibc voucher or a cronos token"),
 			func() {
 			},
 		},