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

package/third_party/proto/ibc/core/client/v1/client.proto

@@ -2,20 +2,20 @@ syntax = "proto3";
 
 package ibc.core.client.v1;
 
-option go_package = "github.com/cosmos/ibc-go/v7/modules/core/02-client/types";
+option go_package = "github.com/cosmos/ibc-go/v8/modules/core/02-client/types";
 
-import "gogoproto/gogo.proto";
-import "google/protobuf/any.proto";
 import "cosmos/upgrade/v1beta1/upgrade.proto";
 import "cosmos_proto/cosmos.proto";
+import "gogoproto/gogo.proto";
+import "google/protobuf/any.proto";
 
 // IdentifiedClientState defines a client state with an additional client
 // identifier field.
 message IdentifiedClientState {
   // client identifier
-  string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""];
+  string client_id = 1;
   // client state
-  google.protobuf.Any client_state = 2 [(gogoproto.moretags) = "yaml:\"client_state\""];
+  google.protobuf.Any client_state = 2;
 }
 
 // ConsensusStateWithHeight defines a consensus state with an additional height
@@ -24,26 +24,58 @@ message ConsensusStateWithHeight {
   // consensus state height
   Height height = 1 [(gogoproto.nullable) = false];
   // consensus state
-  google.protobuf.Any consensus_state = 2 [(gogoproto.moretags) = "yaml:\"consensus_state\""];
+  google.protobuf.Any consensus_state = 2;
 }
 
 // ClientConsensusStates defines all the stored consensus states for a given
 // client.
 message ClientConsensusStates {
   // client identifier
-  string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""];
+  string client_id = 1;
   // consensus states and their heights associated with the client
-  repeated ConsensusStateWithHeight consensus_states = 2
-      [(gogoproto.moretags) = "yaml:\"consensus_states\"", (gogoproto.nullable) = false];
+  repeated ConsensusStateWithHeight consensus_states = 2 [(gogoproto.nullable) = false];
+}
+
+// Height is a monotonically increasing data type
+// that can be compared against another Height for the purposes of updating and
+// freezing clients
+//
+// Normally the RevisionHeight is incremented at each height while keeping
+// RevisionNumber the same. However some consensus algorithms may choose to
+// reset the height in certain conditions e.g. hard forks, state-machine
+// breaking changes In these cases, the RevisionNumber is incremented so that
+// height continues to be monitonically increasing even as the RevisionHeight
+// gets reset
+message Height {
+  option (gogoproto.goproto_getters)  = false;
+  option (gogoproto.goproto_stringer) = false;
+
+  // the revision that the client is currently on
+  uint64 revision_number = 1;
+  // the height within the given revision
+  uint64 revision_height = 2;
+}
+
+// Params defines the set of IBC light client parameters.
+message Params {
+  // allowed_clients defines the list of allowed client state types which can be created
+  // and interacted with. If a client type is removed from the allowed clients list, usage
+  // of this client will be disabled until it is added again to the list.
+  repeated string allowed_clients = 1;
 }
 
-// ClientUpdateProposal is a governance proposal. If it passes, the substitute
+// ClientUpdateProposal is a legacy governance proposal. If it passes, the substitute
 // client's latest consensus state is copied over to the subject client. The proposal
 // handler may fail if the subject and the substitute do not match in client and
 // chain parameters (with exception to latest height, frozen height, and chain-id).
+//
+// Deprecated: Please use MsgRecoverClient in favour of this message type.
 message ClientUpdateProposal {
-  option (gogoproto.goproto_getters)         = false;
+  option deprecated = true;
+
   option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content";
+  option (gogoproto.goproto_getters)         = false;
+
   // the title of the update proposal
   string title = 1;
   // the description of the proposal
@@ -57,11 +89,15 @@ message ClientUpdateProposal {
 
 // UpgradeProposal is a gov Content type for initiating an IBC breaking
 // upgrade.
+//
+// Deprecated: Please use MsgIBCSoftwareUpgrade in favour of this message type.
 message UpgradeProposal {
+  option deprecated = true;
+
+  option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content";
   option (gogoproto.goproto_getters)         = false;
   option (gogoproto.goproto_stringer)        = false;
   option (gogoproto.equal)                   = true;
-  option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content";
 
   string                      title       = 1;
   string                      description = 2;
@@ -75,31 +111,3 @@ message UpgradeProposal {
   // planned chain upgrades
   google.protobuf.Any upgraded_client_state = 4 [(gogoproto.moretags) = "yaml:\"upgraded_client_state\""];
 }
-
-// Height is a monotonically increasing data type
-// that can be compared against another Height for the purposes of updating and
-// freezing clients
-//
-// Normally the RevisionHeight is incremented at each height while keeping
-// RevisionNumber the same. However some consensus algorithms may choose to
-// reset the height in certain conditions e.g. hard forks, state-machine
-// breaking changes In these cases, the RevisionNumber is incremented so that
-// height continues to be monitonically increasing even as the RevisionHeight
-// gets reset
-message Height {
-  option (gogoproto.goproto_getters)  = false;
-  option (gogoproto.goproto_stringer) = false;
-
-  // the revision that the client is currently on
-  uint64 revision_number = 1 [(gogoproto.moretags) = "yaml:\"revision_number\""];
-  // the height within the given revision
-  uint64 revision_height = 2 [(gogoproto.moretags) = "yaml:\"revision_height\""];
-}
-
-// Params defines the set of IBC light client parameters.
-message Params {
-  // allowed_clients defines the list of allowed client state types which can be created
-  // and interacted with. If a client type is removed from the allowed clients list, usage
-  // of this client will be disabled until it is added again to the list.
-  repeated string allowed_clients = 1 [(gogoproto.moretags) = "yaml:\"allowed_clients\""];
-}

package/types/address_hooks.go

@@ -7,8 +7,8 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/types/bech32"
 
-	transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
-	ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
+	transfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types"
+	ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported"
 )
 
 type AddressRole string

package/types/address_hooks_test.go

@@ -8,9 +8,9 @@ import (
 	codec "github.com/cosmos/cosmos-sdk/codec"
 	cdctypes "github.com/cosmos/cosmos-sdk/codec/types"
 
-	transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
-	clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
-	channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
+	transfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types"
+	clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types"
+	channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types"
 
 	agtypes "github.com/Agoric/agoric-sdk/golang/cosmos/types"
 )

package/types/ibc_packet.go

@@ -3,9 +3,9 @@ package types
 import (
 	"encoding/json"
 
-	clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
-	channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
-	"github.com/cosmos/ibc-go/v7/modules/core/exported"
+	clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types"
+	channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types"
+	"github.com/cosmos/ibc-go/v8/modules/core/exported"
 )
 
 var _ json.Marshaler = IBCPacket{}

package/types/ibc_packet_test.go

@@ -11,9 +11,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
-	channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
-	ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
+	clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types"
+	channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types"
+	ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported"
 )
 
 func CreateTestChannelPacket() channeltypes.Packet {

package/types/kv_entry_helpers.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"io"
 
+	storetypes "cosmossdk.io/store/types"
 	swingsettypes "github.com/Agoric/agoric-sdk/golang/cosmos/x/swingset/types"
 	vstoragetypes "github.com/Agoric/agoric-sdk/golang/cosmos/x/vstorage/types"
-	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
 // These helpers facilitate handling KVEntry streams, in particular for the
@@ -63,11 +63,11 @@ var _ KVEntryReader = &kvIteratorReader{}
 
 // kvIteratorReader is a KVEntryReader backed by an sdk.Iterator
 type kvIteratorReader struct {
-	iter sdk.Iterator
+	iter storetypes.Iterator
 }
 
 // NewKVIteratorReader returns a KVEntryReader backed by an sdk.Iterator.
-func NewKVIteratorReader(iter sdk.Iterator) KVEntryReader {
+func NewKVIteratorReader(iter storetypes.Iterator) KVEntryReader {
 	return &kvIteratorReader{
 		iter: iter,
 	}

package/types/kv_entry_helpers_test.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	sdk "github.com/cosmos/cosmos-sdk/types"
+	storetypes "cosmossdk.io/store/types"
 )
 
 func toKVEntryIdentity(entry KVEntry) (KVEntry, error) {
@@ -99,7 +99,7 @@ type kvEntryReaderIterator struct {
 
 // newKVEntryReaderIterator creates an iterator over a KVEntryReader.
 // KVEntry keys and values are reported as []byte from the reader in order.
-func newKVEntryReaderIterator(reader KVEntryReader) sdk.Iterator {
+func newKVEntryReaderIterator(reader KVEntryReader) storetypes.Iterator {
 	iter := &kvEntryReaderIterator{
 		reader: reader,
 	}

package/types/legacy_address_encoder.go

@@ -0,0 +1,58 @@
+package types
+
+import (
+	"encoding/json"
+	fmt "fmt"
+	io "io"
+
+	"cosmossdk.io/x/tx/signing/aminojson"
+	types "github.com/cosmos/cosmos-sdk/types"
+	"google.golang.org/protobuf/reflect/protoreflect"
+)
+
+func marshalJson(value interface{}, w io.Writer) error {
+	marshalledAddr, err := json.Marshal(value)
+	if err != nil {
+		return err
+	}
+	_, err = w.Write(marshalledAddr)
+	return err
+}
+
+func LegacyAddressEncoder(_enc *aminojson.Encoder, value protoreflect.Value, w io.Writer) error {
+	switch valueAddress := value.Interface().(type) {
+	case []byte:
+		if len(valueAddress) == 0 {
+			err := marshalJson("", w)
+			return err
+		}
+		err := types.VerifyAddressFormat(valueAddress)
+		if err != nil {
+			return err
+		}
+		var accAddr types.AccAddress = valueAddress
+		err = marshalJson(accAddr, w)
+		if err != nil {
+			return err
+		}
+		return nil
+
+	case string:
+		if valueAddress == "" {
+			err := marshalJson(valueAddress, w)
+			return err
+		}
+		accAddr, err := types.AccAddressFromBech32(valueAddress)
+		if err != nil {
+			return err
+		}
+		err = marshalJson(accAddr, w)
+		if err != nil {
+			return err
+		}
+		return nil
+
+	default:
+		return fmt.Errorf("address cannot be encoded wrong type")
+	}
+}

package/vm/proto_json_test.go

@@ -46,7 +46,7 @@ func TestProtoJSONMarshal(t *testing.T) {
 		{
 			"MsgDelegate",
 			func() interface{} {
-				return stakingtypes.NewMsgDelegate(accAddr, valAddr, coin)
+				return stakingtypes.NewMsgDelegate(accAddr.String(), valAddr.String(), coin)
 			},
 			`{"delegatorAddress":"cosmos1qy352eufjjmc9c","validatorAddress":"cosmosvaloper1npm9gvss52mlmk","amount":{"denom":"uatom","amount":"1234567"}}`,
 		},

package/vm/server.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"sync"
 
+	storetypes "cosmossdk.io/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
@@ -45,7 +46,7 @@ func (s *AgdServer) SetControllerContext(ctx sdk.Context) func() {
 	// own meter usage.
 	s.mtx.Lock()
 	defer s.mtx.Unlock()
-	s.currentCtx = sdk.WrapSDKContext(ctx.WithGasMeter(sdk.NewInfiniteGasMeter()))
+	s.currentCtx = sdk.WrapSDKContext(ctx.WithGasMeter(storetypes.NewInfiniteGasMeter()))
 	return func() {
 		s.mtx.Lock()
 		defer s.mtx.Unlock()

package/x/swingset/abci.go

@@ -32,7 +32,7 @@ type afterCommitBlockAction struct {
 	*vm.ActionHeader `actionType:"AFTER_COMMIT_BLOCK"`
 }
 
-func BeginBlock(ctx sdk.Context, req abci.RequestBeginBlock, keeper Keeper) error {
+func BeginBlock(ctx sdk.Context, keeper Keeper) error {
 	defer telemetry.ModuleMeasureSince(types.ModuleName, time.Now(), telemetry.MetricKeyBeginBlocker)
 
 	action := beginBlockAction{
@@ -53,7 +53,7 @@ func BeginBlock(ctx sdk.Context, req abci.RequestBeginBlock, keeper Keeper) erro
 var endBlockHeight int64
 var endBlockTime int64
 
-func EndBlock(ctx sdk.Context, req abci.RequestEndBlock, keeper Keeper) ([]abci.ValidatorUpdate, error) {
+func EndBlock(ctx sdk.Context, keeper Keeper) ([]abci.ValidatorUpdate, error) {
 	defer telemetry.ModuleMeasureSince(types.ModuleName, time.Now(), telemetry.MetricKeyEndBlocker)
 
 	action := endBlockAction{}

package/x/swingset/client/cli/tx.go

@@ -83,10 +83,6 @@ is an "Ack" integer.`,
 			}
 
 			msg := types.NewMsgDeliverInbound(msgs, cctx.GetFromAddress())
-			if err := msg.ValidateBasic(); err != nil {
-				return err
-			}
-
 			return tx.GenerateOrBroadcastTxCLI(cctx, cmd.Flags(), msg)
 		},
 	}
@@ -130,9 +126,6 @@ https://github.com/endojs/endo/tree/master/packages/bundle-source`,
 			}
 
 			msg := types.NewMsgInstallBundle(jsonIn, cctx.GetFromAddress())
-			if err := msg.ValidateBasic(); err != nil {
-				return err
-			}
 
 			compress, err := cmd.Flags().GetBool(FlagCompress)
 			if err != nil {
@@ -144,7 +137,6 @@ https://github.com/endojs/endo/tree/master/packages/bundle-source`,
 					return err
 				}
 				// re-validate to be sure
-				err = msg.ValidateBasic()
 				if err != nil {
 					return err
 				}
@@ -215,13 +207,23 @@ func GetCmdWalletAction() *cobra.Command {
 			if err != nil {
 				return err
 			}
+
 			var msg sdk.Msg
+
+			// If spend is true, we create a MsgWalletSpendAction, otherwise a MsgWalletAction.
+			// This is a bit of a hack, but it allows us to use the same command for both types of actions.
+			// The MsgWalletSpendAction is a special case that allows the action to spend assets.
+			// The MsgWalletAction is a general action that does not allow spending.
 			if spend {
-				msg = types.NewMsgWalletSpendAction(owner, action)
+				m := types.NewMsgWalletSpendAction(owner, action)
+				err = m.ValidateBasic()
+				msg = m
 			} else {
-				msg = types.NewMsgWalletAction(owner, action)
+				m := types.NewMsgWalletAction(owner, action)
+				err = m.ValidateBasic()
+				msg = m
 			}
-			err = msg.ValidateBasic()
+
 			if err != nil {
 				return err
 			}
@@ -304,12 +306,12 @@ Specify at least one pair of permit.json and code.js files`,
 				return err
 			}
 
-			msg, err := govv1beta1.NewMsgSubmitProposal(content, deposit, from)
-			if err != nil {
+			if err = content.ValidateBasic(); err != nil {
 				return err
 			}
 
-			if err = msg.ValidateBasic(); err != nil {
+			msg, err := govv1beta1.NewMsgSubmitProposal(content, deposit, from)
+			if err != nil {
 				return err
 			}
 

package/x/swingset/config.go

@@ -6,10 +6,10 @@ import (
 
 	"github.com/spf13/viper"
 
+	pruningtypes "cosmossdk.io/store/pruning/types"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	serverconfig "github.com/cosmos/cosmos-sdk/server/config"
 	servertypes "github.com/cosmos/cosmos-sdk/server/types"
-	pruningtypes "github.com/cosmos/cosmos-sdk/store/pruning/types"
 
 	"github.com/Agoric/agoric-sdk/golang/cosmos/util"
 )

package/x/swingset/genesis.go

@@ -10,6 +10,7 @@ import (
 	"io"
 	"strings"
 
+	storetypes "cosmossdk.io/store/types"
 	agoric "github.com/Agoric/agoric-sdk/golang/cosmos/types"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/swingset/keeper"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/swingset/types"
@@ -204,7 +205,7 @@ func ExportGenesis(
 type swingStoreGenesisEventHandler struct {
 	exportDir      string
 	snapshotHeight uint64
-	swingStore     sdk.KVStore
+	swingStore     storetypes.KVStore
 	hasher         hash.Hash
 	exportMode     string
 }

package/x/swingset/handler.go

@@ -6,12 +6,13 @@ import (
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/swingset/keeper"
 
 	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 "swingset" type messages.
-func NewHandler(k Keeper) sdk.Handler {
+func NewHandler(k Keeper) baseapp.MsgServiceHandler {
 	msgServer := keeper.NewMsgServerImpl(k)
 
 	return func(ctx sdk.Context, msg sdk.Msg) (*sdk.Result, error) {

package/x/swingset/keeper/extension_snapshotter.go

@@ -7,11 +7,11 @@ import (
 	"io"
 	"math"
 
+	"cosmossdk.io/log"
+	snapshots "cosmossdk.io/store/snapshots/types"
 	agoric "github.com/Agoric/agoric-sdk/golang/cosmos/types"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/swingset/types"
-	"github.com/cometbft/cometbft/libs/log"
 	"github.com/cosmos/cosmos-sdk/baseapp"
-	snapshots "github.com/cosmos/cosmos-sdk/snapshots/types"
 )
 
 // This module implements a Cosmos ExtensionSnapshotter to capture and restore
@@ -77,10 +77,19 @@ func NewExtensionSnapshotter(
 	swingStoreExportsHandler *SwingStoreExportsHandler,
 	getSwingStoreExportDataShadowCopyReader func(height int64) agoric.KVEntryReader,
 ) *ExtensionSnapshotter {
+	isConfigured := func() bool {
+		return app.SnapshotManager() != nil
+	}
+	takeAppSnapshot := func(height int64) {
+		if isConfigured() {
+			app.SnapshotManager().Snapshot(height)
+		}
+	}
+	logger := app.Logger().With("module", fmt.Sprintf("x/%s", types.ModuleName), "submodule", "extension snapshotter")
 	return &ExtensionSnapshotter{
-		isConfigured:                            func() bool { return app.SnapshotManager() != nil },
-		takeAppSnapshot:                         app.Snapshot,
-		logger:                                  app.Logger().With("module", fmt.Sprintf("x/%s", types.ModuleName), "submodule", "extension snapshotter"),
+		isConfigured:                            isConfigured,
+		takeAppSnapshot:                         takeAppSnapshot,
+		logger:                                  logger,
 		swingStoreExportsHandler:                swingStoreExportsHandler,
 		getSwingStoreExportDataShadowCopyReader: getSwingStoreExportDataShadowCopyReader,
 		activeSnapshot:                          nil,

package/x/swingset/keeper/extension_snapshotter_test.go

@@ -4,7 +4,7 @@ import (
 	"io"
 	"testing"
 
-	"github.com/cometbft/cometbft/libs/log"
+	"cosmossdk.io/log"
 )
 
 func newTestExtensionSnapshotter() *ExtensionSnapshotter {

package/x/swingset/keeper/keeper.go

@@ -7,14 +7,14 @@ import (
 	stdlog "log"
 	"math"
 
+	corestore "cosmossdk.io/core/store"
+	"cosmossdk.io/log"
 	sdkmath "cosmossdk.io/math"
-
-	"github.com/cometbft/cometbft/libs/log"
-
+	"cosmossdk.io/store/prefix"
+	storetypes "cosmossdk.io/store/types"
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/codec"
-	"github.com/cosmos/cosmos-sdk/store/prefix"
-	storetypes "github.com/cosmos/cosmos-sdk/store/types"
+	"github.com/cosmos/cosmos-sdk/runtime"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
@@ -53,9 +53,9 @@ const (
 
 // Keeper maintains the link to data vstorage and exposes getter/setter methods for the various parts of the state machine
 type Keeper struct {
-	storeKey   storetypes.StoreKey
-	cdc        codec.Codec
-	paramSpace paramtypes.Subspace
+	storeService corestore.KVStoreService
+	cdc          codec.Codec
+	paramSpace   paramtypes.Subspace
 
 	accountKeeper    types.AccountKeeper
 	bankKeeper       bankkeeper.Keeper
@@ -71,7 +71,8 @@ var _ ante.SwingsetKeeper = &Keeper{}
 
 // NewKeeper creates a new IBC transfer Keeper instance
 func NewKeeper(
-	cdc codec.Codec, key storetypes.StoreKey, paramSpace paramtypes.Subspace,
+	cdc codec.Codec, storeService corestore.KVStoreService,
+	paramSpace paramtypes.Subspace,
 	accountKeeper types.AccountKeeper, bankKeeper bankkeeper.Keeper,
 	vstorageKeeper vstoragekeeper.Keeper, feeCollectorName string,
 	callToController func(ctx sdk.Context, str string) (string, error),
@@ -83,8 +84,8 @@ func NewKeeper(
 	}
 
 	return Keeper{
-		storeKey:         key,
 		cdc:              cdc,
+		storeService:     storeService,
 		paramSpace:       paramSpace,
 		accountKeeper:    accountKeeper,
 		bankKeeper:       bankKeeper,
@@ -171,7 +172,7 @@ func (k Keeper) GetSmartWalletState(ctx sdk.Context, addr sdk.AccAddress) types.
 }
 
 func (k Keeper) InboundQueueLength(ctx sdk.Context) (int32, error) {
-	size := sdk.NewInt(0)
+	size := sdkmath.NewInt(0)
 
 	highPriorityQueueLength, err := k.vstorageKeeper.GetQueueLength(ctx, StoragePathHighPriorityQueue)
 	if err != nil {
@@ -258,7 +259,8 @@ func (k Keeper) SetParams(ctx sdk.Context, params types.Params) {
 }
 
 func (k Keeper) GetState(ctx sdk.Context) types.State {
-	store := ctx.KVStore(k.storeKey)
+	kvstore := k.storeService.OpenKVStore(ctx)
+	store := runtime.KVStoreAdapter(kvstore)
 	bz := store.Get([]byte(stateKey))
 	state := types.State{}
 	k.cdc.MustUnmarshal(bz, &state)
@@ -266,7 +268,8 @@ func (k Keeper) GetState(ctx sdk.Context) types.State {
 }
 
 func (k Keeper) SetState(ctx sdk.Context, state types.State) {
-	store := ctx.KVStore(k.storeKey)
+	kvstore := k.storeService.OpenKVStore(ctx)
+	store := runtime.KVStoreAdapter(kvstore)
 	bz := k.cdc.MustMarshal(&state)
 	store.Set([]byte(stateKey), bz)
 }
@@ -323,8 +326,8 @@ func (k Keeper) ChargeBeans(
 	beansToDebit := nowOwing.Sub(remainderOwing)
 
 	// Convert the debit to coins.
-	beansPerFeeUnitDec := sdk.NewDecFromBigInt(beansPerUnit[types.BeansPerFeeUnit].BigInt())
-	beansToDebitDec := sdk.NewDecFromBigInt(beansToDebit.BigInt())
+	beansPerFeeUnitDec := sdkmath.LegacyNewDecFromBigInt(beansPerUnit[types.BeansPerFeeUnit].BigInt())
+	beansToDebitDec := sdkmath.LegacyNewDecFromBigInt(beansToDebit.BigInt())
 	feeUnitPrice := k.GetParams(ctx).FeeUnitPrice
 	feeDecCoins := sdk.NewDecCoinsFromCoins(feeUnitPrice...).MulDec(beansToDebitDec).QuoDec(beansPerFeeUnitDec)
 
@@ -485,8 +488,9 @@ func (k Keeper) SetMailbox(ctx sdk.Context, peer string, mailbox string) {
 	k.vstorageKeeper.LegacySetStorageAndNotify(ctx, agoric.NewKVEntry(path, mailbox))
 }
 
-func (k Keeper) GetSwingStore(ctx sdk.Context) sdk.KVStore {
-	store := ctx.KVStore(k.storeKey)
+func (k Keeper) GetSwingStore(ctx sdk.Context) storetypes.KVStore {
+	kvstore := k.storeService.OpenKVStore(ctx)
+	store := runtime.KVStoreAdapter(kvstore)
 	return prefix.NewStore(store, []byte(swingStoreKeyPrefix))
 }
 

package/x/swingset/keeper/keeper_test.go

@@ -5,13 +5,15 @@ import (
 	"reflect"
 	"testing"
 
+	"cosmossdk.io/log"
+	"cosmossdk.io/store"
+	storemetrics "cosmossdk.io/store/metrics"
+	prefixstore "cosmossdk.io/store/prefix"
+	storetypes "cosmossdk.io/store/types"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/swingset/types"
-	"github.com/cosmos/cosmos-sdk/store"
-	prefixstore "github.com/cosmos/cosmos-sdk/store/prefix"
-	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	dbm "github.com/cometbft/cometbft-db"
+	dbm "github.com/cosmos/cosmos-db"
 )
 
 func mkcoin(denom string) func(amt int64) sdk.Coin {
@@ -188,7 +190,7 @@ func Test_calculateFees(t *testing.T) {
 				t.Errorf("calculateFees() error = %v, want %v", err, tt.errMsg)
 				return
 			}
-			if !got.IsEqual(tt.want) {
+			if !got.Equal(tt.want) {
 				t.Errorf("calculateFees() = %v, want %v", got, tt.want)
 			}
 		})
@@ -199,9 +201,10 @@ var (
 	swingsetStoreKey = storetypes.NewKVStoreKey(types.StoreKey)
 )
 
-func makeTestStore() sdk.KVStore {
+func makeTestStore() storetypes.KVStore {
 	db := dbm.NewMemDB()
-	ms := store.NewCommitMultiStore(db)
+	logger := log.NewNopLogger()
+	ms := store.NewCommitMultiStore(db, logger, storemetrics.NewNoOpMetrics())
 	ms.MountStoreWithDB(swingsetStoreKey, storetypes.StoreTypeIAVL, db)
 	err := ms.LoadLatestVersion()
 	if err != nil {