@agoric/cosmos 0.34.2-dev-ecf2d8e.0 → 0.35.0-other-dev-70beeb7.0

package/daemon/cmd/root.go

@@ -1,7 +1,6 @@
 package cmd
 
 import (
-	"context"
 	"errors"
 	"io"
 	"os"
@@ -39,11 +38,11 @@ import (
 )
 
 // Sender is a function that sends a request to the controller.
-type Sender func(ctx context.Context, needReply bool, str string) (string, error)
+type Sender func(needReply bool, str string) (string, error)
 
 var AppName = "agd"
-var OnStartHook func(log.Logger, servertypes.AppOptions) error
-var OnExportHook func(log.Logger, servertypes.AppOptions) error
+var OnStartHook func(logger log.Logger)
+var OnExportHook func(logger log.Logger)
 
 // NewRootCmd creates a new root command for simd. It is called once in the
 // main function.
@@ -61,7 +60,7 @@ func NewRootCmd(sender Sender) (*cobra.Command, params.EncodingConfig) {
 
 	rootCmd := &cobra.Command{
 		Use:   AppName,
-		Short: "Agoric Cosmos App",
+		Short: "Stargate Agoric App",
 		PersistentPreRunE: func(cmd *cobra.Command, _ []string) error {
 			// set the default command outputs
 			cmd.SetOut(cmd.OutOrStdout())
@@ -136,9 +135,10 @@ func initRootCmd(sender Sender, rootCmd *cobra.Command, encodingConfig params.En
 	}
 	server.AddCommands(rootCmd, gaia.DefaultNodeHome, ac.newApp, ac.appExport, addModuleInitFlags)
 
+	hasVMController := sender != nil
 	for _, command := range rootCmd.Commands() {
 		if command.Name() == "export" {
-			extendCosmosExportCommand(command)
+			extendCosmosExportCommand(command, hasVMController)
 			break
 		}
 	}
@@ -154,31 +154,8 @@ func initRootCmd(sender Sender, rootCmd *cobra.Command, encodingConfig params.En
 	rootCmd.AddCommand(server.RosettaCommand(encodingConfig.InterfaceRegistry, encodingConfig.Marshaler))
 }
 
-const (
-	// FlagSplitVm is the command-line flag for subcommands that can use a
-	// split-process Agoric VM.  The default is to use an embedded VM.
-	FlagSplitVm = "split-vm"
-	EmbeddedVmEnvVar = "AGD_EMBEDDED_VM"
-)
-
-// hasVMController returns true if we have a VM (are running in split-vm mode,
-// or with an embedded VM).
-func hasVMController(serverCtx *server.Context) bool {
-	return serverCtx.Viper.GetString(FlagSplitVm) != "" ||
-		os.Getenv(EmbeddedVmEnvVar) != ""
-}
-
-func addAgoricVMFlags(cmd *cobra.Command) {
-	cmd.PersistentFlags().String(
-		FlagSplitVm,
-		"",
-		"Specify the external Agoric VM program",
-	)
-}
-
 func addModuleInitFlags(startCmd *cobra.Command) {
 	crisis.AddModuleInitFlags(startCmd)
-	addAgoricVMFlags(startCmd)
 }
 
 func queryCommand() *cobra.Command {
@@ -246,9 +223,7 @@ func (ac appCreator) newApp(
 	appOpts servertypes.AppOptions,
 ) servertypes.Application {
 	if OnStartHook != nil {
-		if err := OnStartHook(logger, appOpts); err != nil {
-			panic(err)
-		}
+		OnStartHook(logger)
 	}
 
 	var cache sdk.MultiStorePersistentCache
@@ -322,9 +297,8 @@ const (
 
 // extendCosmosExportCommand monkey-patches the "export" command added by
 // cosmos-sdk to add a required "export-dir" command-line flag, and create the
-// genesis export in the specified directory if the VM is running.
-func extendCosmosExportCommand(cmd *cobra.Command) {
-	addAgoricVMFlags(cmd)
+// genesis export in the specified directory.
+func extendCosmosExportCommand(cmd *cobra.Command, hasVMController bool) {
 	cmd.Flags().String(FlagExportDir, "", "The directory where to create the genesis export")
 	err := cmd.MarkFlagRequired(FlagExportDir)
 	if err != nil {
@@ -355,28 +329,25 @@ func extendCosmosExportCommand(cmd *cobra.Command) {
 		// current genesis.
 		serverCtx.Viper.Set(gaia.FlagSwingStoreExportDir, swingStoreExportPath)
 
-		if hasVMController(serverCtx) {
-			// Capture the export in the genesisPath.
-			// This will fail if a genesis.json already exists in the export-dir
-			genesisFile, err := os.OpenFile(
-				genesisPath,
-				os.O_CREATE|os.O_EXCL|os.O_WRONLY,
-				os.ModePerm,
-			)
-			if err != nil {
-				return err
-			}
-			defer genesisFile.Close()
-			cmd.SetOut(genesisFile)
+		// This will fail is a genesis.json already exists in the export-dir
+		genesisFile, err := os.OpenFile(genesisPath, os.O_CREATE|os.O_EXCL|os.O_WRONLY, os.ModePerm)
+		if err != nil {
+			return err
 		}
+		defer genesisFile.Close()
+
+		cmd.SetOut(genesisFile)
 
-		// If we don't have a VM, appExport will just use the OnExportHook to exec
-		// the VM program, which will result in reentering this function with the VM
-		// controller set, and activate the above condition.
 		return originalRunE(cmd, args)
 	}
 
-	cmd.RunE = extendedRunE
+	// Only modify the command handler when we have a VM controller to handle
+	// the full export logic. Otherwise, appExport will just exec the VM program
+	// (OnExportHook), which will result in re-entering this flow with the VM
+	// controller set.
+	if hasVMController {
+		cmd.RunE = extendedRunE
+	}
 }
 
 func (ac appCreator) appExport(
@@ -389,9 +360,7 @@ func (ac appCreator) appExport(
 	appOpts servertypes.AppOptions,
 ) (servertypes.ExportedApp, error) {
 	if OnExportHook != nil {
-		if err := OnExportHook(logger, appOpts); err != nil {
-			return servertypes.ExportedApp{}, err
-		}
+		OnExportHook(logger)
 	}
 
 	homePath, ok := appOpts.Get(flags.FlagHome).(string)

package/daemon/main.go

@@ -1,7 +1,6 @@
 package daemon
 
 import (
-	"context"
 	"fmt"
 	"os"
 	"os/signal"
@@ -18,7 +17,7 @@ import (
 )
 
 // DefaultController is a stub controller.
-var DefaultController = func(ctx context.Context, needReply bool, str string) (string, error) {
+var DefaultController = func(needReply bool, str string) (string, error) {
 	return "", fmt.Errorf("Controller not configured; did you mean to use `ag-chain-cosmos` instead?")
 }
 
@@ -35,7 +34,6 @@ func RunWithController(sendToController cmd.Sender) {
 	signal.Notify(sigs, os.Interrupt, syscall.SIGINT, syscall.SIGTERM)
 	go func() {
 		<-sigs
-		_, _ = sendToController(context.Background(), false, "shutdown")
 		os.Exit(98)
 	}()
 

package/git-revision.txt

@@ -1 +1 @@
-ecf2d8e
+70beeb7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/cosmos",
-  "version": "0.34.2-dev-ecf2d8e.0+ecf2d8e",
+  "version": "0.35.0-other-dev-70beeb7.0+70beeb7",
   "description": "Connect JS to the Cosmos blockchain SDK",
   "parsers": {
     "js": "mjs"
@@ -19,7 +19,7 @@
     "postpack": "git clean -f git-revision.txt",
     "build": "exit 0",
     "lint-fix": "yarn lint:eslint --fix",
-    "lint": "exit 0"
+    "lint": "eslint '**/*.{cjs,js}'"
   },
   "dependencies": {
     "bindings": "^1.2.1",
@@ -35,5 +35,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ecf2d8ec1a63bd3c23cbca27f89ca9675a163611"
+  "gitHead": "70beeb7e476f24cfad30fa8cd5918f04746e8839"
 }

package/proto/agoric/vstorage/query.proto

@@ -9,18 +9,11 @@ option go_package = "github.com/Agoric/agoric-sdk/golang/cosmos/x/vstorage/types
 
 // Query defines the gRPC querier service
 service Query {
-  // Return the raw string value of an arbitrary vstorage datum.
+  // Return an arbitrary vstorage datum.
   rpc Data(QueryDataRequest) returns (QueryDataResponse) {
     option (google.api.http).get = "/agoric/vstorage/data/{path}";
   }
 
-  // Return a formatted representation of a vstorage datum that must be
-  // a valid StreamCell with CapData values, or standalone CapData.
-  rpc CapData(QueryCapDataRequest)
-    returns (QueryCapDataResponse) {
-      option (google.api.http).get = "/agoric/vstorage/capdata/{path}";
-  }
-
   // Return the children of a given vstorage path.
   rpc Children(QueryChildrenRequest)
     returns (QueryChildrenResponse) {
@@ -44,51 +37,6 @@ message QueryDataResponse {
   ];
 }
 
-// QueryCapDataRequest contains a path and formatting configuration.
-message QueryCapDataRequest {
-  string path = 1 [
-    (gogoproto.jsontag)    = "path",
-    (gogoproto.moretags)   = "yaml:\"path\""
-  ];
-  // mediaType must be an actual media type in the registry at
-  // https://www.iana.org/assignments/media-types/media-types.xhtml
-  // or a special value that does not conflict with the media type syntax.
-  // The only valid value is "JSON Lines", which is also the default.
-  string media_type = 2 [
-    (gogoproto.jsontag)    = "mediaType",
-    (gogoproto.moretags)   = "yaml:\"mediaType\""
-  ];
-  // itemFormat, if present, must be the special value "flat" to indicate that
-  // the deep structure of each item should be flattened into a single level
-  // with kebab-case keys (e.g., `{ "metrics": { "min": 0, "max": 88 } }` as
-  // `{ "metrics-min": 0, "metrics-max": 88 }`).
-  string item_format = 3 [
-    (gogoproto.jsontag)    = "itemFormat",
-    (gogoproto.moretags)   = "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>]".
-  string remotable_value_format = 10 [
-    (gogoproto.jsontag)    = "remotableValueFormat",
-    (gogoproto.moretags)   = "yaml:\"remotableValueFormat\""
-  ];
-}
-
-// QueryCapDataResponse represents the result with the requested formatting,
-// reserving space for future metadata such as media type.
-message QueryCapDataResponse {
-  string block_height = 1 [
-    (gogoproto.jsontag)    = "blockHeight",
-    (gogoproto.moretags)   = "yaml:\"blockHeight\""
-  ];
-  string value = 10 [
-    (gogoproto.jsontag)    = "value",
-    (gogoproto.moretags)   = "yaml:\"value\""
-  ];
-}
-
 // QueryChildrenRequest is the vstorage path children query.
 message QueryChildrenRequest {
   string path = 1 [

package/vm/controller.go

@@ -1,11 +1,16 @@
 package vm
 
 import (
-	"context"
+	"fmt"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
+type ControllerContext struct {
+	Context               sdk.Context
+	IBCChannelHandlerPort int
+}
+
 type ControllerAdmissionMsg interface {
 	sdk.Msg
 	CheckAdmissibility(sdk.Context, interface{}) error
@@ -26,13 +31,10 @@ type Jsonable interface{}
 // ActionPusher enqueues data for later consumption by the controller.
 type ActionPusher func(ctx sdk.Context, action Jsonable) error
 
-var wrappedEmptySDKContext = sdk.WrapSDKContext(
-	sdk.Context{}.WithContext(context.Background()),
-)
-var controllerContext context.Context = wrappedEmptySDKContext
+var controllerContext ControllerContext
 
 type PortHandler interface {
-	Receive(context.Context, string) (string, error)
+	Receive(*ControllerContext, string) (string, error)
 }
 
 var portToHandler = make(map[int]PortHandler)
@@ -43,9 +45,9 @@ var lastPort = 0
 func SetControllerContext(ctx sdk.Context) func() {
 	// We are only called by the controller, so we assume that it is billing its
 	// own meter usage.
-	controllerContext = sdk.WrapSDKContext(ctx.WithGasMeter(sdk.NewInfiniteGasMeter()))
+	controllerContext.Context = ctx.WithGasMeter(sdk.NewInfiniteGasMeter())
 	return func() {
-		controllerContext = wrappedEmptySDKContext
+		controllerContext.Context = sdk.Context{}
 	}
 }
 
@@ -67,3 +69,11 @@ func UnregisterPortHandler(portNum int) error {
 	delete(nameToPort, name)
 	return nil
 }
+
+func ReceiveFromController(portNum int, msg string) (string, error) {
+	handler := portToHandler[portNum]
+	if handler == nil {
+		return "", fmt.Errorf("unregistered port %d", portNum)
+	}
+	return handler.Receive(&controllerContext, msg)
+}

package/x/lien/lien.go

@@ -5,7 +5,6 @@
 package lien
 
 import (
-	"context"
 	"encoding/json"
 	"fmt"
 	"math"
@@ -71,8 +70,7 @@ const (
 // Receives and processes a bridge message, returning the
 // JSON-encoded response or error.
 // See spec/02_messages.md for the messages and responses.
-func (ch portHandler) Receive(cctx context.Context, str string) (string, error) {
-	ctx := sdk.UnwrapSDKContext(cctx)
+func (ch portHandler) Receive(ctx *vm.ControllerContext, str string) (string, error) {
 	var msg portMessage
 	err := json.Unmarshal([]byte(str), &msg)
 	if err != nil {
@@ -80,13 +78,13 @@ func (ch portHandler) Receive(cctx context.Context, str string) (string, error)
 	}
 	switch msg.Type {
 	case LIEN_GET_ACCOUNT_STATE:
-		return ch.handleGetAccountState(ctx, msg)
+		return ch.handleGetAccountState(ctx.Context, msg)
 
 	case LIEN_GET_STAKING:
-		return ch.handleGetStaking(ctx, msg)
+		return ch.handleGetStaking(ctx.Context, msg)
 
 	case LIEN_CHANGE_LIENED:
-		return ch.handleChangeLiened(ctx, msg)
+		return ch.handleChangeLiened(ctx.Context, msg)
 	}
 	return "", fmt.Errorf("unrecognized type %s", msg.Type)
 }

package/x/lien/lien_test.go

@@ -1,11 +1,11 @@
 package lien
 
 import (
-	"context"
 	"encoding/json"
 	"reflect"
 	"testing"
 
+	"github.com/Agoric/agoric-sdk/golang/cosmos/vm"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/lien/types"
 
 	"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
@@ -114,8 +114,8 @@ func (m *mockLienKeeper) GetDelegatorDelegations(ctx sdk.Context, delegator sdk.
 }
 
 func TestBadType(t *testing.T) {
-	ctx := sdk.Context{}.WithContext(context.Background())
-	ctlCtx := sdk.WrapSDKContext(ctx)
+	ctx := sdk.Context{}
+	ctlCtx := &vm.ControllerContext{Context: ctx}
 	keeper := mockLienKeeper{
 		states: map[string]types.AccountState{},
 	}
@@ -135,8 +135,8 @@ func TestBadType(t *testing.T) {
 }
 
 func TestGetAccountState(t *testing.T) {
-	ctx := sdk.Context{}.WithContext(context.Background())
-	ctlCtx := sdk.WrapSDKContext(ctx)
+	ctx := sdk.Context{}
+	ctlCtx := &vm.ControllerContext{Context: ctx}
 
 	keeper := mockLienKeeper{
 		states: map[string]types.AccountState{
@@ -177,9 +177,8 @@ func TestGetAccountState(t *testing.T) {
 }
 
 func TestGetAccountState_badRequest(t *testing.T) {
-	ctx := sdk.Context{}.WithContext(context.Background())
-	ctlCtx := sdk.WrapSDKContext(ctx)
-
+	ctx := sdk.Context{}
+	ctlCtx := &vm.ControllerContext{Context: ctx}
 	keeper := mockLienKeeper{
 		states: map[string]types.AccountState{},
 	}
@@ -215,9 +214,8 @@ func TestGetAccountState_badRequest(t *testing.T) {
 }
 
 func TestSetLiened_badAddr(t *testing.T) {
-	ctx := sdk.Context{}.WithContext(context.Background())
-	ctlCtx := sdk.WrapSDKContext(ctx)
-
+	ctx := sdk.Context{}
+	ctlCtx := &vm.ControllerContext{Context: ctx}
 	keeper := mockLienKeeper{}
 	ph := NewPortHandler(&keeper)
 	msg := portMessage{
@@ -237,9 +235,8 @@ func TestSetLiened_badAddr(t *testing.T) {
 }
 
 func TestSetLiened_badDenom(t *testing.T) {
-	ctx := sdk.Context{}.WithContext(context.Background())
-	ctlCtx := sdk.WrapSDKContext(ctx)
-
+	ctx := sdk.Context{}
+	ctlCtx := &vm.ControllerContext{Context: ctx}
 	keeper := mockLienKeeper{}
 	ph := NewPortHandler(&keeper)
 	msg := portMessage{
@@ -259,9 +256,8 @@ func TestSetLiened_badDenom(t *testing.T) {
 }
 
 func TestSetLiened(t *testing.T) {
-	ctx := sdk.Context{}.WithContext(context.Background())
-	ctlCtx := sdk.WrapSDKContext(ctx)
-
+	ctx := sdk.Context{}
+	ctlCtx := &vm.ControllerContext{Context: ctx}
 	keeper := mockLienKeeper{}
 	ph := NewPortHandler(&keeper)
 	msg := portMessage{
@@ -340,8 +336,8 @@ func TestGetStaking(t *testing.T) {
 	keeper.delegations[addr4.String()] = []stakingTypes.Delegation{}
 
 	ph := NewPortHandler(&keeper)
-	ctx := sdk.Context{}.WithContext(context.Background())
-	ctlCtx := sdk.WrapSDKContext(ctx)
+	ctx := sdk.Context{}
+	ctlCtx := &vm.ControllerContext{Context: ctx}
 
 	pi := func(x int64) *sdk.Int {
 		n := i(x)

package/x/swingset/abci.go

@@ -2,7 +2,6 @@ package swingset
 
 import (
 	// "os"
-	"context"
 	"fmt"
 	"time"
 
@@ -89,7 +88,7 @@ func CommitBlock(keeper Keeper) error {
 		BlockHeight: endBlockHeight,
 		BlockTime:   endBlockTime,
 	}
-	_, err := keeper.BlockingSend(sdk.Context{}.WithContext(context.Background()), action)
+	_, err := keeper.BlockingSend(sdk.Context{}, action)
 
 	// fmt.Fprintf(os.Stderr, "COMMIT_BLOCK Returned from SwingSet: %s, %v\n", out, err)
 	if err != nil {
@@ -108,7 +107,7 @@ func AfterCommitBlock(keeper Keeper) error {
 		BlockHeight: endBlockHeight,
 		BlockTime:   endBlockTime,
 	}
-	_, err := keeper.BlockingSend(sdk.Context{}.WithContext(context.Background()), action)
+	_, err := keeper.BlockingSend(sdk.Context{}, action)
 
 	// fmt.Fprintf(os.Stderr, "AFTER_COMMIT_BLOCK Returned from SwingSet: %s, %v\n", out, err)
 	if err != nil {

package/x/swingset/swingset.go

@@ -1,7 +1,6 @@
 package swingset
 
 import (
-	"context"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -34,8 +33,7 @@ func NewPortHandler(k Keeper) vm.PortHandler {
 // Receive implements the vm.PortHandler method.
 // It receives and processes an inbound message, returning the
 // JSON-serialized response or an error.
-func (ph portHandler) Receive(cctx context.Context, str string) (string, error) {
-	ctx := sdk.UnwrapSDKContext(cctx)
+func (ph portHandler) Receive(ctx *vm.ControllerContext, str string) (string, error) {
 	var msg swingsetMessage
 	err := json.Unmarshal([]byte(str), &msg)
 	if err != nil {
@@ -44,7 +42,7 @@ func (ph portHandler) Receive(cctx context.Context, str string) (string, error)
 
 	switch msg.Method {
 	case SwingStoreUpdateExportData:
-		return ph.handleSwingStoreUpdateExportData(ctx, msg.Args)
+		return ph.handleSwingStoreUpdateExportData(ctx.Context, msg.Args)
 
 	default:
 		return "", fmt.Errorf("unrecognized swingset method %s", msg.Method)

package/x/swingset/types/default-params.go

@@ -50,7 +50,7 @@ var (
 	DefaultBeansPerMinFeeDebit = DefaultBeansPerFeeUnit.Quo(sdk.NewUint(5))      // $0.2
 	DefaultBeansPerStorageByte = DefaultBeansPerFeeUnit.Quo(sdk.NewUint(500))    // $0.002
 
-	DefaultBootstrapVatConfig = "@agoric/vm-config/decentral-core-config.json"
+	DefaultBootstrapVatConfig = "@agoric/vats/decentral-core-config.json"
 
 	DefaultPowerFlagFees = []PowerFlagFee{
 		NewPowerFlagFee("SMART_WALLET", sdk.NewCoins(sdk.NewInt64Coin("ubld", 10_000_000))),

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

@@ -433,7 +433,7 @@ type MsgInstallBundle struct {
 	Submitter github_com_cosmos_cosmos_sdk_types.AccAddress `protobuf:"bytes,2,opt,name=submitter,proto3,casttype=github.com/cosmos/cosmos-sdk/types.AccAddress" json:"submitter" yaml:"submitter"`
 	// Either bundle or compressed_bundle will be set.
 	// Default compression algorithm is gzip.
-	CompressedBundle []byte `protobuf:"bytes,3,opt,name=compressed_bundle,json=compressedBundle,proto3" json:"compressedBundle" yaml:"compressedBundle"`
+	CompressedBundle []byte `protobuf:"bytes,3,opt,name=compressed_bundle,json=compressedBundle,proto3" json:"compressedBundle" yaml:"bcompressedBndle"`
 	// Size in bytes of uncompression of compressed_bundle.
 	UncompressedSize int64 `protobuf:"varint,4,opt,name=uncompressed_size,json=uncompressedSize,proto3" json:"uncompressedSize"`
 }
@@ -553,7 +553,7 @@ func init() {
 func init() { proto.RegisterFile("agoric/swingset/msgs.proto", fileDescriptor_788baa062b181a57) }
 
 var fileDescriptor_788baa062b181a57 = []byte{
-	// 788 bytes of a gzipped FileDescriptorProto
+	// 789 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0xcf, 0x6f, 0xe3, 0x44,
 	0x14, 0x8e, 0xe3, 0x50, 0x36, 0xaf, 0xd9, 0x6d, 0x63, 0x95, 0xad, 0xd7, 0x0b, 0x99, 0xac, 0xa5,
 	0x15, 0x01, 0xd4, 0x44, 0xb0, 0xb7, 0xed, 0x29, 0x16, 0x42, 0x5a, 0xa4, 0xa0, 0xc5, 0x2b, 0x84,
@@ -590,20 +590,20 @@ var fileDescriptor_788baa062b181a57 = []byte{
 	0x01, 0x8d, 0x2d, 0xcf, 0x33, 0x66, 0xc1, 0xc4, 0xc3, 0xca, 0x0b, 0xd8, 0x1a, 0xf3, 0x7f, 0xf9,
 	0xe9, 0x3c, 0x4d, 0x18, 0xca, 0x91, 0x94, 0xa1, 0x87, 0xc2, 0x9e, 0x88, 0x75, 0x33, 0x27, 0x96,
 	0x57, 0x56, 0xbf, 0x87, 0x95, 0x29, 0xdf, 0x40, 0xdb, 0x26, 0x7e, 0x98, 0xc1, 0x78, 0x72, 0x9c,
-	0x3b, 0x96, 0x79, 0xe7, 0x41, 0xc2, 0xd0, 0x6e, 0x45, 0x1a, 0x85, 0xf7, 0x7d, 0x61, 0x60, 0x95,
-	0xd1, 0xcd, 0x35, 0xb1, 0x32, 0x84, 0xf6, 0x2c, 0x58, 0xa8, 0x4f, 0xdd, 0x4b, 0xcc, 0x4f, 0x4c,
-	0x36, 0xf6, 0xb2, 0xea, 0x8b, 0xe4, 0x1b, 0xf7, 0x12, 0x9b, 0x6b, 0x88, 0xae, 0x81, 0xba, 0xba,
-	0xb7, 0xc5, 0xc6, 0x7f, 0x72, 0x2d, 0x83, 0x3c, 0xa2, 0x8e, 0xf2, 0x2d, 0x3c, 0x5c, 0xde, 0xfc,
-	0x67, 0xfd, 0x95, 0xd7, 0x40, 0x7f, 0xb5, 0x86, 0xf6, 0xc1, 0xad, 0x92, 0xa2, 0x8d, 0x72, 0x02,
-	0x8f, 0x56, 0x5e, 0x14, 0xfa, 0xa6, 0xe4, 0x65, 0x8d, 0xf6, 0xe1, 0xed, 0x9a, 0xb2, 0xc3, 0x11,
-	0xb4, 0x96, 0x1e, 0xa6, 0xdd, 0x4d, 0xb9, 0x8b, 0x0a, 0xad, 0x77, 0x9b, 0xa2, 0xac, 0xed, 0x42,
-	0x7b, 0xfd, 0xc9, 0xf7, 0xfc, 0x9f, 0xd3, 0x17, 0x64, 0xda, 0xc1, 0x7f, 0x92, 0x95, 0xad, 0xbe,
-	0x84, 0x66, 0xf5, 0x80, 0x7a, 0x6f, 0x53, 0x6e, 0x49, 0x6b, 0xcf, 0xff, 0x95, 0x2e, 0x4a, 0x1a,
-	0x5f, 0xfd, 0x36, 0xef, 0x48, 0x57, 0xf3, 0x8e, 0x74, 0x3d, 0xef, 0x48, 0x3f, 0xde, 0x74, 0x6a,
-	0x57, 0x37, 0x9d, 0xda, 0xef, 0x37, 0x9d, 0xda, 0xd1, 0xe1, 0xc2, 0xcc, 0x0f, 0xc5, 0x07, 0x81,
-	0xa8, 0xc8, 0x67, 0xde, 0x21, 0x9e, 0x15, 0x38, 0xc5, 0x65, 0xf8, 0xbe, 0xfa, 0x56, 0xe0, 0x97,
-	0x61, 0xbc, 0xc5, 0x3f, 0x03, 0x5e, 0xfc, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x51, 0x66, 0x1b, 0xd5,
-	0x4b, 0x08, 0x00, 0x00,
+	0x3b, 0x96, 0x79, 0xe7, 0x41, 0xc2, 0xd0, 0x6e, 0x45, 0x1a, 0x85, 0xf7, 0xfd, 0xdc, 0xfb, 0x02,
+	0x25, 0x56, 0xb1, 0x26, 0x56, 0x86, 0xd0, 0x9e, 0x05, 0x0b, 0xf5, 0xa9, 0x7b, 0x89, 0xf9, 0x89,
+	0xc9, 0xc6, 0x5e, 0x56, 0x7d, 0x91, 0x7c, 0xe3, 0x5e, 0x62, 0x73, 0x0d, 0xd1, 0x35, 0x50, 0x57,
+	0xf7, 0xb6, 0xd8, 0xf8, 0x4f, 0xae, 0x65, 0x90, 0x47, 0xd4, 0x51, 0xbe, 0x85, 0x87, 0xcb, 0x9b,
+	0xff, 0xac, 0xbf, 0xf2, 0x1a, 0xe8, 0xaf, 0xd6, 0xd0, 0x3e, 0xb8, 0x55, 0x52, 0xb4, 0x51, 0x4e,
+	0xe0, 0xd1, 0xca, 0x8b, 0x42, 0xdf, 0x94, 0xbc, 0xac, 0xd1, 0x3e, 0xbc, 0x5d, 0x53, 0x76, 0x38,
+	0x82, 0xd6, 0xd2, 0xc3, 0xb4, 0xbb, 0x29, 0x77, 0x51, 0xa1, 0xf5, 0x6e, 0x53, 0x94, 0xb5, 0x5d,
+	0x68, 0xaf, 0x3f, 0xf9, 0x9e, 0xff, 0x73, 0xfa, 0x82, 0x4c, 0x3b, 0xf8, 0x4f, 0xb2, 0xb2, 0xd5,
+	0x97, 0xd0, 0xac, 0x1e, 0x50, 0xef, 0x6d, 0xca, 0x2d, 0x69, 0xed, 0xf9, 0xbf, 0xd2, 0x45, 0x49,
+	0xe3, 0xab, 0xdf, 0xe6, 0x1d, 0xe9, 0x6a, 0xde, 0x91, 0xae, 0xe7, 0x1d, 0xe9, 0xc7, 0x9b, 0x4e,
+	0xed, 0xea, 0xa6, 0x53, 0xfb, 0xfd, 0xa6, 0x53, 0x3b, 0x3a, 0x5c, 0x98, 0xf9, 0xa1, 0xf8, 0x20,
+	0x10, 0x15, 0xf9, 0xcc, 0x3b, 0xc4, 0xb3, 0x02, 0xa7, 0xb8, 0x0c, 0xdf, 0x57, 0xdf, 0x0a, 0xfc,
+	0x32, 0x8c, 0xb7, 0xf8, 0x67, 0xc0, 0x8b, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x99, 0x11, 0x18,
+	0xbe, 0x4b, 0x08, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.

package/x/vbank/vbank.go

@@ -121,9 +121,8 @@ func marshal(event vm.Jsonable) ([]byte, error) {
 	return json.Marshal(event)
 }
 
-func (ch portHandler) Receive(cctx context.Context, str string) (ret string, err error) {
+func (ch portHandler) Receive(ctx *vm.ControllerContext, str string) (ret string, err error) {
 	// fmt.Println("vbank.go downcall", str)
-	ctx := sdk.UnwrapSDKContext(cctx)
 	keeper := ch.keeper
 
 	var msg portMessage
@@ -141,7 +140,7 @@ func (ch portHandler) Receive(cctx context.Context, str string) (ret string, err
 		if err = sdk.ValidateDenom(msg.Denom); err != nil {
 			return "", fmt.Errorf("invalid denom %s: %s", msg.Denom, err)
 		}
-		coin := keeper.GetBalance(ctx, addr, msg.Denom)
+		coin := keeper.GetBalance(ctx.Context, addr, msg.Denom)
 		packet := coin.Amount.String()
 		if err == nil {
 			bytes, err := json.Marshal(&packet)
@@ -163,12 +162,12 @@ func (ch portHandler) Receive(cctx context.Context, str string) (ret string, err
 			return "", fmt.Errorf("cannot convert %s to int", msg.Amount)
 		}
 		coins := sdk.NewCoins(sdk.NewCoin(msg.Denom, value))
-		if err := keeper.GrabCoins(ctx, addr, coins); err != nil {
+		if err := keeper.GrabCoins(ctx.Context, addr, coins); err != nil {
 			return "", fmt.Errorf("cannot grab %s coins: %s", coins.Sort().String(), err)
 		}
 		addressToBalances := make(map[string]sdk.Coins, 1)
 		addressToBalances[msg.Sender] = sdk.NewCoins(sdk.NewInt64Coin(msg.Denom, 1))
-		bz, err := marshal(getBalanceUpdate(ctx, keeper, addressToBalances))
+		bz, err := marshal(getBalanceUpdate(ctx.Context, keeper, addressToBalances))
 		if err != nil {
 			return "", err
 		}
@@ -191,12 +190,12 @@ func (ch portHandler) Receive(cctx context.Context, str string) (ret string, err
 			return "", fmt.Errorf("cannot convert %s to int", msg.Amount)
 		}
 		coins := sdk.NewCoins(sdk.NewCoin(msg.Denom, value))
-		if err := keeper.SendCoins(ctx, addr, coins); err != nil {
+		if err := keeper.SendCoins(ctx.Context, addr, coins); err != nil {
 			return "", fmt.Errorf("cannot give %s coins: %s", coins.Sort().String(), err)
 		}
 		addressToBalances := make(map[string]sdk.Coins, 1)
 		addressToBalances[msg.Recipient] = sdk.NewCoins(sdk.NewInt64Coin(msg.Denom, 1))
-		bz, err := marshal(getBalanceUpdate(ctx, keeper, addressToBalances))
+		bz, err := marshal(getBalanceUpdate(ctx.Context, keeper, addressToBalances))
 		if err != nil {
 			return "", err
 		}
@@ -212,20 +211,20 @@ func (ch portHandler) Receive(cctx context.Context, str string) (ret string, err
 			return "", fmt.Errorf("cannot convert %s to int", msg.Amount)
 		}
 		coins := sdk.NewCoins(sdk.NewCoin(msg.Denom, value))
-		if err := keeper.StoreRewardCoins(ctx, coins); err != nil {
+		if err := keeper.StoreRewardCoins(ctx.Context, coins); err != nil {
 			return "", fmt.Errorf("cannot store reward %s coins: %s", coins.Sort().String(), err)
 		}
 		if err != nil {
 			return "", err
 		}
-		state := keeper.GetState(ctx)
+		state := keeper.GetState(ctx.Context)
 		state.RewardPool = state.RewardPool.Add(coins...)
-		keeper.SetState(ctx, state)
+		keeper.SetState(ctx.Context, state)
 		// We don't supply the module balance, since the controller shouldn't know.
 		ret = "true"
 
 	case "VBANK_GET_MODULE_ACCOUNT_ADDRESS":
-		addr := keeper.GetModuleAccountAddress(ctx, msg.ModuleName).String()
+		addr := keeper.GetModuleAccountAddress(ctx.Context, msg.ModuleName).String()
 		if len(addr) == 0 {
 			return "", fmt.Errorf("module account %s not found", msg.ModuleName)
 		}