Merge branch 'feat/ics20-v2-path-forwarding' into gjermund/6385-test-…

…middle-chain-is-source-on-receive-and-send

modules/apps/transfer/keeper/forwarding.go

@@ -1,8 +1,6 @@
 package keeper
 
 import (
-	"errors"
-
 	errorsmod "cosmossdk.io/errors"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -64,7 +62,7 @@ func (k Keeper) ackForwardPacketError(ctx sdk.Context, prevPacket channeltypes.P
 		return err
 	}
 
-	forwardAck := channeltypes.NewErrorAcknowledgement(errors.New("forwarded packet failed"))
+	forwardAck := channeltypes.NewErrorAcknowledgement(types.ErrForwardedPacketFailed)
 	return k.acknowledgeForwardedPacket(ctx, prevPacket, forwardAck)
 }
 
@@ -74,7 +72,7 @@ func (k Keeper) ackForwardPacketTimeout(ctx sdk.Context, prevPacket channeltypes
 		return err
 	}
 
-	forwardAck := channeltypes.NewErrorAcknowledgement(errors.New("forwarded packet timed out"))
+	forwardAck := channeltypes.NewErrorAcknowledgement(types.ErrForwardedPacketTimedOut)
 	return k.acknowledgeForwardedPacket(ctx, prevPacket, forwardAck)
 }
 

modules/apps/transfer/keeper/relay_forwarding_test.go

@@ -1,15 +1,13 @@
 package keeper_test
 
 import (
-	"errors"
 	"fmt"
 	"time"
 
 	sdkmath "cosmossdk.io/math"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/cosmos/ibc-go/v8/modules/apps/transfer/internal"
 	"github.com/cosmos/ibc-go/v8/modules/apps/transfer/types"
 	clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types"
 	channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types"
@@ -584,14 +582,14 @@ func (suite *KeeperTestSuite) TestAcknowledgementFailureScenario5Forwarding() {
 	suite.Require().NoError(err) // message committed
 
 	// parse the packet from result events and recv packet on chainB
-	packet, err := ibctesting.ParsePacketFromEvents(result.Events)
+	packetFromAtoB, err := ibctesting.ParsePacketFromEvents(result.Events)
 	suite.Require().NoError(err)
-	suite.Require().NotNil(packet)
+	suite.Require().NotNil(packetFromAtoB)
 
 	err = path1.EndpointB.UpdateClient()
 	suite.Require().NoError(err)
 
-	result, err = path1.EndpointB.RecvPacketWithResult(packet)
+	result, err = path1.EndpointB.RecvPacketWithResult(packetFromAtoB)
 	suite.Require().NoError(err)
 	suite.Require().NotNil(result)
 
@@ -628,14 +626,14 @@ func (suite *KeeperTestSuite) TestAcknowledgementFailureScenario5Forwarding() {
 	suite.Require().NoError(err) // message committed
 
 	// parse the packet from result events and recv packet on chainB
-	packet, err = ibctesting.ParsePacketFromEvents(result.Events)
+	packetFromBtoC, err := ibctesting.ParsePacketFromEvents(result.Events)
 	suite.Require().NoError(err)
-	suite.Require().NotNil(packet)
+	suite.Require().NotNil(packetFromBtoC)
 
 	err = path2.EndpointB.UpdateClient()
 	suite.Require().NoError(err)
 
-	result, err = path2.EndpointB.RecvPacketWithResult(packet)
+	result, err = path2.EndpointB.RecvPacketWithResult(packetFromBtoC)
 	suite.Require().NoError(err)
 	suite.Require().NotNil(result)
 
@@ -684,22 +682,22 @@ func (suite *KeeperTestSuite) TestAcknowledgementFailureScenario5Forwarding() {
 	suite.Require().Equal(sdkmath.NewInt(0), postCoinOnC.Amount, "Vouchers have not been burned")
 
 	// parse the packet from result events and recv packet on chainB
-	packet, err = ibctesting.ParsePacketFromEvents(result.Events)
+	packetFromCtoB, err := ibctesting.ParsePacketFromEvents(result.Events)
 	suite.Require().NoError(err)
-	suite.Require().NotNil(packet)
+	suite.Require().NotNil(packetFromCtoB)
 
 	err = path2.EndpointA.UpdateClient()
 	suite.Require().NoError(err)
 
-	result, err = path2.EndpointA.RecvPacketWithResult(packet)
+	result, err = path2.EndpointA.RecvPacketWithResult(packetFromCtoB)
 	suite.Require().NoError(err)
 	suite.Require().NotNil(result)
 
 	// We have successfully received the packet on B and forwarded it to A.
 	// Lets try to retrieve it in order to save it
-	forwardedPacket, found := suite.chainB.GetSimApp().TransferKeeper.GetForwardedPacket(suite.chainB.GetContext(), path1.EndpointB.ChannelConfig.PortID, path1.EndpointB.ChannelID, packet.Sequence)
+	forwardedPacket, found := suite.chainB.GetSimApp().TransferKeeper.GetForwardedPacket(suite.chainB.GetContext(), path1.EndpointB.ChannelConfig.PortID, path1.EndpointB.ChannelID, packetFromCtoB.Sequence)
 	suite.Require().True(found)
-	suite.Require().Equal(packet, forwardedPacket)
+	suite.Require().Equal(packetFromCtoB, forwardedPacket)
 
 	// Voucher have been burned on chain B
 	coin = sdk.NewCoin(denomAB.IBCDenom(), amount)
@@ -711,65 +709,59 @@ func (suite *KeeperTestSuite) TestAcknowledgementFailureScenario5Forwarding() {
 	// of denom
 
 	// parse the packet from result events and recv packet on chainA
-	packet, err = ibctesting.ParsePacketFromEvents(result.Events)
+	packetFromBtoA, err := ibctesting.ParsePacketFromEvents(result.Events)
 	suite.Require().NoError(err)
-	suite.Require().NotNil(packet)
+	suite.Require().NotNil(packetFromBtoA)
 
-	// manipulate escrow account for denom on chain A
-	coin = sdk.NewCoin(sdk.DefaultBondDenom, sdkmath.NewInt(99))
-	suite.chainA.GetSimApp().TransferKeeper.SetTotalEscrowForDenom(suite.chainA.GetContext(), coin)
-	totalEscrowChainA = suite.chainA.GetSimApp().TransferKeeper.GetTotalEscrowForDenom(suite.chainA.GetContext(), coin.GetDenom())
-	suite.Require().Equal(sdkmath.NewInt(99), totalEscrowChainA.Amount)
+	// turn off receive on chain A to trigger an error
+	suite.chainA.GetSimApp().TransferKeeper.SetParams(suite.chainA.GetContext(), types.Params{
+		SendEnabled:    true,
+		ReceiveEnabled: false,
+	})
 
 	err = path1.EndpointA.UpdateClient()
 	suite.Require().NoError(err)
-	// suite.Require().Equal(packet, forwardedPacket)
 
-	result, err = path1.EndpointA.RecvPacketWithResult(packet)
-	suite.Require().Error(err)
-	suite.Require().Nil(result)
-	// In theory now an error ack should have been written on chain A
-	// NOW WE HAVE TO SEND ACK TO B, PROPAGTE ACK TO C, CHECK FINAL RESULTS
+	result, err = path1.EndpointA.RecvPacketWithResult(packetFromBtoA)
+	suite.Require().NoError(err)
 
-	// Reconstruct packet data
-	data, err := internal.UnmarshalPacketData(packet.Data, types.V2)
+	// An error ack has been written on chainA
+	// Now we need to propagate it back to chainB and chainC
+	packetSequenceOnA, err := ibctesting.ParsePacketSequenceFromEvents(result.Events)
 	suite.Require().NoError(err)
 
+	errorAckOnA := channeltypes.NewErrorAcknowledgement(types.ErrReceiveDisabled)
+	errorAckCommitmentOnA := channeltypes.CommitAcknowledgement(errorAckOnA.Acknowledgement())
+	ackOnC, found := suite.chainA.GetSimApp().GetIBCKeeper().ChannelKeeper.GetPacketAcknowledgement(suite.chainA.GetContext(), path1.EndpointA.ChannelConfig.PortID, path1.EndpointA.ChannelID, packetSequenceOnA)
+	suite.Require().True(found)
+	suite.Require().Equal(errorAckCommitmentOnA, ackOnC)
+
 	err = path1.EndpointB.UpdateClient()
 	suite.Require().NoError(err)
-	ack := channeltypes.NewErrorAcknowledgement(fmt.Errorf("failed packet transfer"))
 
-	// err = path1.EndpointA.AcknowledgePacket(packetRecv, ack.Acknowledgement())
-	err = suite.chainB.GetSimApp().TransferKeeper.OnAcknowledgementPacket(suite.chainB.GetContext(), packet, data, ack)
+	err = path1.EndpointB.AcknowledgePacket(packetFromBtoA, errorAckOnA.Acknowledgement())
 	suite.Require().NoError(err)
 
 	// Check that Escrow B has been refunded amount
 	coin = sdk.NewCoin(denomAB.IBCDenom(), amount)
 	totalEscrowChainB = suite.chainB.GetSimApp().TransferKeeper.GetTotalEscrowForDenom(suite.chainB.GetContext(), coin.GetDenom())
 	suite.Require().Equal(amount, totalEscrowChainB.Amount)
 
-	denom := types.ExtractDenomFromPath(denomABC.Path())
-	data = types.NewFungibleTokenPacketDataV2(
-		[]types.Token{
-			{
-				Denom:  denom,
-				Amount: amount.String(),
-			},
-		}, suite.chainC.SenderAccounts[0].SenderAccount.GetAddress().String(), suite.chainA.SenderAccounts[0].SenderAccount.GetAddress().String(), "", types.Forwarding{})
-	// suite.chainC.SenderAccounts[0].SenderAccount.GetAddress().String() This should be forward account of B
-	packet = channeltypes.NewPacket(data.GetBytes(), 3, path2.EndpointB.ChannelConfig.PortID, path2.EndpointB.ChannelID, path2.EndpointA.ChannelConfig.PortID, path2.EndpointA.ChannelID, clienttypes.NewHeight(1, 100), 0)
-
 	err = path2.EndpointB.UpdateClient()
 	suite.Require().NoError(err)
 
+	errorAckOnB := channeltypes.NewErrorAcknowledgement(types.ErrForwardedPacketFailed)
+	errorAckCommitmentOnB := channeltypes.CommitAcknowledgement(errorAckOnB.Acknowledgement())
+	ackOnB := suite.chainB.GetAcknowledgement(packetFromCtoB)
+	suite.Require().Equal(errorAckCommitmentOnB, ackOnB)
+
 	// Check the status of account on chain C before executing ack.
 	coin = sdk.NewCoin(denomABC.IBCDenom(), amount)
 	postCoinOnC = suite.chainC.GetSimApp().BankKeeper.GetBalance(suite.chainC.GetContext(), suite.chainC.SenderAccounts[0].SenderAccount.GetAddress(), coin.GetDenom())
 	suite.Require().Equal(sdkmath.NewInt(0), postCoinOnC.Amount, "Final Hop balance has been refunded before Ack execution")
 
 	// Execute ack
-	err = suite.chainC.GetSimApp().TransferKeeper.OnAcknowledgementPacket(suite.chainC.GetContext(), packet, data, ack)
-	// err = path2.EndpointB.AcknowledgePacket(packet, ack.Acknowledgement())
+	err = path2.EndpointB.AcknowledgePacket(packetFromCtoB, errorAckOnB.Acknowledgement())
 	suite.Require().NoError(err)
 
 	// Check that everything has been reverted
@@ -929,7 +921,7 @@ func (suite *KeeperTestSuite) TestOnTimeoutPacketForwarding() {
 	suite.Require().True(found, "chainB does not have an ack")
 
 	// And that this ack is of the type we expect (Error due to time out)
-	ack := channeltypes.NewErrorAcknowledgement(errors.New("forwarded packet timed out"))
+	ack := channeltypes.NewErrorAcknowledgement(types.ErrForwardedPacketTimedOut)
 	ackbytes := channeltypes.CommitAcknowledgement(ack.Acknowledgement())
 	suite.Require().Equal(ackbytes, storedAck)
 

modules/apps/transfer/types/errors.go

@@ -17,4 +17,6 @@ var (
 	ErrInvalidAuthorization    = errorsmod.Register(ModuleName, 10, "invalid transfer authorization")
 	ErrInvalidMemo             = errorsmod.Register(ModuleName, 11, "invalid memo")
 	ErrInvalidForwarding       = errorsmod.Register(ModuleName, 12, "invalid token forwarding")
+	ErrForwardedPacketTimedOut = errorsmod.Register(ModuleName, 13, "forwarded packet timed out")
+	ErrForwardedPacketFailed   = errorsmod.Register(ModuleName, 14, "forwarded packet failed")
 )