@agoric/cosmos 0.35.0-u19.2 → 0.35.0-u21.0

package/x/vbank/keeper/querier.go

@@ -1,34 +1,14 @@
 package keeper
 
 import (
-	abci "github.com/tendermint/tendermint/abci/types"
+	abci "github.com/cometbft/cometbft/abci/types"
 
 	sdkioerrors "cosmossdk.io/errors"
-	"github.com/Agoric/agoric-sdk/golang/cosmos/x/vbank/types"
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
 
-func NewQuerier(k Keeper, legacyQuerierCdc *codec.LegacyAmino) sdk.Querier {
-	return func(ctx sdk.Context, path []string, req abci.RequestQuery) ([]byte, error) {
-		var queryType string
-		if len(path) > 0 {
-			queryType = path[0]
-		}
-		switch queryType {
-		case types.QueryParams:
-			return queryParams(ctx, path[1:], req, k, legacyQuerierCdc)
-
-		case types.QueryState:
-			return queryState(ctx, path[1:], req, k, legacyQuerierCdc)
-
-		default:
-			return nil, sdkioerrors.Wrapf(sdkerrors.ErrUnknownRequest, "unknown vbank query path")
-		}
-	}
-}
-
 func queryParams(ctx sdk.Context, _ []string, _ abci.RequestQuery, k Keeper, legacyQuerierCdc *codec.LegacyAmino) ([]byte, error) {
 	params := k.GetParams(ctx)
 

package/x/vbank/module.go

@@ -17,9 +17,9 @@ import (
 	cdctypes "github.com/cosmos/cosmos-sdk/codec/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 
+	abci "github.com/cometbft/cometbft/abci/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
-	abci "github.com/tendermint/tendermint/abci/types"
 )
 
 // type check to ensure the interface is properly implemented
@@ -184,21 +184,6 @@ func (AppModule) RegisterInvariants(ir sdk.InvariantRegistry) {
 	// TODO
 }
 
-// Route implements the AppModule interface
-func (am AppModule) Route() sdk.Route {
-	return sdk.NewRoute(RouterKey, NewHandler(am.keeper))
-}
-
-// QuerierRoute implements the AppModule interface
-func (AppModule) QuerierRoute() string {
-	return ModuleName
-}
-
-// LegacyQuerierHandler implements the AppModule interface
-func (am AppModule) LegacyQuerierHandler(legacyQuerierCdc *codec.LegacyAmino) sdk.Querier {
-	return keeper.NewQuerier(am.keeper, legacyQuerierCdc)
-}
-
 // RegisterServices registers module services.
 func (am AppModule) RegisterServices(cfg module.Configurator) {
 	tx := &types.UnimplementedMsgServer{}

package/x/vbank/types/genesis.pb.go

@@ -5,8 +5,8 @@ package types
 
 import (
 	fmt "fmt"
-	_ "github.com/gogo/protobuf/gogoproto"
-	proto "github.com/gogo/protobuf/proto"
+	_ "github.com/cosmos/gogoproto/gogoproto"
+	proto "github.com/cosmos/gogoproto/proto"
 	io "io"
 	math "math"
 	math_bits "math/bits"

package/x/vbank/types/msgs.pb.go

@@ -6,8 +6,8 @@ package types
 import (
 	context "context"
 	fmt "fmt"
-	grpc1 "github.com/gogo/protobuf/grpc"
-	proto "github.com/gogo/protobuf/proto"
+	grpc1 "github.com/cosmos/gogoproto/grpc"
+	proto "github.com/cosmos/gogoproto/proto"
 	grpc "google.golang.org/grpc"
 	math "math"
 )
@@ -72,6 +72,7 @@ func RegisterMsgServer(s grpc1.Server, srv MsgServer) {
 	s.RegisterService(&_Msg_serviceDesc, srv)
 }
 
+var Msg_serviceDesc = _Msg_serviceDesc
 var _Msg_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "agoric.vbank.Msg",
 	HandlerType: (*MsgServer)(nil),

package/x/vbank/types/query.pb.go

@@ -6,9 +6,9 @@ package types
 import (
 	context "context"
 	fmt "fmt"
-	_ "github.com/gogo/protobuf/gogoproto"
-	grpc1 "github.com/gogo/protobuf/grpc"
-	proto "github.com/gogo/protobuf/proto"
+	_ "github.com/cosmos/gogoproto/gogoproto"
+	grpc1 "github.com/cosmos/gogoproto/grpc"
+	proto "github.com/cosmos/gogoproto/proto"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
@@ -333,6 +333,7 @@ func _Query_State_Handler(srv interface{}, ctx context.Context, dec func(interfa
 	return interceptor(ctx, in, info, handler)
 }
 
+var Query_serviceDesc = _Query_serviceDesc
 var _Query_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "agoric.vbank.Query",
 	HandlerType: (*QueryServer)(nil),

package/x/vbank/types/vbank.pb.go

@@ -7,8 +7,8 @@ import (
 	fmt "fmt"
 	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	types "github.com/cosmos/cosmos-sdk/types"
-	_ "github.com/gogo/protobuf/gogoproto"
-	proto "github.com/gogo/protobuf/proto"
+	_ "github.com/cosmos/gogoproto/gogoproto"
+	proto "github.com/cosmos/gogoproto/proto"
 	io "io"
 	math "math"
 	math_bits "math/bits"

package/x/vbank/vbank_test.go

@@ -10,17 +10,18 @@ import (
 	"github.com/Agoric/agoric-sdk/golang/cosmos/app/params"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/vm"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/vbank/types"
+	dbm "github.com/cometbft/cometbft-db"
+	abci "github.com/cometbft/cometbft/abci/types"
+	"github.com/cometbft/cometbft/crypto/secp256k1"
+	"github.com/cometbft/cometbft/libs/log"
+	tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
 	"github.com/cosmos/cosmos-sdk/store"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper"
 	paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/crypto/secp256k1"
-	"github.com/tendermint/tendermint/libs/log"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	dbm "github.com/tendermint/tm-db"
 )
 
 var (
@@ -233,6 +234,24 @@ func (b *mockBank) MintCoins(ctx sdk.Context, moduleName string, amt sdk.Coins)
 
 func (b *mockBank) SendCoinsFromAccountToModule(ctx sdk.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins) error {
 	b.record(fmt.Sprintf("SendCoinsFromAccountToModule %s %s %s", senderAddr, recipientModule, amt))
+
+	// for each coin in the request, check spendable vs. requested
+	for _, coin := range amt {
+		// mimic GetBalance logic
+		have := b.balances[senderAddr.String()].AmountOf(coin.Denom)
+		spendable := sdk.NewCoin(coin.Denom, have)
+
+		if spendable.IsLT(coin) {
+			// wrap exactly like the real x/bank keeper
+			// https://github.com/agoric-labs/cosmos-sdk/blob/8b2b975304291c51991278734daa2ff5e57fcb83/x/bank/keeper/send.go#L252-L256
+			return sdkerrors.Wrapf(
+				sdkerrors.ErrInsufficientFunds,
+				"spendable balance %s is smaller than %s",
+				spendable, coin,
+			)
+		}
+	}
+
 	return nil
 }
 
@@ -541,32 +560,32 @@ func Test_EndBlock_Events(t *testing.T) {
 		{
 			Type: "coin_received",
 			Attributes: []abci.EventAttribute{
-				{Key: []byte("receiver"), Value: []byte(addr1)},
-				{Key: []byte("amount"), Value: []byte("500ubld,600urun,700ushmoo")},
+				{Key: "receiver", Value: addr1},
+				{Key: "amount", Value: "500ubld,600urun,700ushmoo"},
 			},
 		},
 		{
 			Type: "coin_spent",
 			Attributes: []abci.EventAttribute{
-				{Key: []byte("spender"), Value: []byte(addr2)},
-				{Key: []byte("amount"), Value: []byte("500ubld,600urun,700ushmoo")},
-				{Key: []byte("other"), Value: []byte(addr3)},
+				{Key: "spender", Value: addr2},
+				{Key: "amount", Value: "500ubld,600urun,700ushmoo"},
+				{Key: "other", Value: addr3},
 			},
 		},
 		{
 			Type: "something_else",
 			Attributes: []abci.EventAttribute{
-				{Key: []byte("receiver"), Value: []byte(addr4)},
-				{Key: []byte("spender"), Value: []byte(addr4)},
-				{Key: []byte("amount"), Value: []byte("500ubld,600urun,700ushmoo")},
+				{Key: "receiver", Value: addr4},
+				{Key: "spender", Value: addr4},
+				{Key: "amount", Value: "500ubld,600urun,700ushmoo"},
 			},
 		},
 		{
 			Type: "non_modaccount",
 			Attributes: []abci.EventAttribute{
-				{Key: []byte("receiver"), Value: []byte(addr3)},
-				{Key: []byte("spender"), Value: []byte(addr4)},
-				{Key: []byte("amount"), Value: []byte("100ubld")},
+				{Key: "receiver", Value: addr3},
+				{Key: "spender", Value: addr4},
+				{Key: "amount", Value: "100ubld"},
 			},
 		},
 	}
@@ -821,3 +840,63 @@ func Test_Module_Account(t *testing.T) {
 		t.Errorf("got IsAllowedMonitoringAccount missingAddr = false, want true")
 	}
 }
+
+
+
+func Test_Receive_Grab_InsufficientFunds(t *testing.T) {
+	tests := []struct {
+		name           string
+		initialBalance sdk.Coin
+	}{
+		{
+			name:           "only 100 available",
+			initialBalance: sdk.NewInt64Coin("ufoo", 100),
+		},
+		{
+			name:           "zero available",
+			initialBalance: sdk.NewInt64Coin("ufoo", 0),
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			// set up mockBank with the desired starting balance
+			bank := &mockBank{balances: map[string]sdk.Coins{
+				addr1: sdk.NewCoins(tc.initialBalance),
+			}}
+
+			// wire into keeper
+			keeper, ctx := makeTestKit(nil, bank)
+			handler := NewPortHandler(AppModule{}, keeper)
+			ctl := sdk.WrapSDKContext(ctx)
+
+			// attempt to grab 500ufoo
+			grabAmt := sdk.NewCoins(sdk.NewInt64Coin("ufoo", 500))
+			_, err := handler.Receive(ctl, fmt.Sprintf(`{
+							"type":"VBANK_GRAB",
+							"sender":"%s",
+							"amount":"500",
+							"denom":"ufoo"
+					}`, addr1))
+			if err == nil {
+				t.Fatal("expected insufficient-funds error, got nil")
+			}
+
+			expected := fmt.Sprintf(
+				"cannot grab %s coins: spendable balance %s is smaller than %s: %s",
+				grabAmt.Sort().String(),
+				tc.initialBalance.String(),
+				grabAmt.Sort().String(),
+				sdkerrors.ErrInsufficientFunds.Error(),
+			)
+
+			t.Logf("actual error: %q", err.Error())
+
+			got := err.Error()
+			if got != expected {
+				t.Errorf("wrong error message:\n  expected: %q\n  got:      %q",
+					expected, got)
+			}
+		})
+	}
+}

package/x/vibc/keeper/keeper.go

@@ -9,11 +9,11 @@ import (
 
 	sdkioerrors "cosmossdk.io/errors"
 	capability "github.com/cosmos/cosmos-sdk/x/capability/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"
-	porttypes "github.com/cosmos/ibc-go/v6/modules/core/05-port/types"
-	host "github.com/cosmos/ibc-go/v6/modules/core/24-host"
-	ibcexported "github.com/cosmos/ibc-go/v6/modules/core/exported"
+	clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
+	channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
+	porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types"
+	host "github.com/cosmos/ibc-go/v7/modules/core/24-host"
+	ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
 
 	"github.com/Agoric/agoric-sdk/golang/cosmos/vm"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/vibc/types"
@@ -31,6 +31,7 @@ type Keeper struct {
 
 	channelKeeper types.ChannelKeeper
 	portKeeper    types.PortKeeper
+	clientKeeper  types.ClientKeeper
 
 	// Filled out by `WithScope`
 	scopedKeeper types.ScopedKeeper
@@ -43,12 +44,14 @@ func NewKeeper(
 	cdc codec.Codec,
 	channelKeeper types.ChannelKeeper,
 	portKeeper types.PortKeeper,
+	clientKeeper types.ClientKeeper,
 ) Keeper {
 
 	return Keeper{
 		cdc:           cdc,
 		channelKeeper: channelKeeper,
 		portKeeper:    portKeeper,
+		clientKeeper:  clientKeeper,
 	}
 }
 

package/x/vibc/keeper/migrations.go

@@ -0,0 +1,36 @@
+package keeper
+
+import (
+	sdk "github.com/cosmos/cosmos-sdk/types"
+
+	ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
+)
+
+// Migrator handles in-place store migrations.
+type Migrator struct {
+	keeper Keeper
+}
+
+// NewMigrator returns a new migrator based on the keeper.
+func NewMigrator(keeper Keeper) Migrator {
+	return Migrator{keeper: keeper}
+}
+
+// Migrate1to2 migrates from version 1 to 2.
+func (m Migrator) Migrate1to2(ctx sdk.Context) error {
+	return m.AddLocalhostParams(ctx)
+}
+
+// explicitly update the IBC 02-client params, adding the localhost client type
+func (m Migrator) AddLocalhostParams(ctx sdk.Context) error {
+	params := m.keeper.clientKeeper.GetParams(ctx)
+	for _, client := range params.AllowedClients {
+		if client == ibcexported.Localhost {
+			// Already added, return.
+			return nil
+		}
+	}
+	params.AllowedClients = append(params.AllowedClients, ibcexported.Localhost)
+	m.keeper.clientKeeper.SetParams(ctx, params)
+	return nil
+}

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"
+	ibcexported "github.com/cosmos/ibc-go/v7/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/module.go

@@ -6,6 +6,7 @@ import (
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/spf13/cobra"
 
+	"github.com/Agoric/agoric-sdk/golang/cosmos/x/vibc/keeper"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/vibc/types"
 
 	"github.com/cosmos/cosmos-sdk/client"
@@ -13,8 +14,8 @@ import (
 	cdctypes "github.com/cosmos/cosmos-sdk/codec/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 
+	abci "github.com/cometbft/cometbft/abci/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	abci "github.com/tendermint/tendermint/abci/types"
 )
 
 // type check to ensure the interface is properly implemented
@@ -83,7 +84,7 @@ func (AppModule) Name() string {
 	return ModuleName
 }
 
-func (AppModule) ConsensusVersion() uint64 { return 1 }
+func (AppModule) ConsensusVersion() uint64 { return 2 }
 
 // BeginBlock implements the AppModule interface
 func (am AppModule) BeginBlock(ctx sdk.Context, req abci.RequestBeginBlock) {
@@ -99,25 +100,16 @@ func (AppModule) RegisterInvariants(ir sdk.InvariantRegistry) {
 	// TODO
 }
 
-// Route implements the AppModule interface
-func (am AppModule) Route() sdk.Route {
-	return sdk.NewRoute(RouterKey, NewHandler(am.keeper, am.bankKeeper))
-}
-
-// QuerierRoute implements the AppModule interface
-func (AppModule) QuerierRoute() string {
-	return ModuleName
-}
-
-// LegacyQuerierHandler implements the AppModule interface
-func (am AppModule) LegacyQuerierHandler(*codec.LegacyAmino) sdk.Querier {
-	return nil
-}
-
 // RegisterServices registers module services.
 func (am AppModule) RegisterServices(cfg module.Configurator) {
 	tx := &types.UnimplementedMsgServer{}
 	types.RegisterMsgServer(cfg.MsgServer(), tx)
+
+	m := keeper.NewMigrator(am.keeper)
+	err := cfg.RegisterMigration(types.ModuleName, 1, m.Migrate1to2)
+	if err != nil {
+		panic(err)
+	}
 }
 
 // InitGenesis performs genesis initialization for the ibc-transfer module. It returns

package/x/vibc/types/expected_keepers.go

@@ -3,10 +3,9 @@ package types
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	capability "github.com/cosmos/cosmos-sdk/x/capability/types"
-	clienttypes "github.com/cosmos/ibc-go/v6/modules/core/02-client/types"
-	connection "github.com/cosmos/ibc-go/v6/modules/core/03-connection/types"
-	channel "github.com/cosmos/ibc-go/v6/modules/core/04-channel/types"
-	ibcexported "github.com/cosmos/ibc-go/v6/modules/core/exported"
+	clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
+	channel "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
+	ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
 )
 
 type BankKeeper interface {
@@ -33,18 +32,15 @@ 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
 }
 
 // ClientKeeper defines the expected IBC client keeper
 type ClientKeeper interface {
-	GetClientConsensusState(ctx sdk.Context, clientID string) (connection ibcexported.ConsensusState, found bool)
-}
-
-// ConnectionKeeper defines the expected IBC connection keeper
-type ConnectionKeeper interface {
-	GetConnection(ctx sdk.Context, connectionID string) (connection connection.ConnectionEnd, found bool)
+	GetParams(ctx sdk.Context) clienttypes.Params
+	SetParams(ctx sdk.Context, params clienttypes.Params)
 }
 
 // PortKeeper defines the expected IBC port keeper

package/x/vibc/types/ibc_module.go

@@ -4,13 +4,14 @@ 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"
-	porttypes "github.com/cosmos/ibc-go/v6/modules/core/05-port/types"
-	host "github.com/cosmos/ibc-go/v6/modules/core/24-host"
+	channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
+	porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types"
+	host "github.com/cosmos/ibc-go/v7/modules/core/24-host"
 
-	"github.com/cosmos/ibc-go/v6/modules/core/exported"
+	"github.com/cosmos/ibc-go/v7/modules/core/exported"
 
 	sdk "github.com/cosmos/cosmos-sdk/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/msgs.go

@@ -4,7 +4,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 
-	chanTypes "github.com/cosmos/ibc-go/v6/modules/core/04-channel/types"
+	chanTypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
 )
 
 const RouterKey = ModuleName // this was defined in your key.go file