Pass appVersion to callback if version can be parsed. (#5468)

* Pass appVersion to callback if version can be parsed.

* Assert on rest of values passed.

modules/apps/29-fee/ibc_middleware.go

@@ -427,8 +427,7 @@ func (im IBCMiddleware) OnChanUpgradeOpen(ctx sdk.Context, portID, channelID str
 		panic(errorsmod.Wrap(porttypes.ErrInvalidRoute, "upgrade route not found to module in application callstack"))
 	}
 
-	// discard the version metadata returned as upgrade fields have already been validated in previous handshake steps.
-	_, err := types.MetadataFromVersion(version)
+	versionMetadata, err := types.MetadataFromVersion(version)
 	if err != nil {
 		// set fee disabled and passthrough to the next middleware or application in callstack.
 		im.keeper.DeleteFeeEnabled(ctx, portID, channelID)
@@ -438,7 +437,7 @@ func (im IBCMiddleware) OnChanUpgradeOpen(ctx sdk.Context, portID, channelID str
 
 	// set fee enabled and passthrough to the next middleware of application in callstack.
 	im.keeper.SetFeeEnabled(ctx, portID, channelID)
-	cbs.OnChanUpgradeOpen(ctx, portID, channelID, order, connectionHops, version)
+	cbs.OnChanUpgradeOpen(ctx, portID, channelID, order, connectionHops, versionMetadata.AppVersion)
 }
 
 // OnChanUpgradeRestore implements the IBCModule interface

modules/apps/29-fee/ibc_middleware_test.go

@@ -1344,7 +1344,16 @@ func (suite *FeeTestSuite) TestOnChanUpgradeOpen() {
 	}{
 		{
 			"success: enable fees",
-			func() {},
+			func() {
+				// Assert in callback that correct upgrade information is passed
+				suite.chainA.GetSimApp().FeeMockModule.IBCApp.OnChanUpgradeOpen = func(_ sdk.Context, portID, channelID string, order channeltypes.Order, connectionHops []string, version string) {
+					suite.Require().Equal(path.EndpointA.ChannelConfig.PortID, portID)
+					suite.Require().Equal(path.EndpointA.ChannelID, channelID)
+					suite.Require().Equal(channeltypes.UNORDERED, order)
+					suite.Require().Equal([]string{path.EndpointA.ConnectionID}, connectionHops)
+					suite.Require().Equal(ibcmock.Version, version)
+				}
+			},
 			true,
 		},
 		{
@@ -1353,17 +1362,27 @@ func (suite *FeeTestSuite) TestOnChanUpgradeOpen() {
 				// create a new path using a fee enabled channel and downgrade it to disable fees
 				path = ibctesting.NewPath(suite.chainA, suite.chainB)
 
-				mockFeeVersion := string(types.ModuleCdc.MustMarshalJSON(&types.Metadata{FeeVersion: types.Version, AppVersion: ibcmock.Version}))
+				mockFeeVersion := &types.Metadata{FeeVersion: types.Version, AppVersion: ibcmock.Version}
+				mockFeeVersionBz := string(types.ModuleCdc.MustMarshalJSON(mockFeeVersion))
 				path.EndpointA.ChannelConfig.PortID = ibctesting.MockFeePort
 				path.EndpointB.ChannelConfig.PortID = ibctesting.MockFeePort
-				path.EndpointA.ChannelConfig.Version = mockFeeVersion
-				path.EndpointB.ChannelConfig.Version = mockFeeVersion
+				path.EndpointA.ChannelConfig.Version = mockFeeVersionBz
+				path.EndpointB.ChannelConfig.Version = mockFeeVersionBz
 
 				upgradeVersion := ibcmock.Version
 				path.EndpointA.ChannelConfig.ProposedUpgrade.Fields.Version = upgradeVersion
 				path.EndpointB.ChannelConfig.ProposedUpgrade.Fields.Version = upgradeVersion
 
 				suite.coordinator.Setup(path)
+
+				// Assert in callback that correct version is passed
+				suite.chainA.GetSimApp().FeeMockModule.IBCApp.OnChanUpgradeOpen = func(_ sdk.Context, portID, channelID string, order channeltypes.Order, connectionHops []string, version string) {
+					suite.Require().Equal(path.EndpointA.ChannelConfig.PortID, portID)
+					suite.Require().Equal(path.EndpointA.ChannelID, channelID)
+					suite.Require().Equal(channeltypes.UNORDERED, order)
+					suite.Require().Equal([]string{path.EndpointA.ConnectionID}, connectionHops)
+					suite.Require().Equal(mockFeeVersion.AppVersion, version)
+				}
 			},
 			false,
 		},