@agoric/cosmos 0.35.0-upgrade-14-dev-8be87aa.0 → 0.35.0-upgrade-14-dev-c8f9e7b.0

package/vm/action.go

@@ -58,21 +58,23 @@ func SetActionHeaderFromContext(ctx sdk.Context, actionType string, ah *ActionHe
 	}
 }
 
-// PopulateAction interprets `default:"..."` tags and specially handles an
-// embedded ActionHeader struct.
+// PopulateAction returns a clone of action in which empty/zero-valued fields
+// in its embedded ActionHeader have been populated using the corresponding
+// `actionType:"..."` tag and the provided ctx, and its own empty/zero-valued
+// fields have been populated as specified by their `default:"..."` tags.
 func PopulateAction(ctx sdk.Context, action Action) Action {
-	oldRv := reflect.Indirect(reflect.ValueOf(action))
-	if oldRv.Kind() != reflect.Struct {
+	oldActionDesc := reflect.Indirect(reflect.ValueOf(action))
+	if oldActionDesc.Kind() != reflect.Struct {
 		return action
 	}
 
 	// Shallow copy to a new value.
-	rp := reflect.New(oldRv.Type())
-	rv := reflect.Indirect(rp)
-	for i := 0; i < rv.NumField(); i++ {
-		oldField := oldRv.Field(i)
-		field := rv.Field(i)
-		fieldType := rv.Type().Field(i)
+	newActionDescPtr := reflect.New(oldActionDesc.Type())
+	newActionDesc := reflect.Indirect(newActionDescPtr)
+	for i := 0; i < newActionDesc.NumField(); i++ {
+		oldField := oldActionDesc.Field(i)
+		field := newActionDesc.Field(i)
+		fieldType := newActionDesc.Type().Field(i)
 		if !field.CanSet() {
 			continue
 		}
@@ -81,34 +83,35 @@ func PopulateAction(ctx sdk.Context, action Action) Action {
 		field.Set(oldField)
 
 		// Populate any ActionHeader struct.
-		var ahp *ActionHeader
+		var headerPtr *ActionHeader
 		if fieldType.Type == actionHeaderType {
-			ahp = field.Addr().Interface().(*ActionHeader)
+			headerPtr = field.Addr().Interface().(*ActionHeader)
 		} else if fieldType.Type == reflect.PtrTo(actionHeaderType) {
 			if field.IsNil() {
-				ahp = &ActionHeader{}
+				headerPtr = &ActionHeader{}
 			} else {
-				ahp = field.Interface().(*ActionHeader)
+				headerPtr = field.Interface().(*ActionHeader)
 			}
 		}
-		if ahp != nil {
+		if headerPtr != nil {
 			actionTypeTag, _ := fieldType.Tag.Lookup("actionType")
-			ah := *ahp
-			SetActionHeaderFromContext(ctx, actionTypeTag, &ah)
+			newHeader := *headerPtr
+			SetActionHeaderFromContext(ctx, actionTypeTag, &newHeader)
 			if field.Kind() == reflect.Ptr {
-				field.Set(reflect.ValueOf(&ah))
+				field.Set(reflect.ValueOf(&newHeader))
 			} else {
-				field.Set(reflect.ValueOf(ah))
+				field.Set(reflect.ValueOf(newHeader))
 			}
 			continue
 		}
 
-		// Still zero value, try default struct field tag.
+		// Skip any field that is already populated or lacks a "default" tag.
 		defaultTag, _ := fieldType.Tag.Lookup("default")
 		if !field.IsZero() || len(defaultTag) == 0 {
 			continue
 		}
 
+		// Populate the field from its "default" tag.
 		switch field.Kind() {
 		case reflect.String:
 			field.SetString(defaultTag)
@@ -126,5 +129,5 @@ func PopulateAction(ctx sdk.Context, action Action) Action {
 			}
 		}
 	}
-	return rv.Interface().(Action)
+	return newActionDesc.Interface().(Action)
 }

package/vm/action_test.go

@@ -106,21 +106,21 @@ func TestActionContext(t *testing.T) {
 	for _, tc := range testCases {
 		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
-			jstr := func(in interface{}) string {
+			toJson := func(in interface{}) string {
 				bz, err := json.Marshal(in)
 				if err != nil {
 					t.Fatal(err)
 				}
 				return string(bz)
 			}
-			jsonIn := jstr(tc.in)
+			jsonIn := toJson(tc.in)
 			out := vm.PopulateAction(tc.ctx, tc.in)
-			jsonIn2 := jstr(tc.in)
+			jsonIn2 := toJson(tc.in)
 			if jsonIn != jsonIn2 {
 				t.Errorf("unexpected mutated input: %s to %s", jsonIn, jsonIn2)
 			}
-			jsonOut := jstr(out)
-			jsonExpectedOut := jstr(tc.expectedOut)
+			jsonOut := toJson(out)
+			jsonExpectedOut := toJson(tc.expectedOut)
 			if jsonOut != jsonExpectedOut {
 				t.Errorf("expected %s, got %s", jsonExpectedOut, jsonOut)
 			}

package/vm/controller.go

@@ -1,16 +1,12 @@
 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
@@ -25,10 +21,13 @@ type ControllerAdmissionMsg interface {
 	IsHighPriority(sdk.Context, interface{}) (bool, error)
 }
 
-var controllerContext ControllerContext
+var wrappedEmptySDKContext = sdk.WrapSDKContext(
+	sdk.Context{}.WithContext(context.Background()),
+)
+var controllerContext context.Context = wrappedEmptySDKContext
 
 type PortHandler interface {
-	Receive(*ControllerContext, string) (string, error)
+	Receive(context.Context, string) (string, error)
 }
 
 var portToHandler = make(map[int]PortHandler)
@@ -39,9 +38,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.Context = ctx.WithGasMeter(sdk.NewInfiniteGasMeter())
+	controllerContext = sdk.WrapSDKContext(ctx.WithGasMeter(sdk.NewInfiniteGasMeter()))
 	return func() {
-		controllerContext.Context = sdk.Context{}
+		controllerContext = wrappedEmptySDKContext
 	}
 }
 
@@ -69,5 +68,5 @@ func ReceiveFromController(portNum int, msg string) (string, error) {
 	if handler == nil {
 		return "", fmt.Errorf("unregistered port %d", portNum)
 	}
-	return handler.Receive(&controllerContext, msg)
+	return handler.Receive(controllerContext, msg)
 }

package/x/lien/keeper/account.go

@@ -88,7 +88,7 @@ func (uva unlockedVestingAccount) TrackDelegation(blockTime time.Time, balance,
 // TrackUndelegation implements the vestexported.VestingAccount interface.
 func (uva unlockedVestingAccount) TrackUndelegation(amount sdk.Coins) {
 	// max(delegated - amount, 0) == delegated - min(delegated, amount)
-	uva.lien.Delegated = uva.lien.Delegated.Sub(uva.lien.Delegated.Min(amount))
+	uva.lien.Delegated = uva.lien.Delegated.Sub(uva.lien.Delegated.Min(amount)...)
 }
 
 // GetVestedCoins implements the vestexported.VestingAccount interface.
@@ -211,12 +211,12 @@ func (la *LienAccount) LienedLockedCoins(ctx sdk.Context) sdk.Coins {
 	liened := la.lien.Coins
 	acc := la.omniClawbackAccount.(authtypes.AccountI)
 	if clawback, ok := acc.(vestexported.ClawbackVestingAccountI); ok {
-		liened = liened.Add(clawback.GetOriginalVesting().Sub(clawback.GetVestedOnly(ctx.BlockTime()))...)
+		liened = liened.Add(clawback.GetOriginalVesting().Sub(clawback.GetVestedOnly(ctx.BlockTime())...)...)
 	}
 	// Since coins can't go negative, even transiently, use the
 	// identity A + B = max(A, B) + min(A, B)
 	//    max(0, A - B) = max(B, A) - B = A - min(A, B)
-	return liened.Sub(liened.Min(delegated))
+	return liened.Sub(liened.Min(delegated)...)
 }
 
 // XXX_MessageName provides the message name for JSON serialization.

package/x/lien/keeper/keeper.go

@@ -7,6 +7,7 @@ import (
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/lien/types"
 
 	"github.com/cosmos/cosmos-sdk/codec"
+	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	vestexported "github.com/cosmos/cosmos-sdk/x/auth/vesting/exported"
 	stakingTypes "github.com/cosmos/cosmos-sdk/x/staking/types"
@@ -31,7 +32,7 @@ type Keeper interface {
 // The accountKeeper field must be the same one that the bankKeeper and
 // stakingKeeper use.
 type keeperImpl struct {
-	key sdk.StoreKey
+	key storetypes.StoreKey
 	cdc codec.Codec
 
 	accountKeeper *types.WrappedAccountKeeper
@@ -43,7 +44,7 @@ type keeperImpl struct {
 
 // NewKeeper returns a new Keeper.
 // The ak must be the same accout keeper that the bk and sk use.
-func NewKeeper(cdc codec.Codec, key sdk.StoreKey, ak *types.WrappedAccountKeeper, bk types.BankKeeper, sk types.StakingKeeper,
+func NewKeeper(cdc codec.Codec, key storetypes.StoreKey, ak *types.WrappedAccountKeeper, bk types.BankKeeper, sk types.StakingKeeper,
 	pushAction vm.ActionPusher) Keeper {
 	return keeperImpl{
 		key:           key,
@@ -124,7 +125,7 @@ func (lk keeperImpl) ChangeLien(ctx sdk.Context, addr sdk.AccAddress, denom stri
 		return oldAmt, fmt.Errorf("lien delta of %s is larger than existing balance %s", delta, oldAmt)
 	}
 	newCoin := sdk.NewCoin(denom, newAmt)
-	newCoins := oldCoins.Sub(sdk.NewCoins(sdk.NewCoin(denom, oldAmt))).Add(newCoin)
+	newCoins := oldCoins.Sub(sdk.NewCoins(sdk.NewCoin(denom, oldAmt))...).Add(newCoin)
 	newLien := types.Lien{
 		Coins:     newCoins,
 		Delegated: oldLien.Delegated,
@@ -223,7 +224,7 @@ func (lk keeperImpl) getLockedUnvested(ctx sdk.Context, addr sdk.AccAddress) (sd
 		original := clawbackAccount.GetOriginalVesting()
 		unlocked := clawbackAccount.GetUnlockedOnly(ctx.BlockTime())
 		vested := clawbackAccount.GetVestedOnly(ctx.BlockTime())
-		return original.Sub(unlocked), original.Sub(vested)
+		return original.Sub(unlocked...), original.Sub(vested...)
 	}
 	if vestingAccount, ok := account.(vestexported.VestingAccount); ok {
 		return vestingAccount.GetVestingCoins(ctx.BlockTime()), sdk.NewCoins()

package/x/lien/keeper/keeper_test.go

@@ -99,7 +99,7 @@ func makeTestKit() testKit {
 		stakingtypes.NotBondedPoolName: {authtypes.Burner, authtypes.Staking},
 		authtypes.Minter:               {authtypes.Minter},
 	}
-	innerAk := authkeeper.NewAccountKeeper(cdc, authStoreKey, authSpace, authtypes.ProtoBaseAccount, maccPerms)
+	innerAk := authkeeper.NewAccountKeeper(cdc, authStoreKey, authSpace, authtypes.ProtoBaseAccount, maccPerms, "agoric")
 	wak := types.NewWrappedAccountKeeper(innerAk)
 
 	// bank keeper
@@ -120,12 +120,12 @@ func makeTestKit() testKit {
 
 	db := dbm.NewMemDB()
 	ms := store.NewCommitMultiStore(db)
-	ms.MountStoreWithDB(paramsTKey, sdk.StoreTypeTransient, nil)
-	ms.MountStoreWithDB(paramsStoreKey, sdk.StoreTypeIAVL, db)
-	ms.MountStoreWithDB(authStoreKey, sdk.StoreTypeIAVL, db)
-	ms.MountStoreWithDB(bankStoreKey, sdk.StoreTypeIAVL, db)
-	ms.MountStoreWithDB(stakingStoreKey, sdk.StoreTypeIAVL, db)
-	ms.MountStoreWithDB(lienStoreKey, sdk.StoreTypeIAVL, db)
+	ms.MountStoreWithDB(paramsTKey, storetypes.StoreTypeTransient, nil)
+	ms.MountStoreWithDB(paramsStoreKey, storetypes.StoreTypeIAVL, db)
+	ms.MountStoreWithDB(authStoreKey, storetypes.StoreTypeIAVL, db)
+	ms.MountStoreWithDB(bankStoreKey, storetypes.StoreTypeIAVL, db)
+	ms.MountStoreWithDB(stakingStoreKey, storetypes.StoreTypeIAVL, db)
+	ms.MountStoreWithDB(lienStoreKey, storetypes.StoreTypeIAVL, db)
 	err := ms.LoadLatestVersion()
 	if err != nil {
 		panic(err)
@@ -165,7 +165,7 @@ func (tk testKit) initAccount(t *testing.T, funder, addr sdk.AccAddress, state t
 	}
 
 	// Total
-	toMint := state.Total.Sub(state.Locked)
+	toMint := state.Total.Sub(state.Locked...)
 	if !toMint.IsZero() {
 		err := tk.bankKeeper.MintCoins(tk.ctx, authtypes.Minter, toMint)
 		if err != nil {

package/x/lien/lien.go

@@ -5,6 +5,7 @@
 package lien
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"math"
@@ -70,7 +71,8 @@ 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(ctx *vm.ControllerContext, str string) (string, error) {
+func (ch portHandler) Receive(cctx context.Context, str string) (string, error) {
+	ctx := sdk.UnwrapSDKContext(cctx)
 	var msg portMessage
 	err := json.Unmarshal([]byte(str), &msg)
 	if err != nil {
@@ -78,13 +80,13 @@ func (ch portHandler) Receive(ctx *vm.ControllerContext, str string) (string, er
 	}
 	switch msg.Type {
 	case LIEN_GET_ACCOUNT_STATE:
-		return ch.handleGetAccountState(ctx.Context, msg)
+		return ch.handleGetAccountState(ctx, msg)
 
 	case LIEN_GET_STAKING:
-		return ch.handleGetStaking(ctx.Context, msg)
+		return ch.handleGetStaking(ctx, msg)
 
 	case LIEN_CHANGE_LIENED:
-		return ch.handleChangeLiened(ctx.Context, msg)
+		return ch.handleChangeLiened(ctx, 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"
@@ -97,7 +97,7 @@ func (m *mockLienKeeper) BondDenom(ctx sdk.Context) string {
 func (m *mockLienKeeper) GetAllBalances(ctx sdk.Context, addr sdk.AccAddress) sdk.Coins {
 	state := m.GetAccountState(ctx, addr)
 	delegated := state.Bonded.Add(state.Unbonding...)
-	bank := state.Total.Sub(state.Total.Min(delegated))
+	bank := state.Total.Sub(state.Total.Min(delegated)...)
 	return bank
 }
 
@@ -114,8 +114,8 @@ func (m *mockLienKeeper) GetDelegatorDelegations(ctx sdk.Context, delegator sdk.
 }
 
 func TestBadType(t *testing.T) {
-	ctx := sdk.Context{}
-	ctlCtx := &vm.ControllerContext{Context: ctx}
+	ctx := sdk.Context{}.WithContext(context.Background())
+	ctlCtx := sdk.WrapSDKContext(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{}
-	ctlCtx := &vm.ControllerContext{Context: ctx}
+	ctx := sdk.Context{}.WithContext(context.Background())
+	ctlCtx := sdk.WrapSDKContext(ctx)
 
 	keeper := mockLienKeeper{
 		states: map[string]types.AccountState{
@@ -177,8 +177,9 @@ func TestGetAccountState(t *testing.T) {
 }
 
 func TestGetAccountState_badRequest(t *testing.T) {
-	ctx := sdk.Context{}
-	ctlCtx := &vm.ControllerContext{Context: ctx}
+	ctx := sdk.Context{}.WithContext(context.Background())
+	ctlCtx := sdk.WrapSDKContext(ctx)
+
 	keeper := mockLienKeeper{
 		states: map[string]types.AccountState{},
 	}
@@ -214,8 +215,9 @@ func TestGetAccountState_badRequest(t *testing.T) {
 }
 
 func TestSetLiened_badAddr(t *testing.T) {
-	ctx := sdk.Context{}
-	ctlCtx := &vm.ControllerContext{Context: ctx}
+	ctx := sdk.Context{}.WithContext(context.Background())
+	ctlCtx := sdk.WrapSDKContext(ctx)
+
 	keeper := mockLienKeeper{}
 	ph := NewPortHandler(&keeper)
 	msg := portMessage{
@@ -235,8 +237,9 @@ func TestSetLiened_badAddr(t *testing.T) {
 }
 
 func TestSetLiened_badDenom(t *testing.T) {
-	ctx := sdk.Context{}
-	ctlCtx := &vm.ControllerContext{Context: ctx}
+	ctx := sdk.Context{}.WithContext(context.Background())
+	ctlCtx := sdk.WrapSDKContext(ctx)
+
 	keeper := mockLienKeeper{}
 	ph := NewPortHandler(&keeper)
 	msg := portMessage{
@@ -256,8 +259,9 @@ func TestSetLiened_badDenom(t *testing.T) {
 }
 
 func TestSetLiened(t *testing.T) {
-	ctx := sdk.Context{}
-	ctlCtx := &vm.ControllerContext{Context: ctx}
+	ctx := sdk.Context{}.WithContext(context.Background())
+	ctlCtx := sdk.WrapSDKContext(ctx)
+
 	keeper := mockLienKeeper{}
 	ph := NewPortHandler(&keeper)
 	msg := portMessage{
@@ -336,8 +340,8 @@ func TestGetStaking(t *testing.T) {
 	keeper.delegations[addr4.String()] = []stakingTypes.Delegation{}
 
 	ph := NewPortHandler(&keeper)
-	ctx := sdk.Context{}
-	ctlCtx := &vm.ControllerContext{Context: ctx}
+	ctx := sdk.Context{}.WithContext(context.Background())
+	ctlCtx := sdk.WrapSDKContext(ctx)
 
 	pi := func(x int64) *sdk.Int {
 		n := i(x)

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

@@ -53,7 +53,7 @@ func GetCmdQueryParams(queryRoute string) *cobra.Command {
 
 func GetCmdGetEgress(queryRoute string) *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "egress [account]",
+		Use:   "egress <account>",
 		Short: "get egress info for account",
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
@@ -86,7 +86,7 @@ func GetCmdGetEgress(queryRoute string) *cobra.Command {
 // GetCmdMailbox queries information about a mailbox
 func GetCmdMailbox(queryRoute string) *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "mailbox [peer]",
+		Use:   "mailbox <peer>",
 		Short: "get mailbox for peer",
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {

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

@@ -2,6 +2,7 @@ package cli
 
 import (
 	"fmt"
+	"io"
 	"os"
 	"strings"
 
@@ -12,7 +13,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/tx"
 	govcli "github.com/cosmos/cosmos-sdk/x/gov/client/cli"
-	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
+	govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
 
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/swingset/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -43,11 +44,18 @@ func GetTxCmd(storeKey string) *cobra.Command {
 }
 
 // GetCmdDeliver is the CLI command for sending a DeliverInbound transaction
+// containing mailbox messages.
 func GetCmdDeliver() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "deliver [json string]",
-		Short: "deliver inbound messages",
-		Args:  cobra.ExactArgs(1),
+		Use:   "deliver {<messages JSON> | @- | @<file>}",
+		Short: "send mailbox messages",
+		Long: `send mailbox messages.
+The argument indicates how to read input JSON ("@-" for standard input,
+"@..." for a file path, and otherwise directly as in "deliver '[...]'").
+Input must represent an array in which the first element is an array of
+[messageNum: integer, messageBody: string] pairs and the second element
+is an "Ack" integer.`,
+		Args: cobra.ExactArgs(1),
 
 		RunE: func(cmd *cobra.Command, args []string) error {
 			cctx, err := client.GetClientTxContext(cmd)
@@ -56,20 +64,18 @@ func GetCmdDeliver() *cobra.Command {
 			}
 
 			jsonIn := args[0]
-			if jsonIn[0] == '@' {
-				fname := args[0][1:]
+			if strings.HasPrefix(jsonIn, "@") {
+				var jsonBytes []byte
+				fname := jsonIn[1:]
 				if fname == "-" {
-					// Reading from stdin.
-					if _, err := fmt.Scanln(&jsonIn); err != nil {
-						return err
-					}
+					jsonBytes, err = io.ReadAll(os.Stdin)
 				} else {
-					jsonBytes, err := os.ReadFile(fname)
-					if err != nil {
-						return err
-					}
-					jsonIn = string(jsonBytes)
+					jsonBytes, err = os.ReadFile(fname)
+				}
+				if err != nil {
+					return err
 				}
+				jsonIn = string(jsonBytes)
 			}
 			msgs, err := types.UnmarshalMessagesJSON(jsonIn)
 			if err != nil {
@@ -92,7 +98,14 @@ func GetCmdDeliver() *cobra.Command {
 // InstallBundle message in a transaction.
 func GetCmdInstallBundle() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:  "install-bundle <JSON>/@<FILE>/-",
+		Use:   "install-bundle {<bundle JSON> | @- | @<file>}",
+		Short: "install a bundle",
+		Long: `install a bundle.
+The argument indicates how to read input JSON ("@-" for standard input,
+"@..." for a file path, and otherwise directly as in
+"install-bundle '{...}'").
+Input should be endoZipBase64 JSON, but this is not verified.
+https://github.com/endojs/endo/tree/master/packages/bundle-source`,
 		Args: cobra.ExactArgs(1),
 
 		RunE: func(cmd *cobra.Command, args []string) error {
@@ -102,20 +115,18 @@ func GetCmdInstallBundle() *cobra.Command {
 			}
 
 			jsonIn := args[0]
-			if jsonIn[0] == '@' {
-				fname := args[0][1:]
+			if strings.HasPrefix(jsonIn, "@") {
+				var jsonBytes []byte
+				fname := jsonIn[1:]
 				if fname == "-" {
-					// Reading from stdin.
-					if _, err := fmt.Scanln(&jsonIn); err != nil {
-						return err
-					}
+					jsonBytes, err = io.ReadAll(os.Stdin)
 				} else {
-					jsonBytes, err := os.ReadFile(fname)
-					if err != nil {
-						return err
-					}
-					jsonIn = string(jsonBytes)
+					jsonBytes, err = os.ReadFile(fname)
 				}
+				if err != nil {
+					return err
+				}
+				jsonIn = string(jsonBytes)
 			}
 
 			msg := types.NewMsgInstallBundle(jsonIn, cctx.GetFromAddress())
@@ -150,7 +161,7 @@ func GetCmdInstallBundle() *cobra.Command {
 // GetCmdProvision is the CLI command for sending a Provision transaction
 func GetCmdProvisionOne() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "provision-one [nickname] [address] [power-flags]",
+		Use:   "provision-one <nickname> <address> [<power-flag>[,...]]",
 		Short: "provision a single address",
 		Args:  cobra.RangeArgs(2, 3),
 
@@ -160,6 +171,8 @@ func GetCmdProvisionOne() *cobra.Command {
 				return err
 			}
 
+			nickname := args[0]
+
 			addr, err := sdk.AccAddressFromBech32(args[1])
 			if err != nil {
 				return err
@@ -170,7 +183,7 @@ func GetCmdProvisionOne() *cobra.Command {
 				powerFlags = strings.Split(args[2], ",")
 			}
 
-			msg := types.NewMsgProvision(args[0], addr, powerFlags, cctx.GetFromAddress())
+			msg := types.NewMsgProvision(nickname, addr, powerFlags, cctx.GetFromAddress())
 			if err := msg.ValidateBasic(); err != nil {
 				return err
 			}
@@ -186,7 +199,7 @@ func GetCmdProvisionOne() *cobra.Command {
 // GetCmdWalletAction is the CLI command for sending a WalletAction or WalletSpendAction transaction
 func GetCmdWalletAction() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "wallet-action [json string]",
+		Use:   "wallet-action <action JSON>",
 		Short: "perform a wallet action",
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
@@ -221,16 +234,18 @@ func GetCmdWalletAction() *cobra.Command {
 	return cmd
 }
 
+// NewCmdSubmitCoreEvalProposal is the CLI command for submitting a "CoreEval"
+// governance proposal via `agd tx gov submit-proposal swingset-core-eval ...`.
 func NewCmdSubmitCoreEvalProposal() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "swingset-core-eval [[permit.json] [code.js]]...",
+		Use:   "swingset-core-eval <permit.json code.js>...",
 		Args:  cobra.MinimumNArgs(2),
 		Short: "Submit a proposal to evaluate code in the SwingSet core",
 		Long: `Submit a SwingSet evaluate core Compartment code proposal along with an initial deposit.
 Specify at least one pair of permit.json and code.js files`,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if len(args)%2 != 0 {
-				return fmt.Errorf("must specify an even number of permit.json and code.js files")
+				return fmt.Errorf("must specify paired permit.json and code.js files")
 			}
 
 			clientCtx, err := client.GetClientTxContext(cmd)
@@ -287,7 +302,7 @@ Specify at least one pair of permit.json and code.js files`,
 				return err
 			}
 
-			msg, err := govtypes.NewMsgSubmitProposal(content, deposit, from)
+			msg, err := govv1beta1.NewMsgSubmitProposal(content, deposit, from)
 			if err != nil {
 				return err
 			}

package/x/swingset/client/proposal_handler.go

@@ -1,25 +1,10 @@
 package client
 
 import (
-	"net/http"
-
-	"github.com/cosmos/cosmos-sdk/client"
-	"github.com/cosmos/cosmos-sdk/types/rest"
-	govclient "github.com/cosmos/cosmos-sdk/x/gov/client"
-	govrest "github.com/cosmos/cosmos-sdk/x/gov/client/rest"
-
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/swingset/client/cli"
+	govclient "github.com/cosmos/cosmos-sdk/x/gov/client"
 )
 
 var (
-	CoreEvalProposalHandler = govclient.NewProposalHandler(cli.NewCmdSubmitCoreEvalProposal, emptyRestHandler)
+	CoreEvalProposalHandler = govclient.NewProposalHandler(cli.NewCmdSubmitCoreEvalProposal)
 )
-
-func emptyRestHandler(client.Context) govrest.ProposalRESTHandler {
-	return govrest.ProposalRESTHandler{
-		SubRoute: "unsupported-swingset",
-		Handler: func(w http.ResponseWriter, r *http.Request) {
-			rest.WriteErrorResponse(w, http.StatusBadRequest, "Legacy REST Routes are not supported for SwingSet proposals")
-		},
-	}
-}