remove NegotiateAppVersion and AppVersion gRPC (#643)

The NegotiateAppVersion callback has been removed from the IBC Application interface.
The gRPC AppVersion has been removed.
The app version negoitation will be handled by applications by returning the version in OnChanOpenTry.

docs/ibc/proto-docs.md

@@ -207,12 +207,6 @@
 
     - [Msg](#ibc.core.connection.v1.Msg)
 
-- [ibc/core/port/v1/query.proto](#ibc/core/port/v1/query.proto)
-    - [QueryAppVersionRequest](#ibc.core.port.v1.QueryAppVersionRequest)
-    - [QueryAppVersionResponse](#ibc.core.port.v1.QueryAppVersionResponse)
-
-    - [Query](#ibc.core.port.v1.Query)
-
 - [ibc/core/types/v1/genesis.proto](#ibc/core/types/v1/genesis.proto)
     - [GenesisState](#ibc.core.types.v1.GenesisState)
 
@@ -3107,67 +3101,6 @@ Msg defines the ibc/connection Msg service.
 
 
 
-<a name="ibc/core/port/v1/query.proto"></a>
-<p align="right"><a href="#top">Top</a></p>
-
-## ibc/core/port/v1/query.proto
-
-
-
-<a name="ibc.core.port.v1.QueryAppVersionRequest"></a>
-
-### QueryAppVersionRequest
-QueryAppVersionRequest is the request type for the Query/AppVersion RPC method
-
-
-| Field | Type | Label | Description |
-| ----- | ---- | ----- | ----------- |
-| `port_id` | [string](#string) |  | port unique identifier |
-| `connection_id` | [string](#string) |  | connection unique identifier |
-| `ordering` | [ibc.core.channel.v1.Order](#ibc.core.channel.v1.Order) |  | whether the channel is ordered or unordered |
-| `counterparty` | [ibc.core.channel.v1.Counterparty](#ibc.core.channel.v1.Counterparty) |  | counterparty channel end |
-| `proposed_version` | [string](#string) |  | proposed version |
-
-
-
-
-
-
-<a name="ibc.core.port.v1.QueryAppVersionResponse"></a>
-
-### QueryAppVersionResponse
-QueryAppVersionResponse is the response type for the Query/AppVersion RPC method.
-
-
-| Field | Type | Label | Description |
-| ----- | ---- | ----- | ----------- |
-| `port_id` | [string](#string) |  | port id associated with the request identifiers |
-| `version` | [string](#string) |  | supported app version |
-
-
-
-
-
- <!-- end messages -->
-
- <!-- end enums -->
-
- <!-- end HasExtensions -->
-
-
-<a name="ibc.core.port.v1.Query"></a>
-
-### Query
-Query defines the gRPC querier service
-
-| Method Name | Request Type | Response Type | Description | HTTP Verb | Endpoint |
-| ----------- | ------------ | ------------- | ------------| ------- | -------- |
-| `AppVersion` | [QueryAppVersionRequest](#ibc.core.port.v1.QueryAppVersionRequest) | [QueryAppVersionResponse](#ibc.core.port.v1.QueryAppVersionResponse) | AppVersion queries an IBC Port and determines the appropriate application version to be used | |
-
- <!-- end services -->
-
-
-
 <a name="ibc/core/types/v1/genesis.proto"></a>
 <p align="right"><a href="#top">Top</a></p>
 

modules/apps/27-interchain-accounts/controller/ibc_module.go

@@ -163,15 +163,3 @@ func (im IBCModule) OnTimeoutPacket(
 
 	return im.app.OnTimeoutPacket(ctx, packet, relayer)
 }
-
-// NegotiateAppVersion implements the IBCModule interface
-func (im IBCModule) NegotiateAppVersion(
-	ctx sdk.Context,
-	order channeltypes.Order,
-	connectionID string,
-	portID string,
-	counterparty channeltypes.Counterparty,
-	proposedVersion string,
-) (string, error) {
-	return "", sdkerrors.Wrap(icatypes.ErrInvalidChannelFlow, "ICS-27 app version negotiation is unsupported on controller chains")
-}

modules/apps/27-interchain-accounts/controller/ibc_module_test.go

@@ -630,59 +630,3 @@ func (suite *InterchainAccountsTestSuite) TestOnTimeoutPacket() {
 		})
 	}
 }
-
-func (suite *InterchainAccountsTestSuite) TestNegotiateAppVersion() {
-	var (
-		proposedVersion string
-	)
-	testCases := []struct {
-		name     string
-		malleate func()
-		expPass  bool
-	}{
-		{
-			"ICA OnRecvPacket fails with ErrInvalidChannelFlow", func() {}, false,
-		},
-	}
-
-	for _, tc := range testCases {
-		tc := tc
-
-		suite.Run(tc.name, func() {
-			suite.SetupTest()
-			path := NewICAPath(suite.chainA, suite.chainB)
-			suite.coordinator.SetupConnections(path)
-
-			err := InitInterchainAccount(path.EndpointA, TestOwnerAddress)
-			suite.Require().NoError(err)
-
-			module, _, err := suite.chainA.GetSimApp().GetIBCKeeper().PortKeeper.LookupModuleByPort(suite.chainA.GetContext(), path.EndpointA.ChannelConfig.PortID)
-			suite.Require().NoError(err)
-
-			cbs, ok := suite.chainA.GetSimApp().GetIBCKeeper().Router.GetRoute(module)
-			suite.Require().True(ok)
-
-			counterpartyPortID, err := icatypes.GeneratePortID(TestOwnerAddress, path.EndpointA.ConnectionID, path.EndpointB.ConnectionID)
-			suite.Require().NoError(err)
-
-			counterparty := channeltypes.Counterparty{
-				PortId:    counterpartyPortID,
-				ChannelId: path.EndpointB.ChannelID,
-			}
-
-			proposedVersion = icatypes.VersionPrefix
-
-			tc.malleate()
-
-			version, err := cbs.NegotiateAppVersion(suite.chainA.GetContext(), channeltypes.ORDERED, path.EndpointA.ConnectionID, path.EndpointA.ChannelConfig.PortID, counterparty, proposedVersion)
-			if tc.expPass {
-				suite.Require().NoError(err)
-				suite.Require().NoError(icatypes.ValidateVersion(version))
-				suite.Require().Equal(TestVersion, version)
-			} else {
-				suite.Require().Error(err)
-				suite.Require().Empty(version)
-			}
-		})
-	}
-}

modules/apps/27-interchain-accounts/host/ibc_module.go

@@ -137,15 +137,3 @@ func (im IBCModule) OnTimeoutPacket(
 ) error {
 	return sdkerrors.Wrap(icatypes.ErrInvalidChannelFlow, "cannot cause a packet timeout on a host channel end, a host chain does not send a packet over the channel")
 }
-
-// NegotiateAppVersion implements the IBCModule interface
-func (im IBCModule) NegotiateAppVersion(
-	ctx sdk.Context,
-	order channeltypes.Order,
-	connectionID string,
-	portID string,
-	counterparty channeltypes.Counterparty,
-	proposedVersion string,
-) (string, error) {
-	return im.keeper.NegotiateAppVersion(ctx, order, connectionID, portID, counterparty, proposedVersion)
-}

modules/apps/27-interchain-accounts/host/ibc_module_test.go

@@ -584,61 +584,3 @@ func (suite *InterchainAccountsTestSuite) TestOnTimeoutPacket() {
 		})
 	}
 }
-
-func (suite *InterchainAccountsTestSuite) TestNegotiateAppVersion() {
-	var (
-		proposedVersion string
-	)
-	testCases := []struct {
-		name     string
-		malleate func()
-		expPass  bool
-	}{
-		{
-			"success", func() {}, true,
-		},
-		{
-			"invalid proposed version", func() {
-				proposedVersion = "invalid version"
-			}, false,
-		},
-	}
-
-	for _, tc := range testCases {
-		tc := tc
-
-		suite.Run(tc.name, func() {
-			suite.SetupTest()
-			path := NewICAPath(suite.chainA, suite.chainB)
-			suite.coordinator.SetupConnections(path)
-
-			module, _, err := suite.chainA.GetSimApp().GetIBCKeeper().PortKeeper.LookupModuleByPort(suite.chainA.GetContext(), icatypes.PortID)
-			suite.Require().NoError(err)
-
-			cbs, ok := suite.chainA.GetSimApp().GetIBCKeeper().Router.GetRoute(module)
-			suite.Require().True(ok)
-
-			counterpartyPortID, err := icatypes.GeneratePortID(TestOwnerAddress, path.EndpointA.ConnectionID, path.EndpointB.ConnectionID)
-			suite.Require().NoError(err)
-
-			counterparty := &channeltypes.Counterparty{
-				PortId:    counterpartyPortID,
-				ChannelId: path.EndpointB.ChannelID,
-			}
-
-			proposedVersion = icatypes.VersionPrefix
-
-			tc.malleate()
-
-			version, err := cbs.NegotiateAppVersion(suite.chainA.GetContext(), channeltypes.ORDERED, path.EndpointA.ConnectionID, icatypes.PortID, *counterparty, proposedVersion)
-			if tc.expPass {
-				suite.Require().NoError(err)
-				suite.Require().NoError(icatypes.ValidateVersion(version))
-				suite.Require().Equal(TestVersion, version)
-			} else {
-				suite.Require().Error(err)
-				suite.Require().Empty(version)
-			}
-		})
-	}
-}

modules/apps/27-interchain-accounts/host/keeper/keeper.go

@@ -7,15 +7,13 @@ import (
 	baseapp "github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper"
 	capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types"
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
 	"github.com/tendermint/tendermint/libs/log"
 
 	"github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/host/types"
 	icatypes "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/types"
-	channeltypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types"
 	host "github.com/cosmos/ibc-go/v3/modules/core/24-host"
 )
 
@@ -180,22 +178,3 @@ func (k Keeper) SetInterchainAccountAddress(ctx sdk.Context, portID string, addr
 	store := ctx.KVStore(k.storeKey)
 	store.Set(icatypes.KeyOwnerAccount(portID), []byte(address))
 }
-
-// NegotiateAppVersion handles application version negotation for the IBC interchain accounts module
-func (k Keeper) NegotiateAppVersion(
-	ctx sdk.Context,
-	order channeltypes.Order,
-	connectionID string,
-	portID string,
-	counterparty channeltypes.Counterparty,
-	proposedVersion string,
-) (string, error) {
-	if proposedVersion != icatypes.VersionPrefix {
-		return "", sdkerrors.Wrapf(icatypes.ErrInvalidVersion, "failed to negotiate app version: expected %s, got %s", icatypes.VersionPrefix, proposedVersion)
-	}
-
-	moduleAccAddr := k.accountKeeper.GetModuleAddress(icatypes.ModuleName)
-	accAddr := icatypes.GenerateAddress(moduleAccAddr, counterparty.PortId)
-
-	return icatypes.NewAppVersion(icatypes.VersionPrefix, accAddr.String()), nil
-}

modules/apps/transfer/ibc_module.go

@@ -279,19 +279,3 @@ func (im IBCModule) OnTimeoutPacket(
 
 	return nil
 }
-
-// NegotiateAppVersion implements the IBCModule interface
-func (im IBCModule) NegotiateAppVersion(
-	ctx sdk.Context,
-	order channeltypes.Order,
-	connectionID string,
-	portID string,
-	counterparty channeltypes.Counterparty,
-	proposedVersion string,
-) (string, error) {
-	if proposedVersion != types.Version {
-		return "", sdkerrors.Wrapf(types.ErrInvalidVersion, "failed to negotiate app version: expected %s, got %s", types.Version, proposedVersion)
-	}
-
-	return types.Version, nil
-}