chore: remove notion of protocol version, revert packet/v1 diffs.

modules/core/04-channel/types/msgs_test.go

@@ -64,7 +64,6 @@ var (
 	disabledTimeout   = clienttypes.ZeroHeight()
 	validPacketData   = []byte("testdata")
 	unknownPacketData = []byte("unknown")
-	validVersion      = "ics-20"
 
 	packet        = types.NewPacket(validPacketData, 1, portid, chanid, cpportid, cpchanid, timeoutHeight, timeoutTimestamp)
 	invalidPacket = types.NewPacket(unknownPacketData, 0, portid, chanid, cpportid, cpchanid, timeoutHeight, timeoutTimestamp)

modules/core/04-channel/types/packet.go

@@ -2,8 +2,6 @@ package types
 
 import (
 	"crypto/sha256"
-	"slices"
-	"strings"
 
 	errorsmod "cosmossdk.io/errors"
 
@@ -14,32 +12,13 @@ import (
 	"github.com/cosmos/ibc-go/v9/modules/core/exported"
 )
 
-// CommitPacket returns the packet commitment bytes based on
-// the ProtocolVersion specified in the Packet. The commitment
-// must commit to all fields in the packet apart from the source port
-// source channel and sequence (which will be committed to in the packet commitment key path)
-// and the ProtocolVersion which is defining how to hash the packet fields.
-// NOTE: The commitment MUST be a fixed length preimage to prevent relayers from being able
-// to malleate the packet fields and create a commitment hash that matches the original packet.
-func CommitPacket(packet Packet) []byte {
-	switch packet.ProtocolVersion {
-	case IBC_VERSION_UNSPECIFIED, IBC_VERSION_1:
-		return commitV1Packet(packet)
-	case IBC_VERSION_2:
-		// TODO: convert to PacketV2 and commit.
-		return commitV2Packet(packet)
-	default:
-		panic("unsupported version")
-	}
-}
-
-// commitV1Packet returns the V1 packet commitment bytes. The commitment consists of:
+// CommitPacket returns the packet commitment bytes. The commitment consists of:
 // sha256_hash(timeout_timestamp + timeout_height.RevisionNumber + timeout_height.RevisionHeight + sha256_hash(data))
 // from a given packet. This results in a fixed length preimage.
 // NOTE: A fixed length preimage is ESSENTIAL to prevent relayers from being able
 // to malleate the packet fields and create a commitment hash that matches the original packet.
 // NOTE: sdk.Uint64ToBigEndian sets the uint64 to a slice of length 8.
-func commitV1Packet(packet Packet) []byte {
+func CommitPacket(packet Packet) []byte {
 	timeoutHeight := packet.GetTimeoutHeight()
 
 	buf := sdk.Uint64ToBigEndian(packet.GetTimeoutTimestamp())
@@ -57,50 +36,6 @@ func commitV1Packet(packet Packet) []byte {
 	return hash[:]
 }
 
-// commitV2Packet returns the V2 packet commitment bytes. The commitment consists of:
-// sha256_hash(timeout_timestamp + timeout_height.RevisionNumber + timeout_height.RevisionHeight)
-// + sha256_hash(destPort) + sha256_hash(destChannel) + sha256_hash(version) + sha256_hash(data))
-// from a given packet. This results in a fixed length preimage.
-// NOTE: A fixed length preimage is ESSENTIAL to prevent relayers from being able
-// to malleate the packet fields and create a commitment hash that matches the original packet.
-// NOTE: sdk.Uint64ToBigEndian sets the uint64 to a slice of length 8.
-func commitV2Packet(packet Packet) []byte {
-	timeoutHeight := packet.GetTimeoutHeight()
-
-	timeoutBuf := sdk.Uint64ToBigEndian(packet.GetTimeoutTimestamp())
-
-	// only hash the timeout height if it is non-zero. This will allow us to remove it entirely in the future
-	if !timeoutHeight.EQ(clienttypes.ZeroHeight()) {
-		revisionNumber := sdk.Uint64ToBigEndian(timeoutHeight.GetRevisionNumber())
-		timeoutBuf = append(timeoutBuf, revisionNumber...)
-
-		revisionHeight := sdk.Uint64ToBigEndian(timeoutHeight.GetRevisionHeight())
-		timeoutBuf = append(timeoutBuf, revisionHeight...)
-	}
-
-	// hash the timeout rather than using a fixed-size preimage directly
-	// this will allow more flexibility in the future with how timeouts are defined
-	timeoutHash := sha256.Sum256(timeoutBuf)
-	buf := timeoutHash[:]
-
-	// hash the destination identifiers since we can no longer retrieve them from the channelEnd
-	portHash := sha256.Sum256([]byte(packet.GetDestPort()))
-	buf = append(buf, portHash[:]...)
-	destinationHash := sha256.Sum256([]byte(packet.GetDestChannel()))
-	buf = append(buf, destinationHash[:]...)
-
-	// hash the app version.
-	versionHash := sha256.Sum256([]byte(packet.AppVersion))
-	buf = append(buf, versionHash[:]...)
-
-	// hash the data
-	dataHash := sha256.Sum256(packet.GetData())
-	buf = append(buf, dataHash[:]...)
-
-	hash := sha256.Sum256(buf)
-	return hash[:]
-}
-
 // CommitAcknowledgement returns the hash of commitment bytes
 func CommitAcknowledgement(data []byte) []byte {
 	hash := sha256.Sum256(data)
@@ -124,29 +59,6 @@ func NewPacket(
 		DestinationChannel: destinationChannel,
 		TimeoutHeight:      timeoutHeight,
 		TimeoutTimestamp:   timeoutTimestamp,
-		ProtocolVersion:    IBC_VERSION_1,
-		Encoding:           "json",
-	}
-}
-
-func NewPacketWithVersion(
-	data []byte,
-	sequence uint64, sourcePort, sourceChannel,
-	destinationPort, destinationChannel string,
-	timeoutHeight clienttypes.Height, timeoutTimestamp uint64,
-	appVersion string,
-) Packet {
-	return Packet{
-		Data:               data,
-		Sequence:           sequence,
-		SourcePort:         sourcePort,
-		SourceChannel:      sourceChannel,
-		DestinationPort:    destinationPort,
-		DestinationChannel: destinationChannel,
-		TimeoutHeight:      timeoutHeight,
-		TimeoutTimestamp:   timeoutTimestamp,
-		ProtocolVersion:    IBC_VERSION_2,
-		AppVersion:         appVersion,
 	}
 }
 
@@ -197,12 +109,6 @@ func (p Packet) ValidateBasic() error {
 	if len(p.Data) == 0 {
 		return errorsmod.Wrap(ErrInvalidPacket, "packet data bytes cannot be empty")
 	}
-	if p.AppVersion != "" && slices.Contains([]IBCVersion{IBC_VERSION_UNSPECIFIED, IBC_VERSION_1}, p.ProtocolVersion) {
-		return errorsmod.Wrapf(ErrInvalidPacket, "app version cannot be specified when packet does not use protocol %s", IBC_VERSION_2)
-	}
-	if strings.TrimSpace(p.AppVersion) == "" && p.ProtocolVersion == IBC_VERSION_2 {
-		return errorsmod.Wrapf(ErrInvalidPacket, "app version must be specified when packet uses protocol %s", IBC_VERSION_2)
-	}
 
 	return nil
 }

modules/core/04-channel/types/packet_test.go

@@ -5,41 +5,13 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	clienttypes "github.com/cosmos/ibc-go/v9/modules/core/02-client/types"
 	"github.com/cosmos/ibc-go/v9/modules/core/04-channel/types"
 )
 
 func TestCommitPacket(t *testing.T) {
-	// V1 packet1 commitment
-	packet1 := types.NewPacket(validPacketData, 1, portid, chanid, cpportid, cpchanid, timeoutHeight, timeoutTimestamp)
-	commitment1 := types.CommitPacket(packet1)
-	require.NotNil(t, commitment1)
-
-	// V2 packet commitment with empty app version
-	packet2 := types.NewPacketWithVersion(validPacketData, 1, portid, chanid, cpportid, cpchanid, timeoutHeight, timeoutTimestamp, "")
-	commitment2 := types.CommitPacket(packet2)
-	require.NotNil(t, commitment2)
-
-	// even though app version is empty for both packet1 and packet2
-	// the commitment is different because we use Eureka protocol for packet2
-	require.NotEqual(t, commitment1, commitment2)
-
-	// V2 packet commitment with non-empty app version
-	packet3 := types.NewPacketWithVersion(validPacketData, 1, portid, chanid, cpportid, cpchanid, timeoutHeight, timeoutTimestamp, validVersion)
-	commitment3 := types.CommitPacket(packet3)
-	require.NotNil(t, commitment3)
-
-	require.NotEqual(t, commitment1, commitment3)
-	require.NotEqual(t, commitment2, commitment3)
-
-	// V2 packet commitment with non-empty app version and zero timeout height
-	packet4 := types.NewPacketWithVersion(validPacketData, 1, portid, chanid, cpportid, cpchanid, clienttypes.ZeroHeight(), timeoutTimestamp, validVersion)
-	commitment4 := types.CommitPacket(packet4)
-	require.NotNil(t, commitment4)
-
-	require.NotEqual(t, commitment1, commitment4)
-	require.NotEqual(t, commitment2, commitment4)
-	require.NotEqual(t, commitment3, commitment4)
+	packet := types.NewPacket(validPacketData, 1, portid, chanid, cpportid, cpchanid, timeoutHeight, timeoutTimestamp)
+	commitment := types.CommitPacket(packet)
+	require.NotNil(t, commitment)
 }
 
 func TestPacketValidateBasic(t *testing.T) {
@@ -58,11 +30,6 @@ func TestPacketValidateBasic(t *testing.T) {
 		{types.NewPacket(validPacketData, 1, portid, chanid, cpportid, cpchanid, disabledTimeout, 0), false, "disabled both timeout height and timestamp"},
 		{types.NewPacket(validPacketData, 1, portid, chanid, cpportid, cpchanid, disabledTimeout, timeoutTimestamp), true, "disabled timeout height, valid timeout timestamp"},
 		{types.NewPacket(validPacketData, 1, portid, chanid, cpportid, cpchanid, timeoutHeight, 0), true, "disabled timeout timestamp, valid timeout height"},
-		{types.NewPacketWithVersion(validPacketData, 1, portid, chanid, cpportid, cpchanid, timeoutHeight, timeoutTimestamp, "version"), true, "valid v2 packet"},
-		{types.Packet{1, portid, chanid, cpportid, cpchanid, validPacketData, timeoutHeight, timeoutTimestamp, types.IBC_VERSION_1, "version", "json"}, false, "invalid specifying of app version with protocol version 1"},
-		{types.Packet{1, portid, chanid, cpportid, cpchanid, validPacketData, timeoutHeight, timeoutTimestamp, types.IBC_VERSION_UNSPECIFIED, "version", "json"}, false, "invalid specifying of app version with unspecified protocol version"},
-		{types.NewPacketWithVersion(validPacketData, 1, portid, chanid, cpportid, cpchanid, timeoutHeight, timeoutTimestamp, ""), false, "app version must be specified when packet uses protocol version 2"},
-		{types.NewPacketWithVersion(validPacketData, 1, portid, chanid, cpportid, cpchanid, timeoutHeight, timeoutTimestamp, "      "), false, "app version must be specified when packet uses protocol version 2"},
 	}
 
 	for i, tc := range testCases {

proto/ibc/core/channel/v1/channel.proto

@@ -90,21 +90,6 @@ enum Order {
   ORDER_ORDERED = 2 [(gogoproto.enumvalue_customname) = "ORDERED"];
 }
 
-// IBCVersion defines the version that the IBC packet intends to use.
-// This allows asynchronous upgrades over time as unsupported IBC Versions
-// will simply be rejected by the receiver and timed out on sender.
-enum IBCVersion {
-  option (gogoproto.goproto_enum_prefix) = false;
-
-  // zero-value for IBC version.
-  // This will be treated as a classic packet
-  IBC_VERSION_UNSPECIFIED = 0;
-  // IBC version 1 implements the Classic protocol
-  IBC_VERSION_1 = 1;
-  // IBC version 2 implements the Eureka protocol
-  IBC_VERSION_2 = 2;
-}
-
 // Counterparty defines a channel end counterparty
 message Counterparty {
   option (gogoproto.goproto_getters) = false;
@@ -137,12 +122,6 @@ message Packet {
   ibc.core.client.v1.Height timeout_height = 7 [(gogoproto.nullable) = false];
   // block timestamp (in nanoseconds) after which the packet times out
   uint64 timeout_timestamp = 8;
-  // which IBC version to use to commit this packet
-  IBCVersion protocol_version = 9;
-  // version which application should use to process the packet data
-  string app_version = 10;
-  // encoding to be used TODO clearer message
-  string encoding = 11;
 }
 
 // PacketState defines the generic type necessary to retrieve and store