@agoric/cosmos 0.35.0-u15.0 → 0.35.0-u16.0

package/x/swingset/types/msgs.go

@@ -7,6 +7,7 @@ import (
 	"io"
 	"strings"
 
+	sdkioerrors "cosmossdk.io/errors"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/vm"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
@@ -28,6 +29,25 @@ var (
 	_ vm.ControllerAdmissionMsg = &MsgWalletSpendAction{}
 )
 
+// Contextual information about the message source of an action on an inbound queue.
+// This context should be unique per inboundQueueRecord.
+type ActionContext struct {
+	// The block height in which the corresponding action was enqueued
+	BlockHeight int64 `json:"blockHeight"`
+	// The hash of the cosmos transaction that included the message
+	// If the action didn't result from a transaction message, a substitute value
+	// may be used. For example the VBANK_BALANCE_UPDATE actions use `x/vbank`.
+	TxHash string `json:"txHash"`
+	// The index of the message within the transaction. If the action didn't
+	// result from a cosmos transaction, a number should be chosen to make the
+	// actionContext unique. (for example a counter per block and source module).
+	MsgIdx int `json:"msgIdx"`
+}
+type InboundQueueRecord struct {
+	Action  vm.Jsonable   `json:"action"`
+	Context ActionContext `json:"context"`
+}
+
 const (
 	// bundleUncompressedSizeLimit is the (exclusive) limit on uncompressed bundle size.
 	// We must ensure there is an exclusive int64 limit in order to detect an underflow.
@@ -88,7 +108,7 @@ func NewMsgDeliverInbound(msgs *Messages, submitter sdk.AccAddress) *MsgDeliverI
 func (msg MsgDeliverInbound) CheckAdmissibility(ctx sdk.Context, data interface{}) error {
 	keeper, ok := data.(SwingSetKeeper)
 	if !ok {
-		return sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "data must be a SwingSetKeeper, not a %T", data)
+		return sdkioerrors.Wrapf(sdkerrors.ErrInvalidRequest, "data must be a SwingSetKeeper, not a %T", data)
 	}
 
 	/*
@@ -120,14 +140,14 @@ func (msg MsgDeliverInbound) Type() string { return "eventualSend" }
 // ValidateBasic runs stateless checks on the message
 func (msg MsgDeliverInbound) ValidateBasic() error {
 	if msg.Submitter.Empty() {
-		return sdkerrors.Wrap(sdkerrors.ErrInvalidAddress, "Submitter address cannot be empty")
+		return sdkioerrors.Wrap(sdkerrors.ErrInvalidAddress, "Submitter address cannot be empty")
 	}
 	if len(msg.Messages) != len(msg.Nums) {
-		return sdkerrors.Wrap(sdkerrors.ErrUnknownRequest, "Messages and Nums must be the same length")
+		return sdkioerrors.Wrap(sdkerrors.ErrUnknownRequest, "Messages and Nums must be the same length")
 	}
 	for _, m := range msg.Messages {
 		if len(m) == 0 {
-			return sdkerrors.Wrap(sdkerrors.ErrUnknownRequest, "Messages cannot be empty")
+			return sdkioerrors.Wrap(sdkerrors.ErrUnknownRequest, "Messages cannot be empty")
 		}
 	}
 	return nil
@@ -161,7 +181,7 @@ func NewMsgWalletAction(owner sdk.AccAddress, action string) *MsgWalletAction {
 func (msg MsgWalletAction) CheckAdmissibility(ctx sdk.Context, data interface{}) error {
 	keeper, ok := data.(SwingSetKeeper)
 	if !ok {
-		return sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "data must be a SwingSetKeeper, not a %T", data)
+		return sdkioerrors.Wrapf(sdkerrors.ErrInvalidRequest, "data must be a SwingSetKeeper, not a %T", data)
 	}
 
 	err := checkSmartWalletProvisioned(ctx, keeper, msg.Owner)
@@ -211,13 +231,13 @@ func (msg MsgWalletSpendAction) GetSignBytes() []byte {
 // ValidateBasic runs stateless checks on the message
 func (msg MsgWalletAction) ValidateBasic() error {
 	if msg.Owner.Empty() {
-		return sdkerrors.Wrap(sdkerrors.ErrInvalidAddress, "Owner address cannot be empty")
+		return sdkioerrors.Wrap(sdkerrors.ErrInvalidAddress, "Owner address cannot be empty")
 	}
 	if len(strings.TrimSpace(msg.Action)) == 0 {
-		return sdkerrors.Wrap(sdkerrors.ErrUnknownRequest, "Action cannot be empty")
+		return sdkioerrors.Wrap(sdkerrors.ErrUnknownRequest, "Action cannot be empty")
 	}
 	if !json.Valid([]byte(msg.Action)) {
-		return sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, "Wallet action must be valid JSON")
+		return sdkioerrors.Wrap(sdkerrors.ErrJSONUnmarshal, "Wallet action must be valid JSON")
 	}
 	return nil
 }
@@ -233,7 +253,7 @@ func NewMsgWalletSpendAction(owner sdk.AccAddress, spendAction string) *MsgWalle
 func (msg MsgWalletSpendAction) CheckAdmissibility(ctx sdk.Context, data interface{}) error {
 	keeper, ok := data.(SwingSetKeeper)
 	if !ok {
-		return sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "data must be a SwingSetKeeper, not a %T", data)
+		return sdkioerrors.Wrapf(sdkerrors.ErrInvalidRequest, "data must be a SwingSetKeeper, not a %T", data)
 	}
 
 	err := checkSmartWalletProvisioned(ctx, keeper, msg.Owner)
@@ -253,7 +273,7 @@ func (msg MsgWalletSpendAction) GetInboundMsgCount() int32 {
 func (msg MsgWalletSpendAction) IsHighPriority(ctx sdk.Context, data interface{}) (bool, error) {
 	keeper, ok := data.(SwingSetKeeper)
 	if !ok {
-		return false, sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "data must be a SwingSetKeeper, not a %T", data)
+		return false, sdkioerrors.Wrapf(sdkerrors.ErrInvalidRequest, "data must be a SwingSetKeeper, not a %T", data)
 	}
 
 	return keeper.IsHighPriorityAddress(ctx, msg.Owner)
@@ -266,13 +286,13 @@ func (msg MsgWalletSpendAction) GetSigners() []sdk.AccAddress {
 // ValidateBasic runs stateless checks on the message
 func (msg MsgWalletSpendAction) ValidateBasic() error {
 	if msg.Owner.Empty() {
-		return sdkerrors.Wrap(sdkerrors.ErrInvalidAddress, "Owner address cannot be empty")
+		return sdkioerrors.Wrap(sdkerrors.ErrInvalidAddress, "Owner address cannot be empty")
 	}
 	if len(strings.TrimSpace(msg.SpendAction)) == 0 {
-		return sdkerrors.Wrap(sdkerrors.ErrUnknownRequest, "Spend action cannot be empty")
+		return sdkioerrors.Wrap(sdkerrors.ErrUnknownRequest, "Spend action cannot be empty")
 	}
 	if !json.Valid([]byte(msg.SpendAction)) {
-		return sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, "Wallet spend action must be valid JSON")
+		return sdkioerrors.Wrap(sdkerrors.ErrJSONUnmarshal, "Wallet spend action must be valid JSON")
 	}
 	return nil
 }
@@ -295,13 +315,13 @@ func (msg MsgProvision) Type() string { return "provision" }
 // ValidateBasic runs stateless checks on the message
 func (msg MsgProvision) ValidateBasic() error {
 	if msg.Submitter.Empty() {
-		return sdkerrors.Wrap(sdkerrors.ErrInvalidAddress, "Submitter address cannot be empty")
+		return sdkioerrors.Wrap(sdkerrors.ErrInvalidAddress, "Submitter address cannot be empty")
 	}
 	if msg.Address.Empty() {
-		return sdkerrors.Wrap(sdkerrors.ErrInvalidAddress, "Peer address cannot be empty")
+		return sdkioerrors.Wrap(sdkerrors.ErrInvalidAddress, "Peer address cannot be empty")
 	}
 	if len(msg.Nickname) == 0 {
-		return sdkerrors.Wrap(sdkerrors.ErrUnknownRequest, "Nickname cannot be empty")
+		return sdkioerrors.Wrap(sdkerrors.ErrUnknownRequest, "Nickname cannot be empty")
 	}
 	return nil
 }
@@ -351,7 +371,7 @@ func NewMsgInstallBundle(bundleJson string, submitter sdk.AccAddress) *MsgInstal
 func (msg MsgInstallBundle) CheckAdmissibility(ctx sdk.Context, data interface{}) error {
 	keeper, ok := data.(SwingSetKeeper)
 	if !ok {
-		return sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "data must be a SwingSetKeeper, not a %T", data)
+		return sdkioerrors.Wrapf(sdkerrors.ErrInvalidRequest, "data must be a SwingSetKeeper, not a %T", data)
 	}
 	return chargeAdmission(ctx, keeper, msg.Submitter, []string{msg.Bundle}, msg.ExpectedUncompressedSize())
 }
@@ -375,23 +395,23 @@ func (msg MsgInstallBundle) Type() string { return "installBundle" }
 // ValidateBasic runs stateless checks on the message
 func (msg MsgInstallBundle) ValidateBasic() error {
 	if msg.Submitter.Empty() {
-		return sdkerrors.Wrap(sdkerrors.ErrInvalidAddress, "Submitter address cannot be empty")
+		return sdkioerrors.Wrap(sdkerrors.ErrInvalidAddress, "Submitter address cannot be empty")
 	}
 	if len(msg.Bundle) == 0 && len(msg.CompressedBundle) == 0 {
-		return sdkerrors.Wrap(sdkerrors.ErrUnknownRequest, "Bundle cannot be empty")
+		return sdkioerrors.Wrap(sdkerrors.ErrUnknownRequest, "Bundle cannot be empty")
 	}
 	if len(msg.Bundle) != 0 && len(msg.CompressedBundle) != 0 {
-		return sdkerrors.Wrap(sdkerrors.ErrUnknownRequest, "Cannot submit both a compressed and an uncompressed bundle at the same time")
+		return sdkioerrors.Wrap(sdkerrors.ErrUnknownRequest, "Cannot submit both a compressed and an uncompressed bundle at the same time")
 	}
 	if len(msg.Bundle) > 0 && msg.UncompressedSize != 0 {
-		return sdkerrors.Wrap(sdkerrors.ErrUnknownRequest, "Uncompressed size cannot be set without a compressed bundle")
+		return sdkioerrors.Wrap(sdkerrors.ErrUnknownRequest, "Uncompressed size cannot be set without a compressed bundle")
 	}
 	if len(msg.CompressedBundle) > 0 && !(msg.UncompressedSize > 0) {
-		return sdkerrors.Wrap(sdkerrors.ErrUnknownRequest, "Uncompressed size must be positive")
+		return sdkioerrors.Wrap(sdkerrors.ErrUnknownRequest, "Uncompressed size must be positive")
 	}
 	if msg.UncompressedSize >= bundleUncompressedSizeLimit {
 		// must enforce a limit to avoid overflow when computing its successor in Uncompress()
-		return sdkerrors.Wrap(sdkerrors.ErrUnknownRequest, "Uncompressed size out of range")
+		return sdkioerrors.Wrap(sdkerrors.ErrUnknownRequest, "Uncompressed size out of range")
 	}
 	// We don't check the accuracy of the uncompressed size here, since it could comsume significant CPU.
 	return nil
@@ -454,7 +474,7 @@ func (msg *MsgInstallBundle) Uncompress() error {
 		return err
 	}
 	if n != msg.UncompressedSize {
-		return sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, "Uncompressed size does not match expected value")
+		return sdkioerrors.Wrap(sdkerrors.ErrInvalidRequest, "Uncompressed size does not match expected value")
 	}
 	msg.Bundle = buf.String()
 	msg.CompressedBundle = []byte{}

package/x/swingset/types/params.go

@@ -5,6 +5,7 @@ import (
 
 	yaml "gopkg.in/yaml.v2"
 
+	sdkmath "cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
 )
@@ -18,7 +19,7 @@ var (
 	ParamStoreKeyQueueMax           = []byte("queue_max")
 )
 
-func NewStringBeans(key string, beans sdk.Uint) StringBeans {
+func NewStringBeans(key string, beans sdkmath.Uint) StringBeans {
 	return StringBeans{
 		Key:   key,
 		Beans: beans,

package/x/swingset/types/proposal.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"strings"
 
+	sdkioerrors "cosmossdk.io/errors"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
 )
@@ -50,11 +51,11 @@ func (cep *CoreEvalProposal) ValidateBasic() error {
 	}
 
 	if len(cep.Evals) == 0 {
-		return sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, "no core evals provided")
+		return sdkioerrors.Wrap(sdkerrors.ErrInvalidRequest, "no core evals provided")
 	}
 	for i, eval := range cep.Evals {
 		if err := eval.ValidateBasic(); err != nil {
-			return sdkerrors.Wrapf(err, "invalid core eval %d", i)
+			return sdkioerrors.Wrapf(err, "invalid core eval %d", i)
 		}
 	}
 
@@ -67,12 +68,12 @@ func (ce CoreEval) ValidateBasic() error {
 	var rm json.RawMessage
 	err := json.Unmarshal([]byte(ce.JsonPermits), &rm)
 	if err != nil {
-		return sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "invalid permit.json: %s", err.Error())
+		return sdkioerrors.Wrapf(sdkerrors.ErrInvalidRequest, "invalid permit.json: %s", err.Error())
 	}
 
 	// Ensure jscode is not empty.
 	if len(strings.TrimSpace(ce.JsCode)) == 0 {
-		return sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, "no code.js provided")
+		return sdkioerrors.Wrap(sdkerrors.ErrInvalidRequest, "no code.js provided")
 	}
 	return nil
 }

package/x/swingset/types/swingset.pb.go

@@ -27,7 +27,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 
 // CoreEvalProposal is a gov Content type for evaluating code in the SwingSet
 // core.
-// See `agoric-sdk/packages/vats/src/core/eval.js`.
+// See `bridgeCoreEval` in agoric-sdk packages/vats/src/core/chain-behaviors.js.
 type CoreEvalProposal struct {
 	Title       string `protobuf:"bytes,1,opt,name=title,proto3" json:"title,omitempty"`
 	Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`

package/x/vbank/genesis.go

@@ -1,8 +1,6 @@
 package vbank
 
 import (
-	// "fmt"
-
 	"fmt"
 
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/vbank/types"

package/x/vbank/handler.go

@@ -3,6 +3,7 @@ package vbank
 import (
 	"fmt"
 
+	sdkioerrors "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
@@ -13,7 +14,7 @@ func NewHandler(keeper Keeper) sdk.Handler {
 		switch msg := msg.(type) {
 		default:
 			errMsg := fmt.Sprintf("Unrecognized vbank Msg type: %T", msg)
-			return nil, sdkerrors.Wrap(sdkerrors.ErrUnknownRequest, errMsg)
+			return nil, sdkioerrors.Wrap(sdkerrors.ErrUnknownRequest, errMsg)
 		}
 	}
 }

package/x/vbank/keeper/querier.go

@@ -3,6 +3,7 @@ package keeper
 import (
 	abci "github.com/tendermint/tendermint/abci/types"
 
+	sdkioerrors "cosmossdk.io/errors"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/vbank/types"
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -23,7 +24,7 @@ func NewQuerier(k Keeper, legacyQuerierCdc *codec.LegacyAmino) sdk.Querier {
 			return queryState(ctx, path[1:], req, k, legacyQuerierCdc)
 
 		default:
-			return nil, sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "unknown vbank query path")
+			return nil, sdkioerrors.Wrapf(sdkerrors.ErrUnknownRequest, "unknown vbank query path")
 		}
 	}
 }
@@ -33,7 +34,7 @@ func queryParams(ctx sdk.Context, _ []string, _ abci.RequestQuery, k Keeper, leg
 
 	res, err := codec.MarshalJSONIndent(legacyQuerierCdc, params)
 	if err != nil {
-		return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error())
+		return nil, sdkioerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error())
 	}
 
 	return res, nil
@@ -44,7 +45,7 @@ func queryState(ctx sdk.Context, _ []string, _ abci.RequestQuery, k Keeper, lega
 
 	res, err := codec.MarshalJSONIndent(legacyQuerierCdc, state)
 	if err != nil {
-		return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error())
+		return nil, sdkioerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error())
 	}
 
 	return res, nil

package/x/vbank/module.go

@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	stdlog "log"
 
-	"github.com/gorilla/mux"
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/spf13/cobra"
 
@@ -60,10 +59,6 @@ func (AppModuleBasic) ValidateGenesis(cdc codec.JSONCodec, config client.TxEncod
 	return ValidateGenesis(&data)
 }
 
-// Register rest routes
-func (AppModuleBasic) RegisterRESTRoutes(clientCtx client.Context, rtr *mux.Router) {
-}
-
 func (AppModuleBasic) RegisterGRPCGatewayRoutes(clientCtx client.Context, mux *runtime.ServeMux) {
 	_ = types.RegisterQueryHandlerClient(context.Background(), mux, types.NewQueryClient(clientCtx))
 }

package/x/vbank/types/msgs.go

@@ -1,15 +1,3 @@
 package types
 
 const RouterKey = ModuleName // this was defined in your key.go file
-
-type VbankSingleBalanceUpdate struct {
-	Address string `json:"address"`
-	Denom   string `json:"denom"`
-	Amount  string `json:"amount"`
-}
-
-type VbankBalanceUpdate struct {
-	Nonce   uint64                     `json:"nonce"`
-	Type    string                     `json:"type"`
-	Updated []VbankSingleBalanceUpdate `json:"updated"`
-}

package/x/vbank/vbank.go

@@ -34,14 +34,14 @@ func NewPortHandler(am AppModule, keeper Keeper) portHandler {
 	}
 }
 
-type vbankSingleBalanceUpdate struct {
+type VbankSingleBalanceUpdate struct {
 	Address string `json:"address"`
 	Denom   string `json:"denom"`
 	Amount  string `json:"amount"`
 }
 
 // Make vbankManyBalanceUpdates sortable
-type vbankManyBalanceUpdates []vbankSingleBalanceUpdate
+type vbankManyBalanceUpdates []VbankSingleBalanceUpdate
 
 var _ sort.Interface = vbankManyBalanceUpdates{}
 
@@ -67,10 +67,10 @@ func (vbu vbankManyBalanceUpdates) Swap(i int, j int) {
 	vbu[i], vbu[j] = vbu[j], vbu[i]
 }
 
-type vbankBalanceUpdate struct {
-	vm.ActionHeader `actionType:"VBANK_BALANCE_UPDATE"`
-	Nonce           uint64                  `json:"nonce"`
-	Updated         vbankManyBalanceUpdates `json:"updated"`
+type VbankBalanceUpdate struct {
+	*vm.ActionHeader `actionType:"VBANK_BALANCE_UPDATE"`
+	Nonce            uint64                  `json:"nonce"`
+	Updated          vbankManyBalanceUpdates `json:"updated"`
 }
 
 // getBalanceUpdate returns a bridge message containing the current bank balance
@@ -83,9 +83,9 @@ func getBalanceUpdate(ctx sdk.Context, keeper Keeper, addressToUpdate map[string
 	}
 
 	nonce := keeper.GetNextSequence(ctx)
-	event := vbankBalanceUpdate{
+	event := VbankBalanceUpdate{
 		Nonce:   nonce,
-		Updated: make([]vbankSingleBalanceUpdate, 0, nentries),
+		Updated: make([]VbankSingleBalanceUpdate, 0, nentries),
 	}
 
 	// Note that Golang randomises the order of iteration, so we have to sort
@@ -99,7 +99,7 @@ func getBalanceUpdate(ctx sdk.Context, keeper Keeper, addressToUpdate map[string
 		for _, coin := range coins {
 			// generate an update even when the current balance is zero
 			balance := keeper.GetBalance(ctx, account, coin.Denom)
-			update := vbankSingleBalanceUpdate{
+			update := VbankSingleBalanceUpdate{
 				Address: address,
 				Denom:   coin.Denom,
 				Amount:  balance.Amount.String(),

package/x/vbank/vbank_test.go

@@ -71,7 +71,7 @@ func newBalances(opts ...balancesOption) balances {
 	return bal
 }
 
-func validateBalanceUpdate(vbu vbankBalanceUpdate) error {
+func validateBalanceUpdate(vbu VbankBalanceUpdate) error {
 	if vbu.Type != "VBANK_BALANCE_UPDATE" {
 		return fmt.Errorf("bad balance update type: %s", vbu.Type)
 	}
@@ -89,7 +89,7 @@ func decodeBalances(encoded []byte) (balances, uint64, error) {
 	if encoded == nil {
 		return nil, 0, nil
 	}
-	balanceUpdate := vbankBalanceUpdate{}
+	balanceUpdate := VbankBalanceUpdate{}
 	err := json.Unmarshal(encoded, &balanceUpdate)
 	if err != nil {
 		return nil, 0, err

package/x/vibc/alias.go

@@ -14,11 +14,14 @@ const (
 var (
 	NewKeeper        = keeper.NewKeeper
 	NewMsgSendPacket = types.NewMsgSendPacket
+	NewReceiver      = types.NewReceiver
+	NewIBCModule     = types.NewIBCModule
 	ModuleCdc        = types.ModuleCdc
 	RegisterCodec    = types.RegisterCodec
 )
 
 type (
 	Keeper        = keeper.Keeper
+	ScopedKeeper  = types.ScopedKeeper
 	MsgSendPacket = types.MsgSendPacket
 )

package/x/vibc/handler.go

@@ -3,42 +3,49 @@ package vibc
 import (
 	"fmt"
 
+	sdkioerrors "cosmossdk.io/errors"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/vm"
+	"github.com/Agoric/agoric-sdk/golang/cosmos/x/vibc/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
 
 // NewHandler returns a handler for "vibc" type messages.
-func NewHandler(keeper Keeper) sdk.Handler {
+func NewHandler(keeper Keeper, bankKeeper types.BankKeeper) sdk.Handler {
 	return func(ctx sdk.Context, msg sdk.Msg) (*sdk.Result, error) {
 		switch msg := msg.(type) {
 		case *MsgSendPacket:
-			return handleMsgSendPacket(ctx, keeper, msg)
+			return handleMsgSendPacket(ctx, keeper, bankKeeper, msg)
 
 		default:
 			errMsg := fmt.Sprintf("Unrecognized vibc Msg type: %T", msg)
-			return nil, sdkerrors.Wrap(sdkerrors.ErrUnknownRequest, errMsg)
+			return nil, sdkioerrors.Wrap(sdkerrors.ErrUnknownRequest, errMsg)
 		}
 	}
 }
 
 type sendPacketAction struct {
+	*vm.ActionHeader `actionType:"IBC_EVENT"`
+	Event            string `json:"event" default:"sendPacket"`
 	*MsgSendPacket
-	vm.ActionHeader `actionType:"IBC_EVENT"`
-	Event           string `json:"event" default:"sendPacket"`
 }
 
-func handleMsgSendPacket(ctx sdk.Context, keeper Keeper, msg *MsgSendPacket) (*sdk.Result, error) {
+func handleMsgSendPacket(
+	ctx sdk.Context,
+	keeper Keeper,
+	bankKeeper types.BankKeeper,
+	msg *MsgSendPacket,
+) (*sdk.Result, error) {
 	onePass := sdk.NewInt64Coin("sendpacketpass", 1)
-	balance := keeper.GetBalance(ctx, msg.Sender, onePass.Denom)
+	balance := bankKeeper.GetBalance(ctx, msg.Sender, onePass.Denom)
 	if balance.IsLT(onePass) {
-		return nil, sdkerrors.Wrap(
+		return nil, sdkioerrors.Wrap(
 			sdkerrors.ErrInsufficientFee,
 			fmt.Sprintf("sender %s needs at least %s", msg.Sender, onePass.String()),
 		)
 	}
 
-	action := &sendPacketAction{
+	action := sendPacketAction{
 		MsgSendPacket: msg,
 	}
 	// fmt.Fprintf(os.Stderr, "Context is %+v\n", ctx)