@agoric/cosmos 0.35.0-u21.0.1 → 0.35.0-u22.1

package/x/vtransfer/utils_test.go

@@ -1,19 +1,20 @@
 package vtransfer_test
 
 import (
+	"encoding/hex"
 	"fmt"
 	"strconv"
 
-	sdk "github.com/cosmos/cosmos-sdk/types"
-	clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
-	channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
-	host "github.com/cosmos/ibc-go/v7/modules/core/24-host"
-	ibctesting "github.com/cosmos/ibc-go/v7/testing"
+	abci "github.com/cometbft/cometbft/abci/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"
+	host "github.com/cosmos/ibc-go/v8/modules/core/24-host"
+	ibctesting "github.com/cosmos/ibc-go/v8/testing"
 )
 
 // acknowledgePacketWithResult sends a MsgAcknowledgement to the channel associated with the endpoint.
 // [AGORIC] Would be nice to create a new ibctesting.AcknowledgePacketWithResult
-func acknowledgePacketWithResult(endpoint *ibctesting.Endpoint, packet channeltypes.Packet, ack []byte) (*sdk.Result, error) {
+func acknowledgePacketWithResult(endpoint *ibctesting.Endpoint, packet channeltypes.Packet, ack []byte) (*abci.ExecTxResult, error) {
 	// get proof of acknowledgement on counterparty
 	packetKey := host.PacketAcknowledgementKey(packet.GetDestPort(), packet.GetDestChannel(), packet.GetSequence())
 	proof, proofHeight := endpoint.Counterparty.QueryProof(packetKey)
@@ -26,17 +27,24 @@ func acknowledgePacketWithResult(endpoint *ibctesting.Endpoint, packet channelty
 // ParseAckFromEvents parses events emitted from a MsgRecvPacket and returns the
 // acknowledgement.
 // [AGORIC] Signature taken from ibctesting.ParseAckFromEvents
-func ParseAckFromEvents(events sdk.Events) ([]byte, error) {
+func ParseAckFromEvents(events []abci.Event) ([]byte, error) {
 	return ParseAckFromFilteredEvents(events, channeltypes.EventTypeWriteAck)
 }
 
 // ParseAckFromFilteredEvents parses events emitted matching filteredType and returns the acknowledgement.
 // [AGORIC] Would be nice to improve the implementation and upstream it
-func ParseAckFromFilteredEvents(events sdk.Events, filteredType string) ([]byte, error) {
+func ParseAckFromFilteredEvents(events []abci.Event, filteredType string) ([]byte, error) {
 	for _, ev := range events {
 		if ev.Type == filteredType {
 			for _, attr := range ev.Attributes {
-				if attr.Key == channeltypes.AttributeKeyAck { //nolint:staticcheck // DEPRECATED
+				switch attr.Key {
+				case channeltypes.AttributeKeyAckHex:
+					hexAck, err := hex.DecodeString(attr.Value)
+					if err != nil {
+						return nil, fmt.Errorf("failed to parse hex ack: %w", err)
+					}
+					return hexAck, nil
+				case channeltypes.AttributeKeyAck: //nolint:staticcheck // DEPRECATED
 					return []byte(attr.Value), nil
 				}
 			}
@@ -48,18 +56,25 @@ func ParseAckFromFilteredEvents(events sdk.Events, filteredType string) ([]byte,
 // ParsePacketFromEvents parses the send_packet type events emitted by the IBC
 // module and returns the packet.
 // [AGORIC] Signature taken from ibctesting.ParsePacketFromEvents
-func ParsePacketFromEvents(events sdk.Events) (channeltypes.Packet, error) {
+func ParsePacketFromEvents(events []abci.Event) (channeltypes.Packet, error) {
 	return ParsePacketFromFilteredEvents(events, channeltypes.EventTypeSendPacket)
 }
 
 // ParsePacketFromFilteredEvents parses events emitted matching filteredType and returns the packet.
 // [AGORIC] Would be nice to improve the implementation and upstream it
-func ParsePacketFromFilteredEvents(events sdk.Events, filteredType string) (channeltypes.Packet, error) {
+func ParsePacketFromFilteredEvents(events []abci.Event, filteredType string) (channeltypes.Packet, error) {
 	for _, ev := range events {
 		if ev.Type == filteredType {
 			packet := channeltypes.Packet{}
 			for _, attr := range ev.Attributes {
 				switch attr.Key {
+				case channeltypes.AttributeKeyDataHex:
+					hexData, err := hex.DecodeString(attr.Value)
+					if err != nil {
+						return channeltypes.Packet{}, fmt.Errorf("failed to parse hex data: %w", err)
+					}
+					packet.Data = hexData
+
 				case channeltypes.AttributeKeyData: //nolint:staticcheck // DEPRECATED
 					packet.Data = []byte(attr.Value)