ICS 20 Cleanup and Tests

types/coin.go

@@ -580,8 +580,8 @@ func (coins Coins) Sort() Coins {
 // Parsing
 
 var (
-	// Denominations can be 3 ~ 32 characters long.
-	reDnmString = `[a-z][a-z0-9/]{2,31}`
+	// Denominations can be 3 ~ 64 characters long.
+	reDnmString = `[a-z][a-z0-9/]{2,63}`
 	reAmt       = `[[:digit:]]+`
 	reDecAmt    = `[[:digit:]]*\.[[:digit:]]+`
 	reSpc       = `[[:space:]]*`

x/ibc/20-transfer/keeper/keeper_test.go

@@ -48,11 +48,9 @@ var (
 	testAddr1 = sdk.AccAddress([]byte("testaddr1"))
 	testAddr2 = sdk.AccAddress([]byte("testaddr2"))
 
-	testCoins, _          = sdk.ParseCoins("100atom")
-	destCoins             = sdk.NewCoins(sdk.NewInt64Coin("bank/firstchannel/atom", 1000))
-	destCoins2            = sdk.NewCoins(sdk.NewInt64Coin("testportid/secondchannel/atom", 100))
-	testPrefixedCoins1, _ = sdk.ParseCoins(fmt.Sprintf("100%satom", types.GetDenomPrefix(testPort1, testChannel1)))
-	testPrefixedCoins2, _ = sdk.ParseCoins(fmt.Sprintf("100%satom", types.GetDenomPrefix(testPort2, testChannel2)))
+	testCoins, _ = sdk.ParseCoins("100atom")
+	prefixCoins  = sdk.NewCoins(sdk.NewCoin("bank/firstchannel/atom", sdk.NewInt(100)))
+	prefixCoins2 = sdk.NewCoins(sdk.NewCoin("testportid/secondchannel/atom", sdk.NewInt(100)))
 )
 
 type KeeperTestSuite struct {

x/ibc/20-transfer/keeper/relay.go

@@ -1,6 +1,7 @@
 package keeper
 
 import (
+	"fmt"
 	"strings"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -29,20 +30,20 @@ func (k Keeper) SendTransfer(
 	receiver sdk.AccAddress,
 	isSourceChain bool, // is the packet sender the source chain of the token?
 ) error {
-	// get the port and channel of the counterparty
-	sourceChan, found := k.channelKeeper.GetChannel(ctx, sourcePort, sourceChannel)
+	sourceChannelEnd, found := k.channelKeeper.GetChannel(ctx, sourcePort, sourceChannel)
 	if !found {
 		return sdkerrors.Wrap(channel.ErrChannelNotFound, sourceChannel)
 	}
 
-	destinationPort := sourceChan.Counterparty.PortID
-	destinationChannel := sourceChan.Counterparty.ChannelID
+	destinationPort := sourceChannelEnd.Counterparty.PortID
+	destinationChannel := sourceChannelEnd.Counterparty.ChannelID
 
 	// get the next sequence
 	sequence, found := k.channelKeeper.GetNextSequenceSend(ctx, sourcePort, sourceChannel)
 	if !found {
 		return channel.ErrSequenceSendNotFound
 	}
+
 	return k.createOutgoingPacket(ctx, sequence, sourcePort, sourceChannel, destinationPort, destinationChannel, destHeight, amount, sender, receiver, isSourceChain)
 }
 
@@ -60,14 +61,11 @@ func (k Keeper) TimeoutTransfer(ctx sdk.Context, packet channel.Packet, data typ
 func (k Keeper) createOutgoingPacket(
 	ctx sdk.Context,
 	seq uint64,
-	sourcePort,
-	sourceChannel,
-	destinationPort,
-	destinationChannel string,
+	sourcePort, sourceChannel,
+	destinationPort, destinationChannel string,
 	destHeight uint64,
 	amount sdk.Coins,
-	sender sdk.AccAddress,
-	receiver sdk.AccAddress,
+	sender, receiver sdk.AccAddress,
 	isSourceChain bool,
 ) error {
 	// NOTE:
@@ -87,10 +85,12 @@ func (k Keeper) createOutgoingPacket(
 			if strings.HasPrefix(coin.Denom, prefix) {
 				coins[i] = sdk.NewCoin(coin.Denom[len(prefix):], coin.Amount)
 			} else {
-				coins[i] = amount[i]
+				coins[i] = coin
 			}
 		}
 
+		fmt.Println(coins)
+
 		// escrow tokens if the destination chain is the same as the sender's
 		escrowAddress := types.GetEscrowAddress(sourcePort, sourceChannel)
 
@@ -151,7 +151,7 @@ func (k Keeper) onRecvPacket(ctx sdk.Context, packet channel.Packet, data types.
 	// NOTE: packet data type already checked in handler.go
 
 	if data.Source {
-		prefix := types.GetDenomPrefix(packet.GetDestChannel(), packet.GetDestChannel())
+		prefix := types.GetDenomPrefix(packet.GetDestPort(), packet.GetDestChannel())
 		for _, coin := range data.Amount {
 			if !strings.HasPrefix(coin.Denom, prefix) {
 				return sdkerrors.Wrapf(

x/ibc/20-transfer/keeper/relay_test.go

@@ -11,6 +11,7 @@ import (
 )
 
 func (suite *KeeperTestSuite) TestSendTransfer() {
+	testCoins2 := sdk.NewCoins(sdk.NewCoin("testportid/secondchannel/atom", sdk.NewInt(100)))
 	testCases := []struct {
 		msg           string
 		amount        sdk.Coins
@@ -24,16 +25,18 @@ func (suite *KeeperTestSuite) TestSendTransfer() {
 				suite.createChannel(testPort1, testChannel1, testConnection, testPort2, testChannel2, channelexported.OPEN)
 				suite.app.IBCKeeper.ChannelKeeper.SetNextSequenceSend(suite.ctx, testPort1, testChannel1, 1)
 			}, true},
-		{"sucess transfer from source chain with denom prefix", destCoins2,
+		{"sucess transfer from source chain with denom prefix", testCoins2,
 			true, func() {
-				suite.app.BankKeeper.AddCoins(suite.ctx, testAddr1, testCoins)
+				_, err := suite.app.BankKeeper.AddCoins(suite.ctx, testAddr1, testCoins)
+				suite.Require().NoError(err)
 				suite.createChannel(testPort1, testChannel1, testConnection, testPort2, testChannel2, channelexported.OPEN)
 				suite.app.IBCKeeper.ChannelKeeper.SetNextSequenceSend(suite.ctx, testPort1, testChannel1, 1)
 			}, true},
 		{"sucess transfer from external chain", testCoins,
 			false, func() {
-				suite.app.SupplyKeeper.SetSupply(suite.ctx, supply.NewSupply(destCoins))
-				suite.app.BankKeeper.AddCoins(suite.ctx, testAddr1, destCoins)
+				suite.app.SupplyKeeper.SetSupply(suite.ctx, supply.NewSupply(prefixCoins))
+				_, err := suite.app.BankKeeper.AddCoins(suite.ctx, testAddr1, prefixCoins)
+				suite.Require().NoError(err)
 				suite.createChannel(testPort1, testChannel1, testConnection, testPort2, testChannel2, channelexported.OPEN)
 				suite.app.IBCKeeper.ChannelKeeper.SetNextSequenceSend(suite.ctx, testPort1, testChannel1, 1)
 			}, true},
@@ -51,7 +54,7 @@ func (suite *KeeperTestSuite) TestSendTransfer() {
 				suite.app.IBCKeeper.ChannelKeeper.SetNextSequenceSend(suite.ctx, testPort1, testChannel1, 1)
 			}, false},
 		// - receiving chain
-		{"send from module account dailed", testCoins,
+		{"send from module account failed", testCoins,
 			false, func() {
 				suite.createChannel(testPort1, testChannel1, testConnection, testPort2, testChannel2, channelexported.OPEN)
 				suite.app.IBCKeeper.ChannelKeeper.SetNextSequenceSend(suite.ctx, testPort1, testChannel1, 1)
@@ -79,13 +82,42 @@ func (suite *KeeperTestSuite) TestSendTransfer() {
 }
 
 func (suite *KeeperTestSuite) TestReceiveTransfer() {
-	var packet channeltypes.Packet
-	var data types.FungibleTokenPacketData
+	data := types.NewFungibleTokenPacketData(prefixCoins2, testAddr1, testAddr2, true, 100)
+
 	testCases := []struct {
 		msg      string
 		malleate func()
 		expPass  bool
-	}{}
+	}{
+		{"sucess receive from source chain",
+			func() {}, true},
+		// onRecvPacket
+		// - source chain
+		{"no dest prefix on coin denom",
+			func() {
+				data.Amount = testCoins
+			}, false},
+		{"mint failed",
+			func() {
+				data.Amount = prefixCoins2
+				data.Amount[0].Amount = sdk.ZeroInt()
+			}, false},
+		// - receiving chain
+		{"no source prefix on coin denom",
+			func() {
+				data.Source = false
+			}, false},
+		{"sucess receive from external chain",
+			func() {
+				data.Source = false
+				data.Amount = prefixCoins
+				escrow := types.GetEscrowAddress(testPort2, testChannel2)
+				_, err := suite.app.BankKeeper.AddCoins(suite.ctx, escrow, testCoins)
+				suite.Require().NoError(err)
+			}, true},
+	}
+
+	packet := channeltypes.NewPacket(data, 1, testPort1, testChannel1, testPort2, testChannel2)
 
 	for i, tc := range testCases {
 		tc := tc