@agoric/cosmos 0.34.2-upgrade-19-dev-2a71f04.0 → 0.34.2-upgrade-20-dev-31be299.0

package/x/vibc/keeper/triggers.go

@@ -3,47 +3,21 @@ package keeper
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	clienttypes "github.com/cosmos/ibc-go/v6/modules/core/02-client/types"
-	channeltypes "github.com/cosmos/ibc-go/v6/modules/core/04-channel/types"
 	ibcexported "github.com/cosmos/ibc-go/v6/modules/core/exported"
 
-	"github.com/Agoric/agoric-sdk/golang/cosmos/vm"
+	agtypes "github.com/Agoric/agoric-sdk/golang/cosmos/types"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/vibc/types"
 )
 
-func reifyPacket(packet ibcexported.PacketI) channeltypes.Packet {
-
-	timeoutHeight := clienttypes.MustParseHeight(packet.GetTimeoutHeight().String())
-	return channeltypes.Packet{
-		Sequence:           packet.GetSequence(),
-		SourcePort:         packet.GetSourcePort(),
-		SourceChannel:      packet.GetSourceChannel(),
-		DestinationPort:    packet.GetDestPort(),
-		DestinationChannel: packet.GetDestChannel(),
-		Data:               packet.GetData(),
-		TimeoutHeight:      timeoutHeight,
-		TimeoutTimestamp:   packet.GetTimeoutTimestamp(),
-	}
-}
-
-type WriteAcknowledgementEvent struct {
-	*vm.ActionHeader `actionType:"IBC_EVENT"`
-	Event            string              `json:"event" default:"writeAcknowledgement"`
-	Target           string              `json:"target"`
-	Packet           channeltypes.Packet `json:"packet"`
-	Acknowledgement  []byte              `json:"acknowledgement"`
-	Relayer          sdk.AccAddress      `json:"relayer"`
-}
-
 func (k Keeper) TriggerWriteAcknowledgement(
 	ctx sdk.Context,
 	target string,
 	packet ibcexported.PacketI,
 	acknowledgement ibcexported.Acknowledgement,
 ) error {
-	event := WriteAcknowledgementEvent{
+	event := types.WriteAcknowledgementEvent{
 		Target:          target,
-		Packet:          reifyPacket(packet),
+		Packet:          agtypes.CopyToIBCPacket(packet),
 		Acknowledgement: acknowledgement.Acknowledgement(),
 	}
 
@@ -64,7 +38,7 @@ func (k Keeper) TriggerOnAcknowledgementPacket(
 ) error {
 	event := types.AcknowledgementPacketEvent{
 		Target:          target,
-		Packet:          reifyPacket(packet),
+		Packet:          agtypes.CopyToIBCPacket(packet),
 		Acknowledgement: acknowledgement,
 		Relayer:         relayer,
 	}
@@ -85,7 +59,7 @@ func (k Keeper) TriggerOnTimeoutPacket(
 ) error {
 	event := types.TimeoutPacketEvent{
 		Target:  target,
-		Packet:  reifyPacket(packet),
+		Packet:  agtypes.CopyToIBCPacket(packet),
 		Relayer: relayer,
 	}
 

package/x/vibc/types/expected_keepers.go

@@ -33,6 +33,7 @@ type ChannelKeeper interface {
 		connectionHops []string, counterparty channel.Counterparty, version string)
 	WriteOpenTryChannel(ctx sdk.Context, portID, channelID string, order channel.Order,
 		connectionHops []string, counterparty channel.Counterparty, version string)
+	WriteOpenAckChannel(ctx sdk.Context, portID, channelID, counterpartyVersion, counterpartyChannelID string)
 	ChanCloseInit(ctx sdk.Context, portID, channelID string, chanCap *capability.Capability) error
 	TimeoutExecuted(ctx sdk.Context, channelCap *capability.Capability, packet ibcexported.PacketI) error
 }

package/x/vibc/types/ibc_module.go

@@ -4,6 +4,7 @@ import (
 	fmt "fmt"
 
 	sdkioerrors "cosmossdk.io/errors"
+	agtypes "github.com/Agoric/agoric-sdk/golang/cosmos/types"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/vm"
 	capability "github.com/cosmos/cosmos-sdk/x/capability/types"
 	channeltypes "github.com/cosmos/ibc-go/v6/modules/core/04-channel/types"
@@ -45,6 +46,15 @@ func NewIBCModule(impl IBCModuleImpl) IBCModule {
 	}
 }
 
+type WriteAcknowledgementEvent struct {
+	*vm.ActionHeader `actionType:"IBC_EVENT"`
+	Event            string            `json:"event" default:"writeAcknowledgement"`
+	Target           string            `json:"target"`
+	Packet           agtypes.IBCPacket `json:"packet"`
+	Acknowledgement  []byte            `json:"acknowledgement"`
+	Relayer          sdk.AccAddress    `json:"relayer"`
+}
+
 type ChannelOpenInitEvent struct {
 	*vm.ActionHeader `actionType:"IBC_EVENT"`
 	Event            string                    `json:"event" default:"channelOpenInit"`
@@ -253,10 +263,10 @@ func (im IBCModule) OnChanCloseConfirm(
 
 type ReceivePacketEvent struct {
 	*vm.ActionHeader `actionType:"IBC_EVENT"`
-	Event            string              `json:"event" default:"receivePacket"`
-	Target           string              `json:"target,omitempty"`
-	Packet           channeltypes.Packet `json:"packet"`
-	Relayer          sdk.AccAddress      `json:"relayer"`
+	Event            string            `json:"event" default:"receivePacket"`
+	Target           string            `json:"target,omitempty"`
+	Packet           agtypes.IBCPacket `json:"packet"`
+	Relayer          sdk.AccAddress    `json:"relayer"`
 }
 
 func (im IBCModule) OnRecvPacket(
@@ -273,7 +283,7 @@ func (im IBCModule) OnRecvPacket(
 	// the same packets.
 
 	event := ReceivePacketEvent{
-		Packet:  packet,
+		Packet:  agtypes.CopyToIBCPacket(packet),
 		Relayer: relayer,
 	}
 
@@ -287,11 +297,11 @@ func (im IBCModule) OnRecvPacket(
 
 type AcknowledgementPacketEvent struct {
 	*vm.ActionHeader `actionType:"IBC_EVENT"`
-	Event            string              `json:"event" default:"acknowledgementPacket"`
-	Target           string              `json:"target,omitempty"`
-	Packet           channeltypes.Packet `json:"packet"`
-	Acknowledgement  []byte              `json:"acknowledgement"`
-	Relayer          sdk.AccAddress      `json:"relayer"`
+	Event            string            `json:"event" default:"acknowledgementPacket"`
+	Target           string            `json:"target,omitempty"`
+	Packet           agtypes.IBCPacket `json:"packet"`
+	Acknowledgement  []byte            `json:"acknowledgement"`
+	Relayer          sdk.AccAddress    `json:"relayer"`
 }
 
 func (im IBCModule) OnAcknowledgementPacket(
@@ -301,7 +311,7 @@ func (im IBCModule) OnAcknowledgementPacket(
 	relayer sdk.AccAddress,
 ) error {
 	event := AcknowledgementPacketEvent{
-		Packet:          packet,
+		Packet:          agtypes.CopyToIBCPacket(packet),
 		Acknowledgement: acknowledgement,
 		Relayer:         relayer,
 	}
@@ -316,10 +326,10 @@ func (im IBCModule) OnAcknowledgementPacket(
 
 type TimeoutPacketEvent struct {
 	*vm.ActionHeader `actionType:"IBC_EVENT"`
-	Event            string              `json:"event" default:"timeoutPacket"`
-	Target           string              `json:"target,omitempty"`
-	Packet           channeltypes.Packet `json:"packet"`
-	Relayer          sdk.AccAddress      `json:"relayer"`
+	Event            string            `json:"event" default:"timeoutPacket"`
+	Target           string            `json:"target,omitempty"`
+	Packet           agtypes.IBCPacket `json:"packet"`
+	Relayer          sdk.AccAddress    `json:"relayer"`
 }
 
 func (im IBCModule) OnTimeoutPacket(
@@ -328,7 +338,7 @@ func (im IBCModule) OnTimeoutPacket(
 	relayer sdk.AccAddress,
 ) error {
 	event := TimeoutPacketEvent{
-		Packet:  packet,
+		Packet:  agtypes.CopyToIBCPacket(packet),
 		Relayer: relayer,
 	}
 

package/x/vibc/types/receiver.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 
+	"github.com/Agoric/agoric-sdk/golang/cosmos/types"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/vm"
 	channeltypes "github.com/cosmos/ibc-go/v6/modules/core/04-channel/types"
 
@@ -39,14 +40,14 @@ func NewReceiver(impl ReceiverImpl) Receiver {
 }
 
 type portMessage struct { // comes from swingset's IBC handler
-	Type              string              `json:"type"` // IBC_METHOD
-	Method            string              `json:"method"`
-	Packet            channeltypes.Packet `json:"packet"`
-	RelativeTimeoutNs uint64              `json:"relativeTimeoutNs,string"`
-	Order             string              `json:"order"`
-	Hops              []string            `json:"hops"`
-	Version           string              `json:"version"`
-	Ack               []byte              `json:"ack"`
+	Type              string          `json:"type"` // IBC_METHOD
+	Method            string          `json:"method"`
+	Packet            types.IBCPacket `json:"packet"`
+	RelativeTimeoutNs uint64          `json:"relativeTimeoutNs,string"`
+	Order             string          `json:"order"`
+	Hops              []string        `json:"hops"`
+	Version           string          `json:"version"`
+	Ack               []byte          `json:"ack"`
 }
 
 func stringToOrder(order string) channeltypes.Order {
@@ -121,21 +122,20 @@ func (ir Receiver) Receive(cctx context.Context, jsonRequest string) (jsonReply
 			timeoutTimestamp = uint64(ctx.BlockTime().UnixNano()) + msg.RelativeTimeoutNs
 		}
 
-		packet := channeltypes.NewPacket(
-			msg.Packet.Data, 0,
-			msg.Packet.SourcePort, msg.Packet.SourceChannel,
-			msg.Packet.DestinationPort, msg.Packet.DestinationChannel,
-			msg.Packet.TimeoutHeight, timeoutTimestamp,
-		)
+		packet := types.CopyToIBCPacket(msg.Packet)
+		packet.TimeoutTimestamp = timeoutTimestamp
 		seq, err := impl.ReceiveSendPacket(ctx, packet)
 		if err == nil {
 			packet.Sequence = seq
-			bytes, err := json.Marshal(&packet)
+			bytes, err := json.Marshal(packet)
 			if err == nil {
 				jsonReply = string(bytes)
 			}
 		}
 
+	case "initOpenExecuted":
+		err = fmt.Errorf("initOpenExecuted not yet implemented")
+
 	case "tryOpenExecuted":
 		err = impl.ReceiveWriteOpenTryChannel(
 			ctx, msg.Packet,

package/x/vstorage/README.md

@@ -128,11 +128,3 @@ $ curl -sS 'https://main.api.agoric.net/agoric/vstorage/children/published.commi
   "pagination": null
 }
 ```
-
-## Arbitrary-response HTTP interface
-
-This depends upon appModule `LegacyQuerierHandler` functionality that is [removed from cosmos-sdk as of v0.47](https://github.com/cosmos/cosmos-sdk/blob/fa4d87ef7e6d87aaccc94c337ffd2fe90fcb7a9d/CHANGELOG.md#api-breaking-changes-3)
-
-[legacy querier](./keeper/querier.go)
-* /custom/vstorage/children/$path
-* /custom/vstorage/data/$path

package/x/vstorage/keeper/keeper.go

@@ -11,7 +11,9 @@ import (
 	"strings"
 
 	sdkmath "cosmossdk.io/math"
+	metrics "github.com/armon/go-metrics"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
+	"github.com/cosmos/cosmos-sdk/telemetry"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	db "github.com/tendermint/tm-db"
 
@@ -117,6 +119,27 @@ func NewKeeper(storeKey storetypes.StoreKey) Keeper {
 	}
 }
 
+// size_increase and size_decrease metrics represent total writes and deletes *issued*
+// respectively, which may differ from the total number of bytes committed/freed
+// to/from the store due to the store's internal implementation.
+var MetricKeyStoreSizeIncrease = []string{"store", "size_increase"}
+var MetricKeyStoreSizeDecrease = []string{"store", "size_decrease"}
+const MetricLabelStoreKey = "storeKey"
+
+// reportStoreSizeMetrics exports store size increase/decrease metrics
+// when Cosmos telemetry is enabled.
+func (k Keeper) reportStoreSizeMetrics(increase int, decrease int) {
+	metricsLabel := []metrics.Label{
+		telemetry.NewLabel(MetricLabelStoreKey, k.storeKey.Name()),
+	}
+	if increase > 0 {
+		telemetry.IncrCounterWithLabels(MetricKeyStoreSizeIncrease, float32(increase), metricsLabel)
+	}
+	if decrease > 0 {
+		telemetry.IncrCounterWithLabels(MetricKeyStoreSizeDecrease, float32(decrease), metricsLabel)
+	}
+}
+
 // ExportStorage fetches all storage
 func (k Keeper) ExportStorage(ctx sdk.Context) []*types.DataEntry {
 	return k.ExportStorageFromPrefix(ctx, "")
@@ -215,6 +238,8 @@ func (k Keeper) RemoveEntriesWithPrefix(ctx sdk.Context, pathPrefix string) {
 	keys := getEncodedKeysWithPrefixFromIterator(iterator, descendantPrefix)
 
 	for _, key := range keys {
+		rawValue := store.Get(key)
+		k.reportStoreSizeMetrics(0, len(key) + len(rawValue))
 		store.Delete(key)
 	}
 
@@ -366,18 +391,23 @@ func (k Keeper) SetStorage(ctx sdk.Context, entry agoric.KVEntry) {
 	store := ctx.KVStore(k.storeKey)
 	path := entry.Key()
 	encodedKey := types.PathToEncodedKey(path)
+	oldRawValue := store.Get(encodedKey)
 
 	if !entry.HasValue() {
 		if !k.HasChildren(ctx, path) {
 			// We have no children, can delete.
+			k.reportStoreSizeMetrics(0, len(encodedKey) + len(oldRawValue))
 			store.Delete(encodedKey)
 		} else {
+			// We have children, mark as an empty placeholder without deleting.
+			k.reportStoreSizeMetrics(len(types.EncodedNoDataValue), len(oldRawValue))
 			store.Set(encodedKey, types.EncodedNoDataValue)
 		}
 	} else {
 		// Update the value.
-		bz := bytes.Join([][]byte{types.EncodedDataPrefix, []byte(entry.StringValue())}, []byte{})
-		store.Set(encodedKey, bz)
+		newRawValue := bytes.Join([][]byte{types.EncodedDataPrefix, []byte(entry.StringValue())}, []byte{})
+		k.reportStoreSizeMetrics(len(newRawValue), len(oldRawValue))
+		store.Set(encodedKey, newRawValue)
 	}
 
 	// Update our other parent children.
@@ -390,7 +420,9 @@ func (k Keeper) SetStorage(ctx sdk.Context, entry agoric.KVEntry) {
 				// this and further ancestors are needed, skip out
 				break
 			}
-			store.Delete(types.PathToEncodedKey(ancestor))
+			encodedAncestor := types.PathToEncodedKey(ancestor)
+			k.reportStoreSizeMetrics(0, len(encodedAncestor) + len(types.EncodedNoDataValue))
+			store.Delete(encodedAncestor)
 		}
 	} else {
 		// add placeholders as needed
@@ -400,7 +432,9 @@ func (k Keeper) SetStorage(ctx sdk.Context, entry agoric.KVEntry) {
 				// The ancestor exists, implying all further ancestors exist, so we can break.
 				break
 			}
-			store.Set(types.PathToEncodedKey(ancestor), types.EncodedNoDataValue)
+			encodedAncestor := types.PathToEncodedKey(ancestor)
+			k.reportStoreSizeMetrics(len(encodedAncestor) + len(types.EncodedNoDataValue), 0)
+			store.Set(encodedAncestor, types.EncodedNoDataValue)
 		}
 	}
 }

package/x/vstorage/types/path_keys.go

@@ -10,14 +10,13 @@ import (
 // - A "path" is a sequence of zero or more dot-separated nonempty segments
 // using a restricted alphabet of ASCII alphanumerics plus underscore and dash,
 // consistent with packages/internal/src/lib-chainStorage.js but not currently
-// enforcing a length restriction on path segments.
-// So `""`, `"foo"`, and `"foo.bar__baz.qux--quux"` are paths but `"."`,
-// `"foo/bar"`, `"fo\to"`, and `"foö"` are not.
-// This alphabet might be expanded in the future, but such expansion SHOULD NOT
-// include control characters (including those that are not ASCII, such as
-// U+202E RIGHT-TO-LEFT OVERRIDE), slash `/` (which separates ABCI request path
-// segments in e.g. `custom/vstorage/data/foo`), or backslash `\` (which should
-// be reserved for adding escape sequences).
+// enforcing a length restriction on path segments.  So `""`, `"foo"`, and
+// `"foo.bar__baz.qux--quux"` are paths but `"."`, `"foo/bar"`, `"fo\to"`, and
+// `"foö"` are not.  This alphabet might be expanded in the future, but such
+// expansion SHOULD NOT include control characters (including those that are not
+// ASCII, such as U+202E RIGHT-TO-LEFT OVERRIDE), slash `/` (which separates
+// ABCI request path segments in e.g. `/agoric.vstorage.Query/Data`), or
+// backslash `\` (which should be reserved for adding escape sequences).
 //
 // - An encoded key for a path is the path prefixed with its length (in ASCII
 // digits), separated by nul, followed by the path with dots replaced with nul.

package/x/vtransfer/handler.go

@@ -5,7 +5,9 @@ import (
 
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/vtransfer/keeper"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+
+	sdkioerrors "cosmossdk.io/errors"
+	sdktypeserrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
 
 // NewHandler returns a handler for "vtransfer" type messages.
@@ -14,7 +16,7 @@ func NewHandler(keeper keeper.Keeper) sdk.Handler {
 		switch msg := msg.(type) {
 		default:
 			errMsg := fmt.Sprintf("Unrecognized vtransfer Msg type: %T", msg)
-			return nil, sdkerrors.Wrap(sdkerrors.ErrUnknownRequest, errMsg)
+			return nil, sdkioerrors.Wrap(sdktypeserrors.ErrUnknownRequest, errMsg)
 		}
 	}
 }

package/x/vtransfer/ibc_middleware_test.go

@@ -23,7 +23,6 @@ import (
 	"github.com/Agoric/agoric-sdk/golang/cosmos/types"
 	swingsettesting "github.com/Agoric/agoric-sdk/golang/cosmos/x/swingset/testing"
 	swingsettypes "github.com/Agoric/agoric-sdk/golang/cosmos/x/swingset/types"
-	vibckeeper "github.com/Agoric/agoric-sdk/golang/cosmos/x/vibc/keeper"
 	vibctypes "github.com/Agoric/agoric-sdk/golang/cosmos/x/vibc/types"
 
 	"github.com/cosmos/cosmos-sdk/baseapp"
@@ -653,7 +652,7 @@ func (s *IntegrationTestSuite) TestHops() {
 					expectedRecords := []swingsettypes.InboundQueueRecord{}
 					if tc.receiverIsTarget {
 						expectedRecords = append(expectedRecords, swingsettypes.InboundQueueRecord{
-							Action: &vibckeeper.WriteAcknowledgementEvent{
+							Action: &vibctypes.WriteAcknowledgementEvent{
 								ActionHeader: &vm.ActionHeader{
 									Type:        "VTRANSFER_IBC_EVENT",
 									BlockHeight: writeAcknowledgementHeight,
@@ -661,7 +660,7 @@ func (s *IntegrationTestSuite) TestHops() {
 								},
 								Event:           "writeAcknowledgement",
 								Target:          baseReceiver,
-								Packet:          sendPacket,
+								Packet:          types.CopyToIBCPacket(sendPacket),
 								Acknowledgement: expectedAck.Acknowledgement(),
 							},
 							Context: swingsettypes.ActionContext{
@@ -765,7 +764,7 @@ func (s *IntegrationTestSuite) TestHops() {
 					expectedRecords := []swingsettypes.InboundQueueRecord{}
 					if tc.senderIsTarget {
 						expectedRecords = append(expectedRecords, swingsettypes.InboundQueueRecord{
-							Action: &vibckeeper.WriteAcknowledgementEvent{
+							Action: &vibctypes.AcknowledgementPacketEvent{
 								ActionHeader: &vm.ActionHeader{
 									Type:        "VTRANSFER_IBC_EVENT",
 									BlockHeight: acknowledgementHeight,
@@ -773,7 +772,7 @@ func (s *IntegrationTestSuite) TestHops() {
 								},
 								Event:           "acknowledgementPacket",
 								Target:          baseSender,
-								Packet:          expectedPacket,
+								Packet:          types.CopyToIBCPacket(expectedPacket),
 								Acknowledgement: ack.Acknowledgement(),
 								Relayer:         s.chainA.SenderAccount.GetAddress(),
 							},

package/x/vtransfer/keeper/keeper.go

@@ -10,12 +10,14 @@ import (
 	"github.com/cosmos/cosmos-sdk/store/prefix"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+
+	sdkioerrors "cosmossdk.io/errors"
+	sdktypeserrors "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"
 
-	"github.com/Agoric/agoric-sdk/golang/cosmos/types"
+	agtypes "github.com/Agoric/agoric-sdk/golang/cosmos/types"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/vm"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/vibc"
 	vibctypes "github.com/Agoric/agoric-sdk/golang/cosmos/x/vibc/types"
@@ -92,7 +94,7 @@ func (i4 *ics4Wrapper) SendPacket(
 	}
 
 	var strippedData []byte
-	_, err = types.ExtractBaseAddressFromData(i4.k.cdc, data, types.RoleSender, &strippedData)
+	_, err = agtypes.ExtractBaseAddressFromData(i4.k.cdc, data, agtypes.RoleSender, &strippedData)
 	if err != nil {
 		return sequence, err
 	}
@@ -105,7 +107,7 @@ func (i4 *ics4Wrapper) SendPacket(
 
 	// Store the original data if it is hooked for later retrieval by middleware.
 	if !i4.k.debug.DoNotStore && !bytes.Equal(strippedData, data) {
-		packetStore, packetKey := i4.k.PacketStore(ctx, types.PacketSrc, sourcePort, sourceChannel, sequence)
+		packetStore, packetKey := i4.k.PacketStore(ctx, agtypes.PacketSrc, sourcePort, sourceChannel, sequence)
 		packetStore.Set(packetKey, data)
 	}
 
@@ -118,14 +120,8 @@ func (i4 *ics4Wrapper) WriteAcknowledgement(
 	packet ibcexported.PacketI,
 	ack ibcexported.Acknowledgement,
 ) error {
-	origPacket := channeltypes.NewPacket(
-		packet.GetData(), packet.GetSequence(),
-		packet.GetSourcePort(), packet.GetSourceChannel(),
-		packet.GetDestPort(), packet.GetDestChannel(),
-		clienttypes.MustParseHeight(packet.GetTimeoutHeight().String()),
-		packet.GetTimeoutTimestamp(),
-	)
-	packetStore, packetKey := i4.k.PacketStoreFromOrigin(ctx, types.PacketDst, packet)
+	origPacket := agtypes.CopyToIBCPacket(packet)
+	packetStore, packetKey := i4.k.PacketStoreFromOrigin(ctx, agtypes.PacketDst, packet)
 	if packetStore.Has(packetKey) {
 		origPacket.Data = packetStore.Get(packetKey)
 		packetStore.Delete(packetKey)
@@ -209,20 +205,20 @@ func sequencePath(sequence uint64) string {
 // PacketStore returns a new KVStore for storing packet data, and a key for
 // that store.  The KVStore is divided into src or dst PacketOrigins because we
 // need to record separate data for packets travelling in each direction.
-func (k Keeper) PacketStore(ctx sdk.Context, ourOrigin types.PacketOrigin, ourPort string, ourChannel string, sequence uint64) (storetypes.KVStore, []byte) {
+func (k Keeper) PacketStore(ctx sdk.Context, ourOrigin agtypes.PacketOrigin, ourPort string, ourChannel string, sequence uint64) (storetypes.KVStore, []byte) {
 	key := fmt.Sprintf("%s/%s/%s", ourOrigin, channelPath(ourPort, ourChannel), sequencePath(sequence))
 	packetKey := []byte(key)
 	return prefix.NewStore(ctx.KVStore(k.key), []byte(packetDataStoreKeyPrefix)), packetKey
 }
 
-func (k Keeper) PacketStoreFromOrigin(ctx sdk.Context, ourOrigin types.PacketOrigin, packet ibcexported.PacketI) (storetypes.KVStore, []byte) {
+func (k Keeper) PacketStoreFromOrigin(ctx sdk.Context, ourOrigin agtypes.PacketOrigin, packet ibcexported.PacketI) (storetypes.KVStore, []byte) {
 	var ourPort, ourChannel string
 
 	switch ourOrigin {
-	case types.PacketSrc:
+	case agtypes.PacketSrc:
 		ourPort = packet.GetSourcePort()
 		ourChannel = packet.GetSourceChannel()
-	case types.PacketDst:
+	case agtypes.PacketDst:
 		ourPort = packet.GetDestPort()
 		ourChannel = packet.GetDestChannel()
 	default:
@@ -236,10 +232,10 @@ func (k Keeper) PacketStoreFromOrigin(ctx sdk.Context, ourOrigin types.PacketOri
 // Many error acknowledgments are sent synchronously, but most cases instead return nil
 // to tell the IBC system that acknowledgment is async (i.e., that WriteAcknowledgement
 // will be called later, after the VM has dealt with the packet).
-func (k Keeper) InterceptOnRecvPacket(ctx sdk.Context, ibcModule porttypes.IBCModule, packet channeltypes.Packet, relayer sdk.AccAddress) ibcexported.Acknowledgement {
+func (k Keeper) InterceptOnRecvPacket(ctx sdk.Context, ibcModule porttypes.IBCModule, packet ibcexported.PacketI, relayer sdk.AccAddress) ibcexported.Acknowledgement {
 	// Pass every (stripped-receiver) inbound packet to the wrapped IBC module.
-	var strippedPacket channeltypes.Packet
-	_, err := types.ExtractBaseAddressFromPacket(k.cdc, packet, types.RoleReceiver, &strippedPacket)
+	var strippedPacket agtypes.IBCPacket
+	_, err := agtypes.ExtractBaseAddressFromPacket(k.cdc, packet, agtypes.RoleReceiver, &strippedPacket)
 	if err != nil {
 		return channeltypes.NewErrorAcknowledgement(err)
 	}
@@ -249,16 +245,16 @@ func (k Keeper) InterceptOnRecvPacket(ctx sdk.Context, ibcModule porttypes.IBCMo
 	capName := host.ChannelCapabilityPath(portID, channelID)
 	chanCap, ok := k.vibcKeeper.GetCapability(ctx, capName)
 	if !ok {
-		err := sdkerrors.Wrapf(channeltypes.ErrChannelCapabilityNotFound, "could not retrieve channel capability at: %s", capName)
+		err := sdkioerrors.Wrapf(channeltypes.ErrChannelCapabilityNotFound, "could not retrieve channel capability at: %s", capName)
 		return channeltypes.NewErrorAcknowledgement(err)
 	}
 
 	if !k.debug.DoNotStore && !bytes.Equal(strippedPacket.GetData(), packet.GetData()) {
-		packetStore, packetKey := k.PacketStore(ctx, types.PacketDst, portID, channelID, packet.GetSequence())
+		packetStore, packetKey := k.PacketStore(ctx, agtypes.PacketDst, portID, channelID, packet.GetSequence())
 		packetStore.Set(packetKey, packet.GetData())
 	}
 
-	ack := ibcModule.OnRecvPacket(ctx, strippedPacket, relayer)
+	ack := ibcModule.OnRecvPacket(ctx, agtypes.CopyToChannelPacket(strippedPacket), relayer)
 	if ack == nil {
 		// Already declared to be an async ack.  Will be cleaned up by ics4Wrapper.WriteAcknowledgement.
 		return nil
@@ -274,23 +270,23 @@ func (k Keeper) InterceptOnRecvPacket(ctx sdk.Context, ibcModule porttypes.IBCMo
 func (k Keeper) InterceptOnAcknowledgementPacket(
 	ctx sdk.Context,
 	ibcModule porttypes.IBCModule,
-	packet channeltypes.Packet,
+	packet ibcexported.PacketI,
 	acknowledgement []byte,
 	relayer sdk.AccAddress,
 ) error {
-	baseSender, err := types.ExtractBaseAddressFromData(k.cdc, packet.GetData(), types.RoleSender, nil)
+	baseSender, err := agtypes.ExtractBaseAddressFromData(k.cdc, packet.GetData(), agtypes.RoleSender, nil)
 	if err != nil {
 		return err
 	}
 
-	origPacket := packet
-	packetStore, packetKey := k.PacketStoreFromOrigin(ctx, types.PacketSrc, packet)
+	origPacket := agtypes.CopyToIBCPacket(packet)
+	packetStore, packetKey := k.PacketStoreFromOrigin(ctx, agtypes.PacketSrc, packet)
 	if packetStore.Has(packetKey) {
 		origPacket.Data = packetStore.Get(packetKey)
 		packetStore.Delete(packetKey)
 	}
 
-	modErr := ibcModule.OnAcknowledgementPacket(ctx, packet, acknowledgement, relayer)
+	modErr := ibcModule.OnAcknowledgementPacket(ctx, agtypes.CopyToChannelPacket(packet), acknowledgement, relayer)
 
 	// If the sender is not a watched account, we're done.
 	if !k.targetIsWatched(ctx, baseSender) {
@@ -312,23 +308,23 @@ func (k Keeper) InterceptOnAcknowledgementPacket(
 func (k Keeper) InterceptOnTimeoutPacket(
 	ctx sdk.Context,
 	ibcModule porttypes.IBCModule,
-	packet channeltypes.Packet,
+	packet ibcexported.PacketI,
 	relayer sdk.AccAddress,
 ) error {
-	baseSender, err := types.ExtractBaseAddressFromData(k.cdc, packet.GetData(), types.RoleSender, nil)
+	baseSender, err := agtypes.ExtractBaseAddressFromData(k.cdc, packet.GetData(), agtypes.RoleSender, nil)
 	if err != nil {
 		return err
 	}
 
-	origPacket := packet
-	packetStore, packetKey := k.PacketStoreFromOrigin(ctx, types.PacketSrc, packet)
+	origPacket := agtypes.CopyToIBCPacket(packet)
+	packetStore, packetKey := k.PacketStoreFromOrigin(ctx, agtypes.PacketSrc, packet)
 	if packetStore.Has(packetKey) {
 		origPacket.Data = packetStore.Get(packetKey)
 		packetStore.Delete(packetKey)
 	}
 
 	// Pass every stripped-sender timeout to the wrapped IBC module.
-	modErr := ibcModule.OnTimeoutPacket(ctx, packet, relayer)
+	modErr := ibcModule.OnTimeoutPacket(ctx, agtypes.CopyToChannelPacket(packet), relayer)
 
 	// If the sender is not a watched account, we're done.
 	if !k.targetIsWatched(ctx, baseSender) {
@@ -349,16 +345,10 @@ func (k Keeper) InterceptOnTimeoutPacket(
 // targeted account, and if so, delegates to the VM.
 func (k Keeper) InterceptWriteAcknowledgement(ctx sdk.Context, chanCap *capabilitytypes.Capability, packet ibcexported.PacketI, ack ibcexported.Acknowledgement) (ibcexported.Acknowledgement, ibcexported.PacketI) {
 	// Get the base receiver from the packet, without computing a stripped packet.
-	baseReceiver, err := types.ExtractBaseAddressFromPacket(k.cdc, packet, types.RoleReceiver, nil)
-
-	origPacket := channeltypes.NewPacket(
-		packet.GetData(), packet.GetSequence(),
-		packet.GetSourcePort(), packet.GetSourceChannel(),
-		packet.GetDestPort(), packet.GetDestChannel(),
-		clienttypes.MustParseHeight(packet.GetTimeoutHeight().String()),
-		packet.GetTimeoutTimestamp(),
-	)
-	packetStore, packetKey := k.PacketStoreFromOrigin(ctx, types.PacketDst, packet)
+	baseReceiver, err := agtypes.ExtractBaseAddressFromPacket(k.cdc, packet, agtypes.RoleReceiver, nil)
+
+	origPacket := agtypes.CopyToIBCPacket(packet)
+	packetStore, packetKey := k.PacketStoreFromOrigin(ctx, agtypes.PacketDst, packet)
 	if packetStore.Has(packetKey) {
 		origPacket.Data = packetStore.Get(packetKey)
 		packetStore.Delete(packetKey)
@@ -440,7 +430,7 @@ func (k Keeper) Receive(cctx context.Context, jsonRequest string) (jsonReply str
 	case "BRIDGE_TARGET_UNREGISTER":
 		prefixStore.Delete([]byte(msg.Target))
 	default:
-		return "", sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "unknown action type: %s", msg.Type)
+		return "", sdkioerrors.Wrapf(sdktypeserrors.ErrUnknownRequest, "unknown action type: %s", msg.Type)
 	}
 	return "true", nil
 }

package/e2e_test/Makefile

@@ -1,29 +0,0 @@
-# It is possible to use environment variables to change how the tests run
-# - `E2ETEST_CHAINNAME0` - set to `"agoric"`, `"gaia"`, or another chain known by interchaintest to choose which chain runs as the first chain
-# - `E2ETEST_CHAINNAME1` - set to `"agoric"`, `"gaia"`, or another chain known by interchaintest to choose which chain runs as the second chain
-# - `E2ETEST_CHAINNAME2` - set to `"agoric"`, `"gaia"`, or another chain known by interchaintest to choose which chain runs as the third chain
-# - `E2ETEST_CHAINNAME3` - set to `"agoric"`, `"gaia"`, or another chain known by interchaintest to choose which chain runs as the fourth chain
-# - `E2ETEST_CHAINIMAGE_AGORIC` - the value of this will be used specific the repository & version of docker image to use for the agoric chain. a valid value must have a semicolon and be formatted as `repository:tag`. ex: `E2ETEST_CHAINIMAGE_AGORIC="ghcr.io/agoric/agoricinterchain:latest"`
-# - `E2ETEST_RELAYERNAME` - set to `"cosmos"` or `"hermes"` to choose the relayer type
-# - `E2ETEST_BLOCKS_TO_WAIT` - set to a number to control how many blocks to wait for an ACK from an IBC transfer and how many blocks to wait for TX settlement.
-all: TestConformance TestPFM
-
-# build - Sanity compile the tests
-build:
-	go test -c -o ./bin/agoricinterchaintest
-
-# TestPFM - use 4 chains to test PFM
-TestPFM:
-	# Add a 20min timeout since tests are slow
-	# Add failfast since each test depends on the next
-	go test -failfast -timeout 20m -v -run ^TestPFM
-
-# TestConformance - use 2 chains to test basic IBC conformance
-TestConformance:
-	# Add a 20min timeout since tests are slow
-	go test -timeout 20m -v -run ^TestConformance
-
-# TestChainPair - Minimal version of TestConformance does less permutations
-TestChainPair:
-	# Add a 20min timeout since tests are slow
-	go test -timeout 20m -v -run ^TestChainPair