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

package/x/vstorage/keeper/keeper.go

@@ -10,12 +10,14 @@ import (
 	"strconv"
 	"strings"
 
+	corestore "cosmossdk.io/core/store"
 	sdkmath "cosmossdk.io/math"
-	metrics "github.com/armon/go-metrics"
-	db "github.com/cometbft/cometbft-db"
-	storetypes "github.com/cosmos/cosmos-sdk/store/types"
+	storetypes "cosmossdk.io/store/types"
+	db "github.com/cosmos/cosmos-db"
+	"github.com/cosmos/cosmos-sdk/runtime"
 	"github.com/cosmos/cosmos-sdk/telemetry"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	metrics "github.com/hashicorp/go-metrics"
 
 	agoric "github.com/Agoric/agoric-sdk/golang/cosmos/types"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/vstorage/types"
@@ -39,9 +41,9 @@ type ProposedChange struct {
 }
 
 type ChangeManager interface {
-	Track(ctx sdk.Context, k Keeper, entry agoric.KVEntry, isLegacy bool)
-	EmitEvents(ctx sdk.Context, k Keeper)
-	Rollback(ctx sdk.Context)
+	Track(ctx sdk.Context, k Keeper, entry agoric.KVEntry, isLegacy bool) error
+	EmitEvents(ctx sdk.Context, k Keeper) error
+	Rollback(ctx sdk.Context) error
 }
 
 type BatchingChangeManager struct {
@@ -52,16 +54,17 @@ type BatchingChangeManager struct {
 var _ ChangeManager = (*BatchingChangeManager)(nil)
 
 // 2 ** 256 - 1
-var MaxSDKInt = sdk.NewIntFromBigInt(new(big.Int).Sub(new(big.Int).Exp(big.NewInt(2), big.NewInt(256), nil), big.NewInt(1)))
+var MaxSDKInt = sdkmath.NewIntFromBigInt(new(big.Int).Sub(new(big.Int).Exp(big.NewInt(2), big.NewInt(256), nil), big.NewInt(1)))
 
 // Keeper maintains the link to data storage and exposes getter/setter methods
 // for the various parts of the state machine
 type Keeper struct {
+	storeName     string // The name of the store, used for telemetry.
+	storeService  corestore.KVStoreService
 	changeManager ChangeManager
-	storeKey      storetypes.StoreKey
 }
 
-func (bcm *BatchingChangeManager) Track(ctx sdk.Context, k Keeper, entry agoric.KVEntry, isLegacy bool) {
+func (bcm *BatchingChangeManager) Track(ctx sdk.Context, k Keeper, entry agoric.KVEntry, isLegacy bool) error {
 	path := entry.Key()
 	// TODO: differentiate between deletion and setting empty string?
 	// Using empty string for deletion for backwards compatibility
@@ -71,7 +74,7 @@ func (bcm *BatchingChangeManager) Track(ctx sdk.Context, k Keeper, entry agoric.
 		if isLegacy {
 			change.LegacyEvents = true
 		}
-		return
+		return nil
 	}
 	bcm.changes[path] = &ProposedChange{
 		Path:               path,
@@ -79,18 +82,20 @@ func (bcm *BatchingChangeManager) Track(ctx sdk.Context, k Keeper, entry agoric.
 		ValueFromLastBlock: k.GetEntry(ctx, path).StringValue(),
 		LegacyEvents:       isLegacy,
 	}
+	return nil
 }
 
-func (bcm *BatchingChangeManager) Rollback(ctx sdk.Context) {
+func (bcm *BatchingChangeManager) Rollback(ctx sdk.Context) error {
 	bcm.changes = make(map[string]*ProposedChange)
+	return nil
 }
 
 // EmitEvents emits events for all actual changes.
 // This does not clear the cache, so the caller must call Rollback() to do so.
-func (bcm *BatchingChangeManager) EmitEvents(ctx sdk.Context, k Keeper) {
+func (bcm *BatchingChangeManager) EmitEvents(ctx sdk.Context, k Keeper) error {
 	changes := bcm.changes
 	if len(changes) == 0 {
-		return
+		return nil
 	}
 
 	// Deterministic order.
@@ -104,6 +109,8 @@ func (bcm *BatchingChangeManager) EmitEvents(ctx sdk.Context, k Keeper) {
 		change := bcm.changes[path]
 		k.EmitChange(ctx, change)
 	}
+
+	return nil
 }
 
 // The BatchingChangeManager needs to be a pointer because its state is mutated.
@@ -112,14 +119,15 @@ func NewBatchingChangeManager() *BatchingChangeManager {
 	return &bcm
 }
 
-func NewKeeper(storeKey storetypes.StoreKey) Keeper {
+func NewKeeper(storeName string, storeService corestore.KVStoreService) Keeper {
 	return Keeper{
-		storeKey:      storeKey,
+		storeName:     storeName,
+		storeService:  storeService,
 		changeManager: NewBatchingChangeManager(),
 	}
 }
 
-// size_increase and size_decrease metrics represent total writes and deletes *issued*
+// size_increase and size_decπrease 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"}
@@ -131,7 +139,7 @@ const MetricLabelStoreKey = "storeKey"
 // when Cosmos telemetry is enabled.
 func (k Keeper) reportStoreSizeMetrics(increase int, decrease int) {
 	metricsLabel := []metrics.Label{
-		telemetry.NewLabel(MetricLabelStoreKey, k.storeKey.Name()),
+		telemetry.NewLabel(MetricLabelStoreKey, k.GetStoreName()),
 	}
 	if increase > 0 {
 		telemetry.IncrCounterWithLabels(MetricKeyStoreSizeIncrease, float32(increase), metricsLabel)
@@ -142,17 +150,17 @@ func (k Keeper) reportStoreSizeMetrics(increase int, decrease int) {
 }
 
 // ExportStorage fetches all storage
-func (k Keeper) ExportStorage(ctx sdk.Context) []*types.DataEntry {
+func (k Keeper) ExportStorage(ctx sdk.Context) ([]*types.DataEntry, error) {
 	return k.ExportStorageFromPrefix(ctx, "")
 }
 
 // ExportStorageFromPrefix fetches storage only under the supplied pathPrefix.
-func (k Keeper) ExportStorageFromPrefix(ctx sdk.Context, pathPrefix string) []*types.DataEntry {
-	store := ctx.KVStore(k.storeKey)
+func (k Keeper) ExportStorageFromPrefix(ctx sdk.Context, pathPrefix string) ([]*types.DataEntry, error) {
+	store := k.storeService.OpenKVStore(ctx)
 
 	if len(pathPrefix) > 0 {
 		if err := types.ValidatePath(pathPrefix); err != nil {
-			panic(err)
+			return nil, err
 		}
 		pathPrefix = pathPrefix + types.PathSeparator
 	}
@@ -164,10 +172,11 @@ func (k Keeper) ExportStorageFromPrefix(ctx sdk.Context, pathPrefix string) []*t
 	// entries will be exported. An alternative implementation would be to
 	// recursively list all children under the pathPrefix, and export them.
 
-	iterator := sdk.KVStorePrefixIterator(store, nil)
+	kvstore := runtime.KVStoreAdapter(store)
+	iterator := storetypes.KVStorePrefixIterator(kvstore, nil)
+	defer iterator.Close()
 
 	exported := []*types.DataEntry{}
-	defer iterator.Close()
 	for ; iterator.Valid(); iterator.Next() {
 		rawValue := iterator.Value()
 		if len(rawValue) == 0 {
@@ -182,26 +191,28 @@ func (k Keeper) ExportStorageFromPrefix(ctx sdk.Context, pathPrefix string) []*t
 		}
 		value, hasPrefix := bytes.CutPrefix(rawValue, types.EncodedDataPrefix)
 		if !hasPrefix {
-			panic(fmt.Errorf("value at path %q starts with unexpected prefix", path))
+			return nil, fmt.Errorf("value at path %q starts with unexpected prefix", path)
 		}
 		path = path[len(pathPrefix):]
 		entry := types.DataEntry{Path: path, Value: string(value)}
 		exported = append(exported, &entry)
 	}
-	return exported
+	return exported, nil
 }
 
-func (k Keeper) ImportStorage(ctx sdk.Context, entries []*types.DataEntry) {
+func (k Keeper) ImportStorage(ctx sdk.Context, entries []*types.DataEntry) error {
 	for _, entry := range entries {
 		// This set does the bookkeeping for us in case the entries aren't a
 		// complete tree.
 		k.SetStorage(ctx, agoric.NewKVEntry(entry.Path, entry.Value))
 	}
+	return nil
 }
 
-func getEncodedKeysWithPrefixFromIterator(iterator sdk.Iterator, prefix string) [][]byte {
-	keys := make([][]byte, 0)
+func getEncodedKeysWithPrefixFromIterator(iterator storetypes.Iterator, prefix string) [][]byte {
 	defer iterator.Close()
+
+	keys := make([][]byte, 0)
 	for ; iterator.Valid(); iterator.Next() {
 		key := iterator.Key()
 		path := types.EncodedKeyToPath(key)
@@ -217,7 +228,8 @@ func getEncodedKeysWithPrefixFromIterator(iterator sdk.Iterator, prefix string)
 // It has the same effect as listing children of the prefix and removing each
 // descendant recursively.
 func (k Keeper) RemoveEntriesWithPrefix(ctx sdk.Context, pathPrefix string) {
-	store := ctx.KVStore(k.storeKey)
+	kvstore := k.storeService.OpenKVStore(ctx)
+	store := runtime.KVStoreAdapter(kvstore)
 
 	if len(pathPrefix) == 0 {
 		panic("cannot remove all content")
@@ -234,7 +246,7 @@ func (k Keeper) RemoveEntriesWithPrefix(ctx sdk.Context, pathPrefix string) {
 	// entries will be deleted. An alternative implementation would be to
 	// recursively list all children under the descendantPrefix, and delete them.
 
-	iterator := sdk.KVStorePrefixIterator(store, nil)
+	iterator := storetypes.KVStorePrefixIterator(store, nil)
 
 	keys := getEncodedKeysWithPrefixFromIterator(iterator, descendantPrefix)
 
@@ -275,7 +287,9 @@ func (k Keeper) EmitChange(ctx sdk.Context, change *ProposedChange) {
 // GetEntry gets generic storage.  The default value is an empty string.
 func (k Keeper) GetEntry(ctx sdk.Context, path string) agoric.KVEntry {
 	//fmt.Printf("GetEntry(%s)\n", path);
-	store := ctx.KVStore(k.storeKey)
+	kvstore := k.storeService.OpenKVStore(ctx)
+	store := runtime.KVStoreAdapter(kvstore)
+
 	encodedKey := types.PathToEncodedKey(path)
 	rawValue := store.Get(encodedKey)
 	if len(rawValue) == 0 {
@@ -292,19 +306,20 @@ func (k Keeper) GetEntry(ctx sdk.Context, path string) agoric.KVEntry {
 }
 
 func (k Keeper) getKeyIterator(ctx sdk.Context, path string) db.Iterator {
-	store := ctx.KVStore(k.storeKey)
+	kvstore := k.storeService.OpenKVStore(ctx)
+	store := runtime.KVStoreAdapter(kvstore)
 	keyPrefix := types.PathToChildrenPrefix(path)
 
-	return sdk.KVStorePrefixIterator(store, keyPrefix)
+	return storetypes.KVStorePrefixIterator(store, keyPrefix)
 }
 
 // GetChildren gets all vstorage child children at a given path
 func (k Keeper) GetChildren(ctx sdk.Context, path string) *types.Children {
 	iterator := k.getKeyIterator(ctx, path)
+	defer iterator.Close()
 
 	var children types.Children
 	children.Children = []string{}
-	defer iterator.Close()
 	for ; iterator.Valid(); iterator.Next() {
 		parts := strings.Split(types.EncodedKeyToPath(iterator.Key()), types.PathSeparator)
 		childrentr := parts[len(parts)-1]
@@ -322,14 +337,16 @@ func (k Keeper) HasStorage(ctx sdk.Context, path string) bool {
 
 // HasEntry tells if a given path has either subnodes or data.
 func (k Keeper) HasEntry(ctx sdk.Context, path string) bool {
-	store := ctx.KVStore(k.storeKey)
+	kvstore := k.storeService.OpenKVStore(ctx)
+	store := runtime.KVStoreAdapter(kvstore)
+
 	encodedKey := types.PathToEncodedKey(path)
 
 	// Check if we have a path entry.
 	return store.Has(encodedKey)
 }
 
-// HasChildren tells if a given path has child children.
+// HasChildren tells if a given path has child nodes.
 func (k Keeper) HasChildren(ctx sdk.Context, path string) bool {
 	// Check if we have children.
 	iterator := k.getKeyIterator(ctx, path)
@@ -337,13 +354,16 @@ func (k Keeper) HasChildren(ctx sdk.Context, path string) bool {
 	return iterator.Valid()
 }
 
-func (k Keeper) NewChangeBatch(ctx sdk.Context) {
-	k.changeManager.Rollback(ctx)
+func (k Keeper) NewChangeBatch(ctx sdk.Context) error {
+	return k.changeManager.Rollback(ctx)
 }
 
-func (k Keeper) FlushChangeEvents(ctx sdk.Context) {
-	k.changeManager.EmitEvents(ctx, k)
-	k.changeManager.Rollback(ctx)
+func (k Keeper) FlushChangeEvents(ctx sdk.Context) error {
+	if err := k.changeManager.EmitEvents(ctx, k); err != nil {
+		return err
+	}
+
+	return k.changeManager.Rollback(ctx)
 }
 
 func (k Keeper) SetStorageAndNotify(ctx sdk.Context, entry agoric.KVEntry) {
@@ -389,7 +409,9 @@ func componentsToPath(components []string) string {
 // Maintains the invariant: path entries exist if and only if self or some
 // descendant has non-empty storage
 func (k Keeper) SetStorage(ctx sdk.Context, entry agoric.KVEntry) {
-	store := ctx.KVStore(k.storeKey)
+	kvstore := k.storeService.OpenKVStore(ctx)
+	store := runtime.KVStoreAdapter(kvstore)
+
 	path := entry.Key()
 	encodedKey := types.PathToEncodedKey(path)
 	oldRawValue := store.Get(encodedKey)
@@ -445,7 +467,7 @@ func (k Keeper) PathToEncodedKey(path string) []byte {
 }
 
 func (k Keeper) GetStoreName() string {
-	return k.storeKey.Name()
+	return k.storeName
 }
 
 func (k Keeper) GetDataPrefix() []byte {
@@ -459,10 +481,10 @@ func (k Keeper) GetNoDataValue() []byte {
 func (k Keeper) GetIntValue(ctx sdk.Context, path string) (sdkmath.Int, error) {
 	indexEntry := k.GetEntry(ctx, path)
 	if !indexEntry.HasValue() {
-		return sdk.NewInt(0), nil
+		return sdkmath.NewInt(0), nil
 	}
 
-	index, ok := sdk.NewIntFromString(indexEntry.StringValue())
+	index, ok := sdkmath.NewIntFromString(indexEntry.StringValue())
 	if !ok {
 		return index, fmt.Errorf("couldn't parse %s as Int: %s", path, indexEntry.StringValue())
 	}
@@ -493,7 +515,7 @@ func (k Keeper) PushQueueItem(ctx sdk.Context, queuePath string, value string) e
 	if tail.GTE(MaxSDKInt) {
 		return errors.New(queuePath + " overflow")
 	}
-	nextTail := tail.Add(sdk.NewInt(1))
+	nextTail := tail.Add(sdkmath.NewInt(1))
 
 	// Set the vstorage corresponding to the queue entry for the current tail.
 	path := queuePath + "." + tail.String()

package/x/vstorage/keeper/keeper_test.go

@@ -4,16 +4,17 @@ import (
 	"reflect"
 	"testing"
 
+	"cosmossdk.io/store"
+	storemetrics "cosmossdk.io/store/metrics"
+	storetypes "cosmossdk.io/store/types"
 	agoric "github.com/Agoric/agoric-sdk/golang/cosmos/types"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/vstorage/types"
-
-	"github.com/cosmos/cosmos-sdk/store"
-	storetypes "github.com/cosmos/cosmos-sdk/store/types"
+	abcitypes "github.com/cometbft/cometbft/abci/types"
+	dbm "github.com/cosmos/cosmos-db"
+	"github.com/cosmos/cosmos-sdk/runtime"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	dbm "github.com/cometbft/cometbft-db"
-	abci "github.com/cometbft/cometbft/abci/types"
-	"github.com/cometbft/cometbft/libs/log"
+	"cosmossdk.io/log"
 	tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
 )
 
@@ -27,10 +28,9 @@ type testKit struct {
 }
 
 func makeTestKit() testKit {
-	keeper := NewKeeper(vstorageStoreKey)
-
 	db := dbm.NewMemDB()
-	ms := store.NewCommitMultiStore(db)
+	logger := log.NewNopLogger()
+	ms := store.NewCommitMultiStore(db, logger, storemetrics.NewNoOpMetrics())
 	ms.MountStoreWithDB(vstorageStoreKey, storetypes.StoreTypeIAVL, db)
 	err := ms.LoadLatestVersion()
 	if err != nil {
@@ -38,6 +38,9 @@ func makeTestKit() testKit {
 	}
 	ctx := sdk.NewContext(ms, tmproto.Header{}, false, log.NewNopLogger())
 
+	storeService := runtime.NewKVStoreService(vstorageStoreKey)
+	keeper := NewKeeper(types.StoreKey, storeService)
+
 	return testKit{ctx, keeper}
 }
 
@@ -171,7 +174,10 @@ func TestStorage(t *testing.T) {
 		{Path: "key2.child2.grandchild2", Value: "value2grandchild"},
 		{Path: "key2.child2.grandchild2a", Value: "value2grandchilda"},
 	}
-	gotExport := keeper.ExportStorage(ctx)
+	gotExport, err := keeper.ExportStorage(ctx)
+	if err != nil {
+		t.Errorf("ExportStorage failed: %v", err)
+	}
 	if !reflect.DeepEqual(gotExport, expectedExport) {
 		t.Errorf("got export %q, want %q", gotExport, expectedExport)
 	}
@@ -181,7 +187,11 @@ func TestStorage(t *testing.T) {
 		{Path: "child2.grandchild2", Value: "value2grandchild"},
 		{Path: "child2.grandchild2a", Value: "value2grandchilda"},
 	}
-	if got := keeper.ExportStorageFromPrefix(ctx, "key2"); !reflect.DeepEqual(got, expectedKey2Export) {
+	got, err := keeper.ExportStorageFromPrefix(ctx, "key2")
+	if err != nil {
+		t.Errorf("ExportStorageFromPrefix failed: %v", err)
+	}
+	if !reflect.DeepEqual(got, expectedKey2Export) {
 		t.Errorf("got export %q, want %q", got, expectedKey2Export)
 	}
 
@@ -194,13 +204,19 @@ func TestStorage(t *testing.T) {
 		{Path: "beta3", Value: "value3"},
 		{Path: "inited", Value: ""},
 	}
-	gotRemainingExport := keeper.ExportStorage(ctx)
+	gotRemainingExport, err := keeper.ExportStorage(ctx)
+	if err != nil {
+		t.Errorf("ExportStorage failed: %v", err)
+	}
 	if !reflect.DeepEqual(gotRemainingExport, expectedRemainingExport) {
 		t.Errorf("got remaining export %q, want %q", expectedRemainingExport, expectedRemainingExport)
 	}
 
 	keeper.ImportStorage(ctx, gotExport)
-	gotExport = keeper.ExportStorage(ctx)
+	gotExport, err = keeper.ExportStorage(ctx)
+	if err != nil {
+		t.Errorf("ExportStorage failed: %v", err)
+	}
 	if !reflect.DeepEqual(gotExport, expectedExport) {
 		t.Errorf("got export %q after import, want %q", gotExport, expectedExport)
 	}
@@ -226,14 +242,14 @@ func TestStorageNotify(t *testing.T) {
 	expectedAfterFlushEvents := sdk.Events{
 		{
 			Type: "storage",
-			Attributes: []abci.EventAttribute{
+			Attributes: []abcitypes.EventAttribute{
 				{Key: "path", Value: "notify.legacy"},
 				{Key: "value", Value: "legacyValue"},
 			},
 		},
 		{
 			Type: "state_change",
-			Attributes: []abci.EventAttribute{
+			Attributes: []abcitypes.EventAttribute{
 				{Key: "store", Value: "vstorage"},
 				{Key: "key", Value: "2\x00notify\x00legacy"},
 				{Key: "anckey", Value: "\x012\x00notify\x00legacy\x01"},
@@ -242,14 +258,14 @@ func TestStorageNotify(t *testing.T) {
 		},
 		{
 			Type: "storage",
-			Attributes: []abci.EventAttribute{
+			Attributes: []abcitypes.EventAttribute{
 				{Key: "path", Value: "notify.legacy2"},
 				{Key: "value", Value: "legacyValue2b"},
 			},
 		},
 		{
 			Type: "state_change",
-			Attributes: []abci.EventAttribute{
+			Attributes: []abcitypes.EventAttribute{
 				{Key: "store", Value: "vstorage"},
 				{Key: "key", Value: "2\x00notify\x00legacy2"},
 				{Key: "anckey", Value: "\x012\x00notify\x00legacy2\x01"},
@@ -258,7 +274,7 @@ func TestStorageNotify(t *testing.T) {
 		},
 		{
 			Type: "state_change",
-			Attributes: []abci.EventAttribute{
+			Attributes: []abcitypes.EventAttribute{
 				{Key: "store", Value: "vstorage"},
 				{Key: "key", Value: "2\x00notify\x00noLegacy"},
 				{Key: "anckey", Value: "\x012\x00notify\x00noLegacy\x01"},
@@ -267,7 +283,7 @@ func TestStorageNotify(t *testing.T) {
 		},
 		{
 			Type: "state_change",
-			Attributes: []abci.EventAttribute{
+			Attributes: []abcitypes.EventAttribute{
 				{Key: "store", Value: "vstorage"},
 				{Key: "key", Value: "2\x00notify\x00noLegacy2"},
 				{Key: "anckey", Value: "\x012\x00notify\x00noLegacy2\x01"},

package/x/vstorage/module.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 
+	"cosmossdk.io/core/appmodule"
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/spf13/cobra"
 
@@ -15,14 +16,16 @@ 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"
 )
 
 // type check to ensure the interface is properly implemented
 var (
-	_ module.AppModule      = AppModule{}
-	_ module.AppModuleBasic = AppModuleBasic{}
+	_ module.AppModule          = AppModule{}
+	_ module.HasGenesis         = AppModule{}
+	_ module.AppModuleBasic     = AppModuleBasic{}
+	_ appmodule.HasBeginBlocker = AppModule{}
+	_ appmodule.HasEndBlocker   = AppModule{}
 )
 
 // app module Basics object
@@ -75,6 +78,12 @@ type AppModule struct {
 	keeper Keeper
 }
 
+// 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() {}
+
 // NewAppModule creates a new AppModule Object
 func NewAppModule(k Keeper) AppModule {
 	am := AppModule{
@@ -97,23 +106,28 @@ func (am AppModule) RegisterServices(cfg module.Configurator) {
 
 func (AppModule) ConsensusVersion() uint64 { return 1 }
 
-func (am AppModule) BeginBlock(ctx sdk.Context, req abci.RequestBeginBlock) {
-	am.keeper.NewChangeBatch(ctx)
+func (am AppModule) BeginBlock(ctx context.Context) error {
+	return am.keeper.NewChangeBatch(sdk.UnwrapSDKContext(ctx))
 }
 
-func (am AppModule) EndBlock(ctx sdk.Context, req abci.RequestEndBlock) []abci.ValidatorUpdate {
-	am.keeper.FlushChangeEvents(ctx)
-	// Prevent Cosmos SDK internal errors.
-	return []abci.ValidatorUpdate{}
+func (am AppModule) EndBlock(ctx context.Context) error {
+	return am.keeper.FlushChangeEvents(sdk.UnwrapSDKContext(ctx))
 }
 
-func (am AppModule) InitGenesis(ctx sdk.Context, cdc codec.JSONCodec, data json.RawMessage) []abci.ValidatorUpdate {
+func (am AppModule) InitGenesis(ctx sdk.Context, cdc codec.JSONCodec, data json.RawMessage) {
 	var genesisState types.GenesisState
-	cdc.MustUnmarshalJSON(data, &genesisState)
-	return InitGenesis(ctx, am.keeper, &genesisState)
+	if err := cdc.UnmarshalJSON(data, &genesisState); err != nil {
+		panic(err)
+	}
+	if err := InitGenesis(ctx, am.keeper, &genesisState); err != nil {
+		panic(err)
+	}
 }
 
 func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.RawMessage {
-	gs := ExportGenesis(ctx, am.keeper)
+	gs, err := ExportGenesis(ctx, am.keeper)
+	if err != nil {
+		panic(err)
+	}
 	return cdc.MustMarshalJSON(gs)
 }

package/x/vstorage/testing/queue.go

@@ -3,12 +3,14 @@ package testing
 import (
 	"fmt"
 
+	sdkmath "cosmossdk.io/math"
+	storetypes "cosmossdk.io/store/types"
 	keeper "github.com/Agoric/agoric-sdk/golang/cosmos/x/vstorage/keeper"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
 func GetQueueItems(ctx sdk.Context, vstorageKeeper keeper.Keeper, queuePath string) ([]string, error) {
-	unlimitedCtx := ctx.WithGasMeter(sdk.NewInfiniteGasMeter())
+	unlimitedCtx := ctx.WithGasMeter(storetypes.NewInfiniteGasMeter())
 	head, err := vstorageKeeper.GetIntValue(unlimitedCtx, queuePath+".head")
 	if err != nil {
 		return nil, err
@@ -21,14 +23,14 @@ func GetQueueItems(ctx sdk.Context, vstorageKeeper keeper.Keeper, queuePath stri
 	values := make([]string, length)
 	var i int64
 	for i = 0; i < length; i++ {
-		path := fmt.Sprintf("%s.%s", queuePath, head.Add(sdk.NewInt(i)).String())
+		path := fmt.Sprintf("%s.%s", queuePath, head.Add(sdkmath.NewInt(i)).String())
 		values[i] = vstorageKeeper.GetEntry(unlimitedCtx, path).StringValue()
 	}
 	return values, nil
 }
 
 func ResetQueue(ctx sdk.Context, vstorageKeeper keeper.Keeper, queuePath string) error {
-	unlimitedCtx := ctx.WithGasMeter(sdk.NewInfiniteGasMeter())
+	unlimitedCtx := ctx.WithGasMeter(storetypes.NewInfiniteGasMeter())
 	vstorageKeeper.RemoveEntriesWithPrefix(unlimitedCtx, queuePath)
 	return nil
 }

package/x/vstorage/vstorage.go

@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 
+	storetypes "cosmossdk.io/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	agoric "github.com/Agoric/agoric-sdk/golang/cosmos/types"
@@ -54,7 +55,7 @@ func (sh vstorageHandler) Receive(cctx context.Context, str string) (ret string,
 	defer func() {
 		if r := recover(); r != nil {
 			switch rType := r.(type) {
-			case sdk.ErrorOutOfGas:
+			case storetypes.ErrorOutOfGas:
 				err = fmt.Errorf(
 					"out of gas in location: %v; gasUsed: %d",
 					rType.Descriptor, ctx.GasMeter().GasConsumed(),