@agoric/cosmos 0.35.0-u21.0 → 0.35.0-u22.0

package/x/vibc/module.go

@@ -14,7 +14,6 @@ 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"
 )
 
@@ -28,6 +27,11 @@ var (
 type AppModuleBasic struct {
 }
 
+// IsAppModule implements the appmodule.AppModule interface.
+func (am AppModule) IsAppModule() {}
+
+// IsOnePerModuleType is a marker function just indicates that this is a one-per-module type.
+func (am AppModule) IsOnePerModuleType() {}
 func (AppModuleBasic) Name() string {
 	return ModuleName
 }
@@ -86,15 +90,6 @@ func (AppModule) Name() string {
 
 func (AppModule) ConsensusVersion() uint64 { return 2 }
 
-// BeginBlock implements the AppModule interface
-func (am AppModule) BeginBlock(ctx sdk.Context, req abci.RequestBeginBlock) {
-}
-
-// EndBlock implements the AppModule interface
-func (am AppModule) EndBlock(ctx sdk.Context, req abci.RequestEndBlock) []abci.ValidatorUpdate {
-	return []abci.ValidatorUpdate{}
-}
-
 // RegisterInvariants implements the AppModule interface
 func (AppModule) RegisterInvariants(ir sdk.InvariantRegistry) {
 	// TODO
@@ -111,15 +106,3 @@ func (am AppModule) RegisterServices(cfg module.Configurator) {
 		panic(err)
 	}
 }
-
-// InitGenesis performs genesis initialization for the ibc-transfer module. It returns
-// no validator updates.
-func (am AppModule) InitGenesis(ctx sdk.Context, cdc codec.JSONCodec, data json.RawMessage) []abci.ValidatorUpdate {
-	return []abci.ValidatorUpdate{}
-}
-
-// ExportGenesis returns the exported genesis state as raw bytes for the ibc-transfer
-// module.
-func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.RawMessage {
-	return nil
-}

package/x/vibc/types/codec.go

@@ -2,6 +2,7 @@ package types
 
 import (
 	"github.com/cosmos/cosmos-sdk/codec"
+	"github.com/cosmos/cosmos-sdk/codec/legacy"
 	cdctypes "github.com/cosmos/cosmos-sdk/codec/types"
 	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -28,7 +29,7 @@ func init() {
 
 // RegisterCodec registers concrete types on the Amino codec
 func RegisterCodec(cdc *codec.LegacyAmino) {
-	cdc.RegisterConcrete(&MsgSendPacket{}, ModuleName+"/SendPacket", nil)
+	legacy.RegisterAminoMsg(cdc, &MsgSendPacket{}, ModuleName+"/SendPacket")
 }
 
 // RegisterInterfaces registers the x/swingset interfaces types with the interface registry

package/x/vibc/types/expected_keepers.go

@@ -1,15 +1,17 @@
 package types
 
 import (
+	context "context"
+
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	capability "github.com/cosmos/cosmos-sdk/x/capability/types"
-	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"
+	capability "github.com/cosmos/ibc-go/modules/capability/types"
+	clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types"
+	channel "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types"
+	ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported"
 )
 
 type BankKeeper interface {
-	GetBalance(ctx sdk.Context, addr sdk.AccAddress, denom string) sdk.Coin
+	GetBalance(ctx context.Context, addr sdk.AccAddress, denom string) sdk.Coin
 }
 
 // ChannelKeeper defines the expected IBC channel keeper

package/x/vibc/types/ibc_module.go

@@ -6,12 +6,12 @@ import (
 	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/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"
+	capability "github.com/cosmos/ibc-go/modules/capability/types"
+	channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types"
+	porttypes "github.com/cosmos/ibc-go/v8/modules/core/05-port/types"
+	host "github.com/cosmos/ibc-go/v8/modules/core/24-host"
 
-	"github.com/cosmos/ibc-go/v7/modules/core/exported"
+	"github.com/cosmos/ibc-go/v8/modules/core/exported"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )

package/x/vibc/types/msgs.go

@@ -1,16 +1,44 @@
 package types
 
 import (
+	sdkioerrors "cosmossdk.io/errors"
+	"cosmossdk.io/x/tx/signing"
+
 	sdk "github.com/cosmos/cosmos-sdk/types"
+
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 
-	chanTypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
+	chanTypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types"
+
+	"google.golang.org/protobuf/proto"
+	"google.golang.org/protobuf/protoadapt"
+	"google.golang.org/protobuf/reflect/protoreflect"
 )
 
 const RouterKey = ModuleName // this was defined in your key.go file
 
 var _ sdk.Msg = &MsgSendPacket{}
 
+// Replacing msg.GetSigners() but before we can adopt AddressString.
+// https://github.com/cosmos/cosmos-sdk/issues/20077#issuecomment-2062601533
+func createSignerFieldFunc(fieldName protoreflect.Name) signing.GetSignersFunc {
+	return func(msgIn proto.Message) ([][]byte, error) {
+		msg := msgIn.ProtoReflect()
+		if !msg.Has(msg.Descriptor().Fields().ByName(fieldName)) {
+			return nil, sdkioerrors.Wrapf(sdkerrors.ErrInvalidRequest, "message %T does not have field %s", msgIn, fieldName)
+		}
+		addr := msg.Get(msg.Descriptor().Fields().ByName(fieldName)).Interface().([]byte)
+		return [][]byte{addr}, nil
+	}
+}
+
+func DefineCustomGetSigners(options *signing.Options) {
+	options.DefineCustomGetSigners(
+		proto.MessageName(protoadapt.MessageV2Of(&MsgSendPacket{})),
+		createSignerFieldFunc("sender"),
+	)
+}
+
 // NewMsgSendPacket returns a new send request
 func NewMsgSendPacket(packet chanTypes.Packet, sender sdk.AccAddress) *MsgSendPacket {
 	return &MsgSendPacket{
@@ -31,12 +59,7 @@ func (msg MsgSendPacket) ValidateBasic() error {
 	return msg.Packet.ValidateBasic()
 }
 
-// GetSignBytes implements sdk.Msg
-func (msg MsgSendPacket) GetSignBytes() []byte {
-	return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&msg))
-}
-
-// GetSigners implements sdk.Msg
+// GetSigners defines whose signature is required
 func (msg MsgSendPacket) GetSigners() []sdk.AccAddress {
 	return []sdk.AccAddress{msg.Sender}
 }

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

@@ -7,10 +7,11 @@ import (
 	context "context"
 	fmt "fmt"
 	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
+	_ "github.com/cosmos/cosmos-sdk/types/tx/amino"
 	_ "github.com/cosmos/gogoproto/gogoproto"
 	grpc1 "github.com/cosmos/gogoproto/grpc"
 	proto "github.com/cosmos/gogoproto/proto"
-	types "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
+	types "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
@@ -128,30 +129,33 @@ func init() {
 func init() { proto.RegisterFile("agoric/vibc/msgs.proto", fileDescriptor_78e9bb7be62a4c00) }
 
 var fileDescriptor_78e9bb7be62a4c00 = []byte{
-	// 354 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0xbf, 0x6e, 0xea, 0x30,
-	0x14, 0xc6, 0x93, 0x7b, 0xaf, 0x90, 0xae, 0xb9, 0x48, 0x57, 0x51, 0xff, 0xa0, 0x54, 0x8a, 0x69,
-	0x26, 0x16, 0x6c, 0x41, 0x87, 0x4a, 0x6c, 0x30, 0x17, 0xa9, 0x0d, 0x9d, 0xba, 0x25, 0x8e, 0x65,
-	0x52, 0x48, 0x1c, 0xe5, 0x04, 0x54, 0xde, 0xa2, 0x8f, 0xd0, 0xc7, 0x61, 0x64, 0x6b, 0xa7, 0xa8,
-	0x82, 0xa5, 0x62, 0x64, 0xec, 0x54, 0x25, 0x4e, 0x2a, 0x18, 0x3a, 0xf9, 0xf8, 0x3b, 0xe7, 0x3b,
-	0xd6, 0xcf, 0x1f, 0x3a, 0x73, 0x85, 0x4c, 0x02, 0x46, 0x17, 0x81, 0xc7, 0x68, 0x08, 0x02, 0x48,
-	0x9c, 0xc8, 0x54, 0x1a, 0x75, 0xa5, 0x93, 0x5c, 0x37, 0x4f, 0x84, 0x14, 0xb2, 0xd0, 0x69, 0x5e,
-	0xa9, 0x11, 0xf3, 0x32, 0xb7, 0x30, 0x99, 0x70, 0xca, 0x26, 0x6e, 0x14, 0xf1, 0x19, 0x5d, 0x74,
-	0xab, 0x52, 0x8d, 0xd8, 0xaf, 0x3a, 0x6a, 0x8c, 0x40, 0x8c, 0x79, 0xe4, 0xdf, 0xba, 0x6c, 0xca,
-	0x53, 0xe3, 0x1e, 0xd5, 0xe2, 0xa2, 0x6a, 0xea, 0x2d, 0xbd, 0x5d, 0xef, 0x5d, 0x90, 0xc0, 0x63,
-	0x24, 0xdf, 0x42, 0x2a, 0xeb, 0xa2, 0x4b, 0xd4, 0xf0, 0x10, 0xaf, 0x32, 0xac, 0xed, 0x32, 0x5c,
-	0x5a, 0xf6, 0x19, 0x6e, 0x2c, 0xdd, 0x70, 0xd6, 0xb7, 0xd5, 0xdd, 0x76, 0xca, 0x86, 0xf1, 0x88,
-	0x6a, 0xc0, 0x23, 0x9f, 0x27, 0xcd, 0x5f, 0x2d, 0xbd, 0xfd, 0x6f, 0xe8, 0xec, 0x32, 0xfc, 0x17,
-	0xe6, 0x5e, 0x18, 0xa4, 0x29, 0x4f, 0xf6, 0x19, 0xfe, 0xaf, 0x7c, 0xdf, 0x92, 0xfd, 0x99, 0xe1,
-	0x8e, 0x08, 0xd2, 0xc9, 0xdc, 0x23, 0x4c, 0x86, 0x94, 0x49, 0x08, 0x25, 0x94, 0x47, 0x07, 0xfc,
-	0x29, 0x4d, 0x97, 0x31, 0x07, 0x32, 0x60, 0x6c, 0xe0, 0xfb, 0x09, 0x07, 0x70, 0xca, 0x17, 0xfa,
-	0x7f, 0x3e, 0x5e, 0xb0, 0x66, 0x9f, 0xa3, 0xd3, 0x23, 0x30, 0x87, 0x43, 0x2c, 0x23, 0xe0, 0xbd,
-	0x31, 0xfa, 0x3d, 0x02, 0x61, 0xdc, 0x20, 0x74, 0x40, 0x6d, 0x92, 0x83, 0xef, 0x24, 0x47, 0x46,
-	0xd3, 0xfe, 0xb9, 0x57, 0x2d, 0x1d, 0xde, 0xad, 0x36, 0x96, 0xbe, 0xde, 0x58, 0xfa, 0xfb, 0xc6,
-	0xd2, 0x9f, 0xb7, 0x96, 0xb6, 0xde, 0x5a, 0xda, 0xdb, 0xd6, 0xd2, 0x1e, 0xae, 0x0f, 0x20, 0x06,
-	0x2a, 0x4a, 0xb5, 0xae, 0x80, 0x10, 0x72, 0xe6, 0x46, 0xa2, 0xa2, 0x7b, 0x52, 0x29, 0x17, 0x64,
-	0x5e, 0xad, 0x48, 0xe8, 0xea, 0x2b, 0x00, 0x00, 0xff, 0xff, 0x45, 0x01, 0xfd, 0x45, 0x01, 0x02,
-	0x00, 0x00,
+	// 401 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x52, 0x3d, 0xaf, 0xda, 0x30,
+	0x14, 0x4d, 0xa8, 0x84, 0x54, 0x53, 0xfa, 0x11, 0xf5, 0x03, 0xa5, 0x52, 0x4c, 0x33, 0x21, 0x24,
+	0x6c, 0x41, 0x87, 0x4a, 0x6c, 0x30, 0x17, 0xa9, 0x85, 0x4e, 0x5d, 0x2a, 0xc7, 0xb1, 0x4c, 0x44,
+	0x12, 0x47, 0x71, 0x40, 0xe5, 0x2f, 0xb4, 0xaa, 0xd4, 0xb9, 0x53, 0xf5, 0x7e, 0x01, 0x3f, 0x83,
+	0x91, 0xf1, 0x4d, 0xd1, 0x13, 0x0c, 0x3c, 0x31, 0x32, 0xbe, 0xe9, 0x29, 0x71, 0xf2, 0x80, 0xe1,
+	0x2d, 0xc9, 0xc9, 0xb9, 0x3e, 0x27, 0xbe, 0xe7, 0x5e, 0xf0, 0x96, 0x70, 0x11, 0x7b, 0x14, 0x2f,
+	0x3c, 0x87, 0xe2, 0x40, 0x72, 0x89, 0xa2, 0x58, 0x24, 0xc2, 0xa8, 0x29, 0x1e, 0x65, 0xbc, 0xf9,
+	0x8a, 0x04, 0x5e, 0x28, 0x70, 0xfe, 0x54, 0x75, 0xf3, 0x35, 0x17, 0x5c, 0xe4, 0x10, 0x67, 0xa8,
+	0x60, 0x3f, 0x64, 0x2e, 0x54, 0xc4, 0x0c, 0xd3, 0x29, 0x09, 0x43, 0xe6, 0xe3, 0x45, 0xb7, 0x84,
+	0xea, 0x88, 0xfd, 0xa7, 0x02, 0xea, 0x23, 0xc9, 0x27, 0x2c, 0x74, 0xbf, 0x10, 0x3a, 0x63, 0x89,
+	0xf1, 0x0d, 0x54, 0xa3, 0x1c, 0x35, 0xf4, 0xa6, 0xde, 0xaa, 0xf5, 0xde, 0x23, 0xcf, 0xa1, 0x28,
+	0x73, 0x41, 0xa5, 0x74, 0xd1, 0x45, 0xea, 0xf0, 0x10, 0xae, 0x53, 0xa8, 0x1d, 0x52, 0x58, 0x48,
+	0x8e, 0x29, 0xac, 0x2f, 0x49, 0xe0, 0xf7, 0x6d, 0xf5, 0x6d, 0x8f, 0x8b, 0x82, 0xf1, 0x5b, 0x07,
+	0x55, 0xc9, 0x42, 0x97, 0xc5, 0x8d, 0x4a, 0x53, 0x6f, 0x3d, 0x1b, 0xca, 0x43, 0x0a, 0x9f, 0xca,
+	0xb9, 0x13, 0x78, 0x49, 0xc2, 0xe2, 0x63, 0x0a, 0x5f, 0x2a, 0xe1, 0x03, 0x65, 0xdf, 0xa5, 0xb0,
+	0xc3, 0xbd, 0x64, 0x3a, 0x77, 0x10, 0x15, 0x01, 0xa6, 0x42, 0x06, 0x42, 0x16, 0xaf, 0x8e, 0x74,
+	0x67, 0x38, 0x59, 0x46, 0x4c, 0xa2, 0x01, 0xa5, 0x03, 0xd7, 0x8d, 0x99, 0x94, 0xff, 0xf6, 0xab,
+	0xf6, 0x73, 0x9f, 0x71, 0x42, 0x97, 0x3f, 0x88, 0xa2, 0xae, 0xf6, 0xab, 0xf6, 0xe9, 0x2f, 0xe3,
+	0xe2, 0x0a, 0xfd, 0xc6, 0xed, 0x7f, 0xa8, 0xfd, 0xda, 0xaf, 0xda, 0x2f, 0xf2, 0xa0, 0x4f, 0xdd,
+	0xdb, 0xef, 0xc0, 0x9b, 0x8b, 0x38, 0xc6, 0x4c, 0x46, 0x22, 0x94, 0xac, 0x37, 0x01, 0x4f, 0x46,
+	0x92, 0x1b, 0x9f, 0x01, 0x38, 0xcb, 0xca, 0x44, 0x67, 0x73, 0x41, 0x17, 0x42, 0xd3, 0x7e, 0xbc,
+	0x56, 0x9a, 0x0e, 0xbf, 0xae, 0xb7, 0x96, 0xbe, 0xd9, 0x5a, 0xfa, 0xcd, 0xd6, 0xd2, 0xff, 0xee,
+	0x2c, 0x6d, 0xb3, 0xb3, 0xb4, 0xeb, 0x9d, 0xa5, 0x7d, 0xff, 0x74, 0xd6, 0xf9, 0x40, 0xed, 0x84,
+	0xb2, 0xcb, 0x3b, 0xe7, 0xc2, 0x27, 0x21, 0x2f, 0x23, 0xf9, 0xa9, 0xd6, 0x25, 0x8f, 0xc3, 0xa9,
+	0xe6, 0x73, 0xfd, 0x78, 0x1f, 0x00, 0x00, 0xff, 0xff, 0xca, 0x58, 0x43, 0x3c, 0x4a, 0x02, 0x00,
+	0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.

package/x/vibc/types/receiver.go

@@ -7,9 +7,9 @@ import (
 
 	"github.com/Agoric/agoric-sdk/golang/cosmos/types"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/vm"
-	channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
+	channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types"
 
-	"github.com/cosmos/ibc-go/v7/modules/core/exported"
+	"github.com/cosmos/ibc-go/v8/modules/core/exported"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )

package/x/vlocalchain/handler.go

@@ -5,12 +5,13 @@ import (
 
 	sdkioerrors "cosmossdk.io/errors"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/vlocalchain/keeper"
+	"github.com/cosmos/cosmos-sdk/baseapp"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
 
 // NewHandler returns a handler for "vlocalchain" type messages.
-func NewHandler(keeper keeper.Keeper) sdk.Handler {
+func NewHandler(keeper keeper.Keeper) baseapp.MsgServiceHandler {
 	return func(ctx sdk.Context, msg sdk.Msg) (*sdk.Result, error) {
 		switch msg := msg.(type) {
 		default:

package/x/vlocalchain/keeper/keeper.go

@@ -8,12 +8,13 @@ import (
 	"strings"
 	"unicode"
 
+	errorsmod "cosmossdk.io/errors"
 	"github.com/cosmos/gogoproto/jsonpb"
 	"github.com/cosmos/gogoproto/proto"
 
+	storetypes "cosmossdk.io/store/types"
 	"github.com/cosmos/cosmos-sdk/codec"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
-	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkaddress "github.com/cosmos/cosmos-sdk/types/address"
 
@@ -138,7 +139,7 @@ func (k Keeper) Query(cctx context.Context, qm types.QueryRequest) (*types.Query
 		Height: ctx.BlockHeight(),
 	}
 
-	abcires, err := handler(ctx, req)
+	abcires, err := handler(ctx, &req)
 	if err != nil {
 		return nil, err
 	}
@@ -180,9 +181,20 @@ type HasValidateBasic interface {
 func (k Keeper) authenticateTx(msgs []sdk.Msg, actualSigner string) error {
 	for _, msg := range msgs {
 		// Validate that all required signers are satisfied (i.e. they match the actual signer).
-		for _, requiredSignerAddress := range msg.GetSigners() {
-			requiredSigner := requiredSignerAddress.String()
-			if requiredSigner != actualSigner {
+
+		// obtain the message signers using the proto signer annotations
+		// the msgv2 return value is discarded as it is not used
+		requiredSigners, _, err := k.cdc.GetMsgV1Signers(msg)
+		if err != nil {
+			return errorsmod.Wrapf(err, "failed to obtain required message signers for message type %s", sdk.MsgTypeURL(msg))
+		}
+
+		for _, requiredSignerBytes := range requiredSigners {
+			requiredSigner, err := k.acctKeeper.AddressCodec().BytesToString(requiredSignerBytes)
+			if err != nil {
+				return errorsmod.Wrapf(err, "failed to convert required signer bytes to string for message type %s", sdk.MsgTypeURL(msg))
+			}
+			if actualSigner != requiredSigner {
 				err := fmt.Errorf("required signer %s does not match actual signer", requiredSigner)
 				return err
 			}

package/x/vlocalchain/keeper/keeper_test.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
+	sdkmath "cosmossdk.io/math"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/app/params"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
@@ -41,7 +42,7 @@ func TestKeeper_ParseRequestTypeURL(t *testing.T) {
 
 func TestKeeper_DeserializeTxMessages(t *testing.T) {
 	encodingConfig := params.MakeEncodingConfig()
-	cdc := encodingConfig.Marshaler
+	cdc := encodingConfig.Codec
 
 	banktypes.RegisterInterfaces(encodingConfig.InterfaceRegistry)
 
@@ -51,7 +52,7 @@ func TestKeeper_DeserializeTxMessages(t *testing.T) {
 		&banktypes.MsgSend{
 			FromAddress: "cosmos1abc",
 			ToAddress:   "cosmos1xyz",
-			Amount:      sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(100))),
+			Amount:      sdk.NewCoins(sdk.NewCoin("stake", sdkmath.NewInt(100))),
 		},
 	}
 

package/x/vlocalchain/types/expected_keepers.go

@@ -1,12 +1,15 @@
 package types
 
 import (
+	"context"
+
+	address "cosmossdk.io/core/address"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 )
 
 type AccountKeeper interface {
-	NewAccountWithAddress(ctx sdk.Context, addr sdk.AccAddress) authtypes.AccountI
-	HasAccount(ctx sdk.Context, addr sdk.AccAddress) bool
-	SetAccount(ctx sdk.Context, acc authtypes.AccountI)
+	AddressCodec() address.Codec
+	NewAccountWithAddress(ctx context.Context, addr sdk.AccAddress) sdk.AccountI
+	HasAccount(ctx context.Context, addr sdk.AccAddress) bool
+	SetAccount(ctx context.Context, acc sdk.AccountI)
 }

package/x/vlocalchain/vlocalchain_test.go

@@ -7,29 +7,32 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Agoric/agoric-sdk/golang/cosmos/app/params"
+	address "cosmossdk.io/core/address"
+	"cosmossdk.io/log"
+	sdkmath "cosmossdk.io/math"
+	"cosmossdk.io/store"
+	storemetrics "cosmossdk.io/store/metrics"
+	storetypes "cosmossdk.io/store/types"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/vm"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/vlocalchain"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/vlocalchain/types"
-
-	"github.com/cometbft/cometbft/libs/log"
+	dbm "github.com/cosmos/cosmos-db"
 	"github.com/cosmos/cosmos-sdk/baseapp"
-	"github.com/cosmos/cosmos-sdk/store"
-	storetypes "github.com/cosmos/cosmos-sdk/store/types"
+	addresscodec "github.com/cosmos/cosmos-sdk/codec/address"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/module/testutil"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
-	transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
+	transfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types"
 
-	dbm "github.com/cometbft/cometbft-db"
 	tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
 	"github.com/cosmos/gogoproto/jsonpb"
 	"github.com/cosmos/gogoproto/proto"
 )
 
 var (
-	vlocalchainStoreKey = sdk.NewKVStoreKey(types.StoreKey)
+	vlocalchainStoreKey = storetypes.NewKVStoreKey(types.StoreKey)
 )
 
 const (
@@ -43,16 +46,20 @@ type mockAccounts struct {
 
 var _ types.AccountKeeper = (*mockAccounts)(nil)
 
-func (a *mockAccounts) NewAccountWithAddress(ctx sdk.Context, addr sdk.AccAddress) authtypes.AccountI {
+func (a *mockAccounts) NewAccountWithAddress(ctx context.Context, addr sdk.AccAddress) sdk.AccountI {
 	return authtypes.NewBaseAccountWithAddress(addr)
 }
 
-func (a *mockAccounts) HasAccount(ctx sdk.Context, addr sdk.AccAddress) bool {
+func (a *mockAccounts) AddressCodec() address.Codec {
+	return addresscodec.NewBech32Codec(sdk.Bech32MainPrefix)
+}
+
+func (a *mockAccounts) HasAccount(ctx context.Context, addr sdk.AccAddress) bool {
 	existing := a.existing[addr.String()]
 	return existing
 }
 
-func (a *mockAccounts) SetAccount(ctx sdk.Context, acc authtypes.AccountI) {
+func (a *mockAccounts) SetAccount(ctx context.Context, acc sdk.AccountI) {
 	a.existing[acc.GetAddress().String()] = true
 }
 
@@ -119,8 +126,8 @@ func (s *mockStaking) UnbondingDelegation(cctx context.Context, req *stakingtype
 			{
 				CreationHeight: 100,
 				CompletionTime: time.Now().UTC().Add(time.Hour * 24 * 7),
-				InitialBalance: sdk.NewInt(1000),
-				Balance:        sdk.NewInt(500),
+				InitialBalance: sdkmath.NewInt(1000),
+				Balance:        sdkmath.NewInt(500),
 			},
 		},
 	}
@@ -129,21 +136,25 @@ func (s *mockStaking) UnbondingDelegation(cctx context.Context, req *stakingtype
 
 // makeTestKit creates a minimal Keeper and Context for use in testing.
 func makeTestKit(bank *mockBank, transfer *mockTransfer, staking *mockStaking, accts *mockAccounts) (vm.PortHandler, context.Context) {
-	encodingConfig := params.MakeEncodingConfig()
-	cdc := encodingConfig.Marshaler
+	// Configure address codec in the interface registry using testutil
+	encCfg := testutil.MakeTestEncodingConfig()
+
+	cdc := encCfg.Codec
 
 	txRouter := baseapp.NewMsgServiceRouter()
-	txRouter.SetInterfaceRegistry(encodingConfig.InterfaceRegistry)
+	txRouter.SetInterfaceRegistry(encCfg.InterfaceRegistry)
 	queryRouter := baseapp.NewGRPCQueryRouter()
-	queryRouter.SetInterfaceRegistry(encodingConfig.InterfaceRegistry)
+	queryRouter.SetInterfaceRegistry(encCfg.InterfaceRegistry)
 
-	banktypes.RegisterInterfaces(encodingConfig.InterfaceRegistry)
+	// Register all necessary module interfaces
+	authtypes.RegisterInterfaces(encCfg.InterfaceRegistry)
+	banktypes.RegisterInterfaces(encCfg.InterfaceRegistry)
 	banktypes.RegisterMsgServer(txRouter, bank)
 	banktypes.RegisterQueryServer(queryRouter, bank)
-	transfertypes.RegisterInterfaces(encodingConfig.InterfaceRegistry)
+	transfertypes.RegisterInterfaces(encCfg.InterfaceRegistry)
 	transfertypes.RegisterMsgServer(txRouter, transfer)
 	transfertypes.RegisterQueryServer(queryRouter, transfer)
-	stakingtypes.RegisterInterfaces(encodingConfig.InterfaceRegistry)
+	stakingtypes.RegisterInterfaces(encCfg.InterfaceRegistry)
 	stakingtypes.RegisterMsgServer(txRouter, staking)
 	stakingtypes.RegisterQueryServer(queryRouter, staking)
 
@@ -151,7 +162,8 @@ func makeTestKit(bank *mockBank, transfer *mockTransfer, staking *mockStaking, a
 	keeper := vlocalchain.NewKeeper(cdc, vlocalchainStoreKey, txRouter, queryRouter, accts)
 
 	db := dbm.NewMemDB()
-	ms := store.NewCommitMultiStore(db)
+	logger := log.NewNopLogger()
+	ms := store.NewCommitMultiStore(db, logger, storemetrics.NewNoOpMetrics())
 	ms.MountStoreWithDB(vlocalchainStoreKey, storetypes.StoreTypeIAVL, db)
 	err := ms.LoadLatestVersion()
 	if err != nil {
@@ -216,8 +228,8 @@ func TestQuery(t *testing.T) {
 	alreadyAddr := sdk.MustBech32ifyAddressBytes("cosmos", []byte("already"))
 	nonexistentAddr := sdk.MustBech32ifyAddressBytes("cosmos", []byte("nonexistent"))
 	bank := &mockBank{balances: map[string]sdk.Coins{
-		firstAddr:   []sdk.Coin{sdk.NewCoin("fresh", sdk.NewInt(123))},
-		alreadyAddr: []sdk.Coin{sdk.NewCoin("stale", sdk.NewInt(321))},
+		firstAddr:   []sdk.Coin{sdk.NewCoin("fresh", sdkmath.NewInt(123))},
+		alreadyAddr: []sdk.Coin{sdk.NewCoin("stale", sdkmath.NewInt(321))},
 	}}
 	transfer := &mockTransfer{}
 	staking := &mockStaking{}
@@ -286,7 +298,7 @@ func TestQuery(t *testing.T) {
 				t.Fatalf("unexpected error unmarshalling reply: %v: %v", ret, err)
 			}
 
-			if !pb.Balances.IsEqual(tc.expected) {
+			if !pb.Balances.Equal(tc.expected) {
 				t.Errorf("unexpected balance: expected %v, got %v", tc.expected, pb.Balances)
 			}
 		})
@@ -358,8 +370,8 @@ func TestQuery(t *testing.T) {
 func TestExecuteTx(t *testing.T) {
 	alreadyAddr := sdk.MustBech32ifyAddressBytes("cosmos", []byte("already"))
 	bank := &mockBank{balances: map[string]sdk.Coins{
-		firstAddr:   []sdk.Coin{sdk.NewCoin("fresh", sdk.NewInt(123))},
-		alreadyAddr: []sdk.Coin{sdk.NewCoin("stale", sdk.NewInt(321))},
+		firstAddr:   []sdk.Coin{sdk.NewCoin("fresh", sdkmath.NewInt(123))},
+		alreadyAddr: []sdk.Coin{sdk.NewCoin("stale", sdkmath.NewInt(321))},
 	}}
 	transfer := &mockTransfer{}
 	staking := &mockStaking{}

package/x/vstorage/genesis.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/vstorage/types"
-	abci "github.com/cometbft/cometbft/abci/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
@@ -27,18 +26,19 @@ func ValidateGenesis(data *types.GenesisState) error {
 }
 
 func DefaultGenesisState() *types.GenesisState {
-	return &types.GenesisState{
-		Data: []*types.DataEntry{},
-	}
+	return NewGenesisState()
 }
 
-func InitGenesis(ctx sdk.Context, keeper Keeper, data *types.GenesisState) []abci.ValidatorUpdate {
-	keeper.ImportStorage(ctx, data.Data)
-	return []abci.ValidatorUpdate{}
+func InitGenesis(ctx sdk.Context, keeper Keeper, data *types.GenesisState) error {
+	return keeper.ImportStorage(ctx, data.Data)
 }
 
-func ExportGenesis(ctx sdk.Context, keeper Keeper) *types.GenesisState {
+func ExportGenesis(ctx sdk.Context, keeper Keeper) (*types.GenesisState, error) {
+	data, err := keeper.ExportStorage(ctx)
+	if err != nil {
+		return nil, err
+	}
 	gs := NewGenesisState()
-	gs.Data = keeper.ExportStorage(ctx)
-	return gs
+	gs.Data = data
+	return gs, nil
 }

package/x/vstorage/handler.go

@@ -4,12 +4,13 @@ import (
 	"fmt"
 
 	sdkioerrors "cosmossdk.io/errors"
+	"github.com/cosmos/cosmos-sdk/baseapp"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
 
 // NewHandler returns a handler for "vstorage" type messages.
-func NewHandler(k Keeper) sdk.Handler {
+func NewHandler(k Keeper) baseapp.MsgServiceHandler {
 	return func(ctx sdk.Context, msg sdk.Msg) (*sdk.Result, error) {
 		errMsg := fmt.Sprintf("Unrecognized vstorage Msg type: %T", msg)
 		return nil, sdkioerrors.Wrap(sdkerrors.ErrUnknownRequest, errMsg)