@agoric/cosmos 0.35.0-u20.0 → 0.35.0-u21.0.1

package/x/vibc/keeper/triggers.go

@@ -3,7 +3,7 @@ package keeper
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	ibcexported "github.com/cosmos/ibc-go/v6/modules/core/exported"
+	ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
 
 	agtypes "github.com/Agoric/agoric-sdk/golang/cosmos/types"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/vibc/types"

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 {
@@ -40,12 +39,8 @@ type ChannelKeeper interface {
 
 // 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

@@ -7,11 +7,11 @@ import (
 	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"
 )

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

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

@@ -7,10 +7,10 @@ import (
 	context "context"
 	fmt "fmt"
 	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
-	types "github.com/cosmos/ibc-go/v6/modules/core/04-channel/types"
-	_ "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"
+	types "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
@@ -223,6 +223,7 @@ func _Msg_SendPacket_Handler(srv interface{}, ctx context.Context, dec func(inte
 	return interceptor(ctx, in, info, handler)
 }
 
+var Msg_serviceDesc = _Msg_serviceDesc
 var _Msg_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "agoric.vibc.Msg",
 	HandlerType: (*MsgServer)(nil),

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/v6/modules/core/04-channel/types"
+	channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
 
-	"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"
 )

package/x/vlocalchain/keeper/keeper.go

@@ -8,8 +8,8 @@ import (
 	"strings"
 	"unicode"
 
-	"github.com/gogo/protobuf/jsonpb"
-	"github.com/gogo/protobuf/proto"
+	"github.com/cosmos/gogoproto/jsonpb"
+	"github.com/cosmos/gogoproto/proto"
 
 	"github.com/cosmos/cosmos-sdk/codec"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
@@ -17,7 +17,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkaddress "github.com/cosmos/cosmos-sdk/types/address"
 
-	abci "github.com/tendermint/tendermint/abci/types"
+	abci "github.com/cometbft/cometbft/abci/types"
 
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/vlocalchain/types"
 )

package/x/vlocalchain/types/vlocalchain.pb.go

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

package/x/vlocalchain/vlocalchain_test.go

@@ -12,6 +12,7 @@ import (
 	"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"
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/store"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
@@ -19,13 +20,12 @@ import (
 	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/v6/modules/apps/transfer/types"
-	"github.com/tendermint/tendermint/libs/log"
+	transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
 
-	"github.com/gogo/protobuf/jsonpb"
-	"github.com/gogo/protobuf/proto"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	dbm "github.com/tendermint/tm-db"
+	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 (

package/x/vstorage/alias.go

@@ -12,7 +12,6 @@ const (
 
 var (
 	NewKeeper   = keeper.NewKeeper
-	NewQuerier  = keeper.NewQuerier
 	NewStorage  = types.NewData
 	NewChildren = types.NewChildren
 )

package/x/vstorage/client/cli/query.go

@@ -4,7 +4,7 @@ import (
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/vstorage/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
-	"github.com/gogo/protobuf/proto"
+	"github.com/cosmos/gogoproto/proto"
 	"github.com/spf13/cobra"
 )
 

package/x/vstorage/genesis.go

@@ -4,8 +4,8 @@ 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"
-	abci "github.com/tendermint/tendermint/abci/types"
 )
 
 func NewGenesisState() *types.GenesisState {

package/x/vstorage/keeper/keeper.go

@@ -12,10 +12,10 @@ import (
 
 	sdkmath "cosmossdk.io/math"
 	metrics "github.com/armon/go-metrics"
+	db "github.com/cometbft/cometbft-db"
 	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"
 
 	agoric "github.com/Agoric/agoric-sdk/golang/cosmos/types"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/vstorage/types"
@@ -124,6 +124,7 @@ func NewKeeper(storeKey storetypes.StoreKey) Keeper {
 // 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
@@ -239,7 +240,7 @@ func (k Keeper) RemoveEntriesWithPrefix(ctx sdk.Context, pathPrefix string) {
 
 	for _, key := range keys {
 		rawValue := store.Get(key)
-		k.reportStoreSizeMetrics(0, len(key) + len(rawValue))
+		k.reportStoreSizeMetrics(0, len(key)+len(rawValue))
 		store.Delete(key)
 	}
 
@@ -396,7 +397,7 @@ func (k Keeper) SetStorage(ctx sdk.Context, entry agoric.KVEntry) {
 	if !entry.HasValue() {
 		if !k.HasChildren(ctx, path) {
 			// We have no children, can delete.
-			k.reportStoreSizeMetrics(0, len(encodedKey) + len(oldRawValue))
+			k.reportStoreSizeMetrics(0, len(encodedKey)+len(oldRawValue))
 			store.Delete(encodedKey)
 		} else {
 			// We have children, mark as an empty placeholder without deleting.
@@ -421,7 +422,7 @@ func (k Keeper) SetStorage(ctx sdk.Context, entry agoric.KVEntry) {
 				break
 			}
 			encodedAncestor := types.PathToEncodedKey(ancestor)
-			k.reportStoreSizeMetrics(0, len(encodedAncestor) + len(types.EncodedNoDataValue))
+			k.reportStoreSizeMetrics(0, len(encodedAncestor)+len(types.EncodedNoDataValue))
 			store.Delete(encodedAncestor)
 		}
 	} else {
@@ -433,7 +434,7 @@ func (k Keeper) SetStorage(ctx sdk.Context, entry agoric.KVEntry) {
 				break
 			}
 			encodedAncestor := types.PathToEncodedKey(ancestor)
-			k.reportStoreSizeMetrics(len(encodedAncestor) + len(types.EncodedNoDataValue), 0)
+			k.reportStoreSizeMetrics(len(encodedAncestor)+len(types.EncodedNoDataValue), 0)
 			store.Set(encodedAncestor, types.EncodedNoDataValue)
 		}
 	}

package/x/vstorage/keeper/keeper_test.go

@@ -11,10 +11,10 @@ import (
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/libs/log"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	dbm "github.com/tendermint/tm-db"
+	dbm "github.com/cometbft/cometbft-db"
+	abci "github.com/cometbft/cometbft/abci/types"
+	"github.com/cometbft/cometbft/libs/log"
+	tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
 )
 
 var (
@@ -227,51 +227,51 @@ func TestStorageNotify(t *testing.T) {
 		{
 			Type: "storage",
 			Attributes: []abci.EventAttribute{
-				{Key: []byte("path"), Value: []byte("notify.legacy")},
-				{Key: []byte("value"), Value: []byte("legacyValue")},
+				{Key: "path", Value: "notify.legacy"},
+				{Key: "value", Value: "legacyValue"},
 			},
 		},
 		{
 			Type: "state_change",
 			Attributes: []abci.EventAttribute{
-				{Key: []byte("store"), Value: []byte("vstorage")},
-				{Key: []byte("key"), Value: []byte("2\x00notify\x00legacy")},
-				{Key: []byte("anckey"), Value: []byte("\x012\x00notify\x00legacy\x01")},
-				{Key: []byte("value"), Value: []byte("legacyValue")},
+				{Key: "store", Value: "vstorage"},
+				{Key: "key", Value: "2\x00notify\x00legacy"},
+				{Key: "anckey", Value: "\x012\x00notify\x00legacy\x01"},
+				{Key: "value", Value: "legacyValue"},
 			},
 		},
 		{
 			Type: "storage",
 			Attributes: []abci.EventAttribute{
-				{Key: []byte("path"), Value: []byte("notify.legacy2")},
-				{Key: []byte("value"), Value: []byte("legacyValue2b")},
+				{Key: "path", Value: "notify.legacy2"},
+				{Key: "value", Value: "legacyValue2b"},
 			},
 		},
 		{
 			Type: "state_change",
 			Attributes: []abci.EventAttribute{
-				{Key: []byte("store"), Value: []byte("vstorage")},
-				{Key: []byte("key"), Value: []byte("2\x00notify\x00legacy2")},
-				{Key: []byte("anckey"), Value: []byte("\x012\x00notify\x00legacy2\x01")},
-				{Key: []byte("value"), Value: []byte("legacyValue2b")},
+				{Key: "store", Value: "vstorage"},
+				{Key: "key", Value: "2\x00notify\x00legacy2"},
+				{Key: "anckey", Value: "\x012\x00notify\x00legacy2\x01"},
+				{Key: "value", Value: "legacyValue2b"},
 			},
 		},
 		{
 			Type: "state_change",
 			Attributes: []abci.EventAttribute{
-				{Key: []byte("store"), Value: []byte("vstorage")},
-				{Key: []byte("key"), Value: []byte("2\x00notify\x00noLegacy")},
-				{Key: []byte("anckey"), Value: []byte("\x012\x00notify\x00noLegacy\x01")},
-				{Key: []byte("value"), Value: []byte("noLegacyValue")},
+				{Key: "store", Value: "vstorage"},
+				{Key: "key", Value: "2\x00notify\x00noLegacy"},
+				{Key: "anckey", Value: "\x012\x00notify\x00noLegacy\x01"},
+				{Key: "value", Value: "noLegacyValue"},
 			},
 		},
 		{
 			Type: "state_change",
 			Attributes: []abci.EventAttribute{
-				{Key: []byte("store"), Value: []byte("vstorage")},
-				{Key: []byte("key"), Value: []byte("2\x00notify\x00noLegacy2")},
-				{Key: []byte("anckey"), Value: []byte("\x012\x00notify\x00noLegacy2\x01")},
-				{Key: []byte("value"), Value: []byte("noLegacyValue2b")},
+				{Key: "store", Value: "vstorage"},
+				{Key: "key", Value: "2\x00notify\x00noLegacy2"},
+				{Key: "anckey", Value: "\x012\x00notify\x00noLegacy2\x01"},
+				{Key: "value", Value: "noLegacyValue2b"},
 			},
 		},
 	}

package/x/vstorage/keeper/querier.go

@@ -1,7 +1,7 @@
 package keeper
 
 import (
-	abci "github.com/tendermint/tendermint/abci/types"
+	abci "github.com/cometbft/cometbft/abci/types"
 
 	sdkioerrors "cosmossdk.io/errors"
 	"github.com/cosmos/cosmos-sdk/codec"
@@ -26,37 +26,6 @@ func getVstorageEntryPath(urlPathSegments []string) (string, error) {
 	return urlPathSegments[0], nil
 }
 
-// NewQuerier returns the function for handling queries routed to this module.
-// It performs its own routing based on the first slash-separated URL path
-// segment (e.g., URL path `/data/foo.bar` is a request for the value associated
-// with vstorage path "foo.bar", and `/children/foo.bar` is a request for the
-// child path segments immediately underneath vstorage path "foo.bar" which may
-// be used to extend it to a vstorage path such as "foo.bar.baz").
-func NewQuerier(keeper Keeper, legacyQuerierCdc *codec.LegacyAmino) sdk.Querier {
-	return func(ctx sdk.Context, urlPathSegments []string, req abci.RequestQuery) (res []byte, err error) {
-		var queryType string
-		if len(urlPathSegments) > 0 {
-			queryType = urlPathSegments[0]
-		}
-		switch queryType {
-		case QueryData:
-			entryPath, entryPathErr := getVstorageEntryPath(urlPathSegments[1:])
-			if entryPathErr != nil {
-				return nil, entryPathErr
-			}
-			return queryData(ctx, entryPath, req, keeper, legacyQuerierCdc)
-		case QueryChildren:
-			entryPath, entryPathErr := getVstorageEntryPath(urlPathSegments[1:])
-			if entryPathErr != nil {
-				return nil, entryPathErr
-			}
-			return queryChildren(ctx, entryPath, req, keeper, legacyQuerierCdc)
-		default:
-			return nil, sdkioerrors.Wrap(sdkerrors.ErrUnknownRequest, "unknown vstorage query path")
-		}
-	}
-}
-
 // nolint: unparam
 func queryData(ctx sdk.Context, path string, req abci.RequestQuery, keeper Keeper, legacyQuerierCdc *codec.LegacyAmino) (res []byte, err error) {
 	entry := keeper.GetEntry(ctx, path)

package/x/vstorage/keeper/querier_test.go

@@ -2,22 +2,57 @@ package keeper
 
 import (
 	"bytes"
+	"encoding/json"
 	"testing"
 
 	agoric "github.com/Agoric/agoric-sdk/golang/cosmos/types"
-
-	abci "github.com/tendermint/tendermint/abci/types"
+	"github.com/Agoric/agoric-sdk/golang/cosmos/x/vstorage/types"
 
 	sdkioerrors "cosmossdk.io/errors"
-	"github.com/cosmos/cosmos-sdk/codec"
+	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
 
+func runRpc(ctx sdk.Context, querier Querier, rpc string, args []string) (res []byte, err error) {
+	defer func() {
+		if r := recover(); r != nil {
+			err = sdkerrors.ErrInvalidRequest
+		}
+	}()
+	switch rpc {
+	case "children":
+		if len(args) != 1 {
+			return nil, sdkerrors.ErrInvalidRequest
+		}
+		req := &types.QueryChildrenRequest{Path: args[0]}
+		r, err := querier.Children(sdk.WrapSDKContext(ctx), req)
+		if err != nil {
+			return nil, err
+		}
+		return json.MarshalIndent(r, "", "  ")
+
+	case "data":
+		if len(args) != 1 {
+			return nil, sdkerrors.ErrInvalidRequest
+		}
+		req := &types.QueryDataRequest{Path: args[0]}
+		r, err := querier.Data(sdk.WrapSDKContext(ctx), req)
+		if r != nil && r.Value == "" {
+			return nil, sdkerrors.ErrNotFound
+		}
+		if err != nil {
+			return nil, err
+		}
+		return json.MarshalIndent(r, "", "  ")
+	default:
+		return nil, sdkerrors.ErrUnknownRequest
+	}
+}
+
 func TestQuerier(t *testing.T) {
 	testKit := makeTestKit()
 	ctx, keeper := testKit.ctx, testKit.vstorageKeeper
-	legacyQuerierCdc := codec.NewAminoCodec(codec.NewLegacyAmino())
-	querier := NewQuerier(keeper, legacyQuerierCdc.LegacyAmino)
+	querier := Querier{keeper}
 
 	// Populate mock data
 	keeper.SetStorage(ctx, agoric.NewKVEntry("foo.bar", "42"))
@@ -99,7 +134,7 @@ func TestQuerier(t *testing.T) {
 	}...)
 
 	for _, desc := range testCases {
-		res, err := querier(ctx, desc.path, abci.RequestQuery{})
+		res, err := runRpc(ctx, querier, desc.path[0], desc.path[1:])
 		if desc.err != nil {
 			if err == nil {
 				t.Errorf("%s: got no error, want error %q", desc.label, *desc.err)

package/x/vstorage/module.go

@@ -15,8 +15,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
@@ -90,19 +90,6 @@ func (AppModule) Name() string {
 
 func (am AppModule) RegisterInvariants(ir sdk.InvariantRegistry) {}
 
-func (am AppModule) Route() sdk.Route {
-	return sdk.NewRoute(types.RouterKey, NewHandler(am.keeper))
-}
-
-func (am AppModule) QuerierRoute() string {
-	return ModuleName
-}
-
-// LegacyQuerierHandler returns the sdk.Querier for deployment module
-func (am AppModule) LegacyQuerierHandler(legacyQuerierCdc *codec.LegacyAmino) sdk.Querier {
-	return keeper.NewQuerier(am.keeper, legacyQuerierCdc)
-}
-
 func (am AppModule) RegisterServices(cfg module.Configurator) {
 	querier := keeper.Querier{Keeper: am.keeper}
 	types.RegisterQueryServer(cfg.QueryServer(), querier)

package/x/vstorage/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/vstorage/types/query.pb.go

@@ -7,9 +7,9 @@ import (
 	context "context"
 	fmt "fmt"
 	query "github.com/cosmos/cosmos-sdk/types/query"
-	_ "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"
@@ -135,8 +135,10 @@ type QueryCapDataRequest struct {
 	ItemFormat string `protobuf:"bytes,3,opt,name=item_format,json=itemFormat,proto3" json:"itemFormat" yaml:"itemFormat"`
 	// remotableValueFormat indicates how to transform references to opaque but
 	// distinguishable Remotables into readable embedded representations.
-	// * "object" represents each Remotable as an `{ id, allegedName }` object, e.g. `{ "id": "board007", "allegedName": "IST brand" }`.
-	// * "string" represents each Remotable as a string with bracket-wrapped contents including its alleged name and id, e.g. "[Alleged: IST brand <board007>]".
+	// * "object" represents each Remotable as an `{ id, allegedName }` object, e.g. `{ "id": "board007", "allegedName":
+	// "IST brand" }`.
+	// * "string" represents each Remotable as a string with bracket-wrapped contents including its alleged name and id,
+	// e.g. "[Alleged: IST brand <board007>]".
 	RemotableValueFormat string `protobuf:"bytes,10,opt,name=remotable_value_format,json=remotableValueFormat,proto3" json:"remotableValueFormat" yaml:"remotableValueFormat"`
 }
 
@@ -557,6 +559,7 @@ func _Query_Children_Handler(srv interface{}, ctx context.Context, dec func(inte
 	return interceptor(ctx, in, info, handler)
 }
 
+var Query_serviceDesc = _Query_serviceDesc
 var _Query_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "agoric.vstorage.Query",
 	HandlerType: (*QueryServer)(nil),

package/x/vstorage/types/vstorage.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/vstorage/vstorage_test.go

@@ -15,9 +15,9 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	agorictypes "github.com/Agoric/agoric-sdk/golang/cosmos/types"
-	"github.com/tendermint/tendermint/libs/log"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	dbm "github.com/tendermint/tm-db"
+	dbm "github.com/cometbft/cometbft-db"
+	"github.com/cometbft/cometbft/libs/log"
+	tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
 )
 
 var (

package/x/vtransfer/genesis.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/vtransfer/types"
+	abci "github.com/cometbft/cometbft/abci/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	abci "github.com/tendermint/tendermint/abci/types"
 )
 
 func NewGenesisState() *types.GenesisState {

package/x/vtransfer/ibc_middleware.go

@@ -4,10 +4,10 @@ import (
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/vtransfer/keeper"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	capabilitytypes "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"
-	"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"
+	"github.com/cosmos/ibc-go/v7/modules/core/exported"
 )
 
 // IBCMiddleware (https://ibc.cosmos.network/main/ibc/apps/ibcmodule) forwards