@agoric/cosmos 0.34.2-dev-3c8aafe.0 → 0.34.2-dev-74fbe43.0.74fbe43

package/x/swingset/testutil/mocks.go

@@ -0,0 +1,379 @@
+// Code generated by MockGen. DO NOT EDIT.
+// Source: x/swingset/types/expected_keepers.go
+//
+// Generated by this command:
+//
+//	mockgen -source=x/swingset/types/expected_keepers.go -package testutil -destination x/swingset/testutil/mocks.go
+//
+
+// Package testutil is a generated GoMock package.
+package testutil
+
+import (
+	context "context"
+	reflect "reflect"
+
+	math "cosmossdk.io/math"
+	types "github.com/Agoric/agoric-sdk/golang/cosmos/types"
+	types0 "github.com/Agoric/agoric-sdk/golang/cosmos/x/swingset/types"
+	types1 "github.com/cosmos/cosmos-sdk/types"
+	gomock "go.uber.org/mock/gomock"
+)
+
+// MockAccountKeeper is a mock of AccountKeeper interface.
+type MockAccountKeeper struct {
+	ctrl     *gomock.Controller
+	recorder *MockAccountKeeperMockRecorder
+	isgomock struct{}
+}
+
+// MockAccountKeeperMockRecorder is the mock recorder for MockAccountKeeper.
+type MockAccountKeeperMockRecorder struct {
+	mock *MockAccountKeeper
+}
+
+// NewMockAccountKeeper creates a new mock instance.
+func NewMockAccountKeeper(ctrl *gomock.Controller) *MockAccountKeeper {
+	mock := &MockAccountKeeper{ctrl: ctrl}
+	mock.recorder = &MockAccountKeeperMockRecorder{mock}
+	return mock
+}
+
+// EXPECT returns an object that allows the caller to indicate expected use.
+func (m *MockAccountKeeper) EXPECT() *MockAccountKeeperMockRecorder {
+	return m.recorder
+}
+
+// GetAccount mocks base method.
+func (m *MockAccountKeeper) GetAccount(ctx context.Context, addr types1.AccAddress) types1.AccountI {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "GetAccount", ctx, addr)
+	ret0, _ := ret[0].(types1.AccountI)
+	return ret0
+}
+
+// GetAccount indicates an expected call of GetAccount.
+func (mr *MockAccountKeeperMockRecorder) GetAccount(ctx, addr any) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAccount", reflect.TypeOf((*MockAccountKeeper)(nil).GetAccount), ctx, addr)
+}
+
+// NewAccountWithAddress mocks base method.
+func (m *MockAccountKeeper) NewAccountWithAddress(ctx context.Context, addr types1.AccAddress) types1.AccountI {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "NewAccountWithAddress", ctx, addr)
+	ret0, _ := ret[0].(types1.AccountI)
+	return ret0
+}
+
+// NewAccountWithAddress indicates an expected call of NewAccountWithAddress.
+func (mr *MockAccountKeeperMockRecorder) NewAccountWithAddress(ctx, addr any) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewAccountWithAddress", reflect.TypeOf((*MockAccountKeeper)(nil).NewAccountWithAddress), ctx, addr)
+}
+
+// SetAccount mocks base method.
+func (m *MockAccountKeeper) SetAccount(ctx context.Context, acc types1.AccountI) {
+	m.ctrl.T.Helper()
+	m.ctrl.Call(m, "SetAccount", ctx, acc)
+}
+
+// SetAccount indicates an expected call of SetAccount.
+func (mr *MockAccountKeeperMockRecorder) SetAccount(ctx, acc any) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetAccount", reflect.TypeOf((*MockAccountKeeper)(nil).SetAccount), ctx, acc)
+}
+
+// MockBankKeeper is a mock of BankKeeper interface.
+type MockBankKeeper struct {
+	ctrl     *gomock.Controller
+	recorder *MockBankKeeperMockRecorder
+	isgomock struct{}
+}
+
+// MockBankKeeperMockRecorder is the mock recorder for MockBankKeeper.
+type MockBankKeeperMockRecorder struct {
+	mock *MockBankKeeper
+}
+
+// NewMockBankKeeper creates a new mock instance.
+func NewMockBankKeeper(ctrl *gomock.Controller) *MockBankKeeper {
+	mock := &MockBankKeeper{ctrl: ctrl}
+	mock.recorder = &MockBankKeeperMockRecorder{mock}
+	return mock
+}
+
+// EXPECT returns an object that allows the caller to indicate expected use.
+func (m *MockBankKeeper) EXPECT() *MockBankKeeperMockRecorder {
+	return m.recorder
+}
+
+// GetAllBalances mocks base method.
+func (m *MockBankKeeper) GetAllBalances(ctx context.Context, addr types1.AccAddress) types1.Coins {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "GetAllBalances", ctx, addr)
+	ret0, _ := ret[0].(types1.Coins)
+	return ret0
+}
+
+// GetAllBalances indicates an expected call of GetAllBalances.
+func (mr *MockBankKeeperMockRecorder) GetAllBalances(ctx, addr any) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAllBalances", reflect.TypeOf((*MockBankKeeper)(nil).GetAllBalances), ctx, addr)
+}
+
+// SendCoinsFromAccountToModule mocks base method.
+func (m *MockBankKeeper) SendCoinsFromAccountToModule(ctx context.Context, senderAddr types1.AccAddress, recipientModule string, amt types1.Coins) error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "SendCoinsFromAccountToModule", ctx, senderAddr, recipientModule, amt)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// SendCoinsFromAccountToModule indicates an expected call of SendCoinsFromAccountToModule.
+func (mr *MockBankKeeperMockRecorder) SendCoinsFromAccountToModule(ctx, senderAddr, recipientModule, amt any) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SendCoinsFromAccountToModule", reflect.TypeOf((*MockBankKeeper)(nil).SendCoinsFromAccountToModule), ctx, senderAddr, recipientModule, amt)
+}
+
+// MockVstorageKeeper is a mock of VstorageKeeper interface.
+type MockVstorageKeeper struct {
+	ctrl     *gomock.Controller
+	recorder *MockVstorageKeeperMockRecorder
+	isgomock struct{}
+}
+
+// MockVstorageKeeperMockRecorder is the mock recorder for MockVstorageKeeper.
+type MockVstorageKeeperMockRecorder struct {
+	mock *MockVstorageKeeper
+}
+
+// NewMockVstorageKeeper creates a new mock instance.
+func NewMockVstorageKeeper(ctrl *gomock.Controller) *MockVstorageKeeper {
+	mock := &MockVstorageKeeper{ctrl: ctrl}
+	mock.recorder = &MockVstorageKeeperMockRecorder{mock}
+	return mock
+}
+
+// EXPECT returns an object that allows the caller to indicate expected use.
+func (m *MockVstorageKeeper) EXPECT() *MockVstorageKeeperMockRecorder {
+	return m.recorder
+}
+
+// GetChildren mocks base method.
+func (m *MockVstorageKeeper) GetChildren(ctx types1.Context, path string) []string {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "GetChildren", ctx, path)
+	ret0, _ := ret[0].([]string)
+	return ret0
+}
+
+// GetChildren indicates an expected call of GetChildren.
+func (mr *MockVstorageKeeperMockRecorder) GetChildren(ctx, path any) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetChildren", reflect.TypeOf((*MockVstorageKeeper)(nil).GetChildren), ctx, path)
+}
+
+// GetEntry mocks base method.
+func (m *MockVstorageKeeper) GetEntry(ctx types1.Context, path string) types.KVEntry {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "GetEntry", ctx, path)
+	ret0, _ := ret[0].(types.KVEntry)
+	return ret0
+}
+
+// GetEntry indicates an expected call of GetEntry.
+func (mr *MockVstorageKeeperMockRecorder) GetEntry(ctx, path any) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetEntry", reflect.TypeOf((*MockVstorageKeeper)(nil).GetEntry), ctx, path)
+}
+
+// GetQueueLength mocks base method.
+func (m *MockVstorageKeeper) GetQueueLength(ctx types1.Context, path string) (math.Int, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "GetQueueLength", ctx, path)
+	ret0, _ := ret[0].(math.Int)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// GetQueueLength indicates an expected call of GetQueueLength.
+func (mr *MockVstorageKeeperMockRecorder) GetQueueLength(ctx, path any) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetQueueLength", reflect.TypeOf((*MockVstorageKeeper)(nil).GetQueueLength), ctx, path)
+}
+
+// GetStoreName mocks base method.
+func (m *MockVstorageKeeper) GetStoreName() string {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "GetStoreName")
+	ret0, _ := ret[0].(string)
+	return ret0
+}
+
+// GetStoreName indicates an expected call of GetStoreName.
+func (mr *MockVstorageKeeperMockRecorder) GetStoreName() *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetStoreName", reflect.TypeOf((*MockVstorageKeeper)(nil).GetStoreName))
+}
+
+// HasEntry mocks base method.
+func (m *MockVstorageKeeper) HasEntry(ctx types1.Context, path string) bool {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "HasEntry", ctx, path)
+	ret0, _ := ret[0].(bool)
+	return ret0
+}
+
+// HasEntry indicates an expected call of HasEntry.
+func (mr *MockVstorageKeeperMockRecorder) HasEntry(ctx, path any) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HasEntry", reflect.TypeOf((*MockVstorageKeeper)(nil).HasEntry), ctx, path)
+}
+
+// LegacySetStorageAndNotify mocks base method.
+func (m *MockVstorageKeeper) LegacySetStorageAndNotify(ctx types1.Context, entry types.KVEntry) {
+	m.ctrl.T.Helper()
+	m.ctrl.Call(m, "LegacySetStorageAndNotify", ctx, entry)
+}
+
+// LegacySetStorageAndNotify indicates an expected call of LegacySetStorageAndNotify.
+func (mr *MockVstorageKeeperMockRecorder) LegacySetStorageAndNotify(ctx, entry any) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LegacySetStorageAndNotify", reflect.TypeOf((*MockVstorageKeeper)(nil).LegacySetStorageAndNotify), ctx, entry)
+}
+
+// PathToEncodedKey mocks base method.
+func (m *MockVstorageKeeper) PathToEncodedKey(path string) []byte {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "PathToEncodedKey", path)
+	ret0, _ := ret[0].([]byte)
+	return ret0
+}
+
+// PathToEncodedKey indicates an expected call of PathToEncodedKey.
+func (mr *MockVstorageKeeperMockRecorder) PathToEncodedKey(path any) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PathToEncodedKey", reflect.TypeOf((*MockVstorageKeeper)(nil).PathToEncodedKey), path)
+}
+
+// PushQueueItem mocks base method.
+func (m *MockVstorageKeeper) PushQueueItem(ctx types1.Context, path, value string) error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "PushQueueItem", ctx, path, value)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// PushQueueItem indicates an expected call of PushQueueItem.
+func (mr *MockVstorageKeeperMockRecorder) PushQueueItem(ctx, path, value any) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PushQueueItem", reflect.TypeOf((*MockVstorageKeeper)(nil).PushQueueItem), ctx, path, value)
+}
+
+// SetStorage mocks base method.
+func (m *MockVstorageKeeper) SetStorage(ctx types1.Context, entry types.KVEntry) {
+	m.ctrl.T.Helper()
+	m.ctrl.Call(m, "SetStorage", ctx, entry)
+}
+
+// SetStorage indicates an expected call of SetStorage.
+func (mr *MockVstorageKeeperMockRecorder) SetStorage(ctx, entry any) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetStorage", reflect.TypeOf((*MockVstorageKeeper)(nil).SetStorage), ctx, entry)
+}
+
+// MockSwingSetKeeper is a mock of SwingSetKeeper interface.
+type MockSwingSetKeeper struct {
+	ctrl     *gomock.Controller
+	recorder *MockSwingSetKeeperMockRecorder
+	isgomock struct{}
+}
+
+// MockSwingSetKeeperMockRecorder is the mock recorder for MockSwingSetKeeper.
+type MockSwingSetKeeperMockRecorder struct {
+	mock *MockSwingSetKeeper
+}
+
+// NewMockSwingSetKeeper creates a new mock instance.
+func NewMockSwingSetKeeper(ctrl *gomock.Controller) *MockSwingSetKeeper {
+	mock := &MockSwingSetKeeper{ctrl: ctrl}
+	mock.recorder = &MockSwingSetKeeperMockRecorder{mock}
+	return mock
+}
+
+// EXPECT returns an object that allows the caller to indicate expected use.
+func (m *MockSwingSetKeeper) EXPECT() *MockSwingSetKeeperMockRecorder {
+	return m.recorder
+}
+
+// ChargeBeans mocks base method.
+func (m *MockSwingSetKeeper) ChargeBeans(ctx types1.Context, beansPerUnit map[string]math.Uint, addr types1.AccAddress, beans math.Uint) error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "ChargeBeans", ctx, beansPerUnit, addr, beans)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// ChargeBeans indicates an expected call of ChargeBeans.
+func (mr *MockSwingSetKeeperMockRecorder) ChargeBeans(ctx, beansPerUnit, addr, beans any) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ChargeBeans", reflect.TypeOf((*MockSwingSetKeeper)(nil).ChargeBeans), ctx, beansPerUnit, addr, beans)
+}
+
+// ChargeForSmartWallet mocks base method.
+func (m *MockSwingSetKeeper) ChargeForSmartWallet(ctx types1.Context, beansPerUnit map[string]math.Uint, addr types1.AccAddress) error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "ChargeForSmartWallet", ctx, beansPerUnit, addr)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// ChargeForSmartWallet indicates an expected call of ChargeForSmartWallet.
+func (mr *MockSwingSetKeeperMockRecorder) ChargeForSmartWallet(ctx, beansPerUnit, addr any) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ChargeForSmartWallet", reflect.TypeOf((*MockSwingSetKeeper)(nil).ChargeForSmartWallet), ctx, beansPerUnit, addr)
+}
+
+// GetBeansPerUnit mocks base method.
+func (m *MockSwingSetKeeper) GetBeansPerUnit(ctx types1.Context) map[string]math.Uint {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "GetBeansPerUnit", ctx)
+	ret0, _ := ret[0].(map[string]math.Uint)
+	return ret0
+}
+
+// GetBeansPerUnit indicates an expected call of GetBeansPerUnit.
+func (mr *MockSwingSetKeeperMockRecorder) GetBeansPerUnit(ctx any) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBeansPerUnit", reflect.TypeOf((*MockSwingSetKeeper)(nil).GetBeansPerUnit), ctx)
+}
+
+// GetSmartWalletState mocks base method.
+func (m *MockSwingSetKeeper) GetSmartWalletState(ctx types1.Context, addr types1.AccAddress) types0.SmartWalletState {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "GetSmartWalletState", ctx, addr)
+	ret0, _ := ret[0].(types0.SmartWalletState)
+	return ret0
+}
+
+// GetSmartWalletState indicates an expected call of GetSmartWalletState.
+func (mr *MockSwingSetKeeperMockRecorder) GetSmartWalletState(ctx, addr any) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetSmartWalletState", reflect.TypeOf((*MockSwingSetKeeper)(nil).GetSmartWalletState), ctx, addr)
+}
+
+// IsHighPriorityAddress mocks base method.
+func (m *MockSwingSetKeeper) IsHighPriorityAddress(ctx types1.Context, addr types1.AccAddress) (bool, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "IsHighPriorityAddress", ctx, addr)
+	ret0, _ := ret[0].(bool)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// IsHighPriorityAddress indicates an expected call of IsHighPriorityAddress.
+func (mr *MockSwingSetKeeperMockRecorder) IsHighPriorityAddress(ctx, addr any) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsHighPriorityAddress", reflect.TypeOf((*MockSwingSetKeeper)(nil).IsHighPriorityAddress), ctx, addr)
+}

package/x/swingset/types/codec.go

@@ -2,6 +2,7 @@ package types
 
 import (
 	"github.com/cosmos/cosmos-sdk/codec"
+	"github.com/cosmos/cosmos-sdk/codec/legacy"
 	cdctypes "github.com/cosmos/cosmos-sdk/codec/types"
 	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -29,10 +30,12 @@ func init() {
 
 // RegisterCodec registers concrete types on the Amino codec
 func RegisterCodec(cdc *codec.LegacyAmino) {
-	cdc.RegisterConcrete(&MsgDeliverInbound{}, ModuleName+"/DeliverInbound", nil)
-	cdc.RegisterConcrete(&MsgProvision{}, ModuleName+"/Provision", nil)
-	cdc.RegisterConcrete(&MsgWalletAction{}, ModuleName+"/WalletAction", nil)
-	cdc.RegisterConcrete(&MsgWalletSpendAction{}, ModuleName+"/WalletSpendAction", nil)
+	legacy.RegisterAminoMsg(cdc, &MsgDeliverInbound{}, ModuleName+"/DeliverInbound")
+	legacy.RegisterAminoMsg(cdc, &MsgProvision{}, ModuleName+"/Provision")
+	legacy.RegisterAminoMsg(cdc, &MsgWalletAction{}, ModuleName+"/WalletAction")
+	legacy.RegisterAminoMsg(cdc, &MsgWalletSpendAction{}, ModuleName+"/WalletSpendAction")
+	legacy.RegisterAminoMsg(cdc, &MsgInstallBundle{}, ModuleName+"/InstallBundle")
+	cdc.RegisterConcrete(&CoreEvalProposal{}, ModuleName+"/CoreEvalProposal", nil)
 }
 
 // RegisterInterfaces registers the x/swingset interfaces types with the interface registry
@@ -42,8 +45,10 @@ func RegisterInterfaces(registry cdctypes.InterfaceRegistry) {
 		&MsgProvision{},
 		&MsgWalletAction{},
 		&MsgWalletSpendAction{},
+		&MsgInstallBundle{},
 	)
-	registry.RegisterImplementations(
+	registry.RegisterInterface(
+		"cosmos.gov.v1beta1.Content",
 		(*govv1beta1.Content)(nil),
 		&CoreEvalProposal{},
 	)

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

@@ -1,6 +1,7 @@
 package types
 
 import (
+	sdkmath "cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
@@ -43,15 +44,15 @@ const (
 )
 
 var (
-	DefaultBeansPerXsnapComputron = sdk.NewUint(100)
+	DefaultBeansPerXsnapComputron = sdkmath.NewUint(100)
 
 	// DefaultBeansPerBlockComputeLimit is how many computron beans we allow
 	// before starting a new block.  Some analysis (#3459) suggests this leads to
 	// about 2/3rds utilization, based on 5 sec voting time and up to 10 sec of
 	// computation.
-	DefaultBeansPerBlockComputeLimit = sdk.NewUint(8000000).Mul(DefaultBeansPerXsnapComputron)
+	DefaultBeansPerBlockComputeLimit = sdkmath.NewUint(8000000).Mul(DefaultBeansPerXsnapComputron)
 	// observed: 0.385 sec
-	DefaultBeansPerVatCreation = sdk.NewUint(300000).Mul(DefaultBeansPerXsnapComputron)
+	DefaultBeansPerVatCreation = sdkmath.NewUint(300000).Mul(DefaultBeansPerXsnapComputron)
 
 	// Fees are represented as integer "beans", where each bean is a uniform
 	// fraction of this `fee_unit_price` as controlled by the below
@@ -63,14 +64,14 @@ var (
 	// Larger numbers make for smaller beans, and we expect values to be rather
 	// large for representing fees precisely in beans that each approximate
 	// a "picoUSD"--one trillionth of a USD.
-	DefaultBeansPerFeeUnit = sdk.NewUint(1_000_000_000_000) // 1e12 (assumes $1 per BLD)
+	DefaultBeansPerFeeUnit = sdkmath.NewUint(1_000_000_000_000) // 1e12 (assumes $1 per BLD)
 
-	DefaultBeansPerInboundTx            = DefaultBeansPerFeeUnit.Quo(sdk.NewUint(100))    //  10e09, ~$0.01
-	DefaultBeansPerMessage              = DefaultBeansPerFeeUnit.Quo(sdk.NewUint(1_000))  //   1e09, ~$0.001
-	DefaultBeansPerMessageByte          = DefaultBeansPerFeeUnit.Quo(sdk.NewUint(50_000)) //  20e06, ~$0.00002
-	DefaultBeansPerMinFeeDebit          = DefaultBeansPerFeeUnit.Quo(sdk.NewUint(5))      // 200e09, ~$0.2
-	DefaultBeansPerStorageByte          = DefaultBeansPerFeeUnit.Quo(sdk.NewUint(500))    //   2e09, ~$0.002
-	DefaultBeansPerSmartWalletProvision = DefaultBeansPerFeeUnit                          //   1e12, ~$1
+	DefaultBeansPerInboundTx            = DefaultBeansPerFeeUnit.Quo(sdkmath.NewUint(100))    //  10e09, ~$0.01
+	DefaultBeansPerMessage              = DefaultBeansPerFeeUnit.Quo(sdkmath.NewUint(1_000))  //   1e09, ~$0.001
+	DefaultBeansPerMessageByte          = DefaultBeansPerFeeUnit.Quo(sdkmath.NewUint(50_000)) //  20e06, ~$0.00002
+	DefaultBeansPerMinFeeDebit          = DefaultBeansPerFeeUnit.Quo(sdkmath.NewUint(5))      // 200e09, ~$0.2
+	DefaultBeansPerStorageByte          = DefaultBeansPerFeeUnit.Quo(sdkmath.NewUint(500))    //   2e09, ~$0.002
+	DefaultBeansPerSmartWalletProvision = DefaultBeansPerFeeUnit                              //   1e12, ~$1
 
 	DefaultBootstrapVatConfig = "@agoric/vm-config/decentral-core-config.json"
 
@@ -83,11 +84,11 @@ var (
 		NewQueueSize(QueueInbound, DefaultInboundQueueMax),
 	}
 
-	DefaultVatCleanupDefault = sdk.NewUint(5)
+	DefaultVatCleanupDefault = sdkmath.NewUint(5)
 	// DefaultVatCleanupExports     = DefaultVatCleanupDefault
 	// DefaultVatCleanupImports     = DefaultVatCleanupDefault
 	// DefaultVatCleanupPromises    = DefaultVatCleanupDefault
-	DefaultVatCleanupKv = sdk.NewUint(50)
+	DefaultVatCleanupKv = sdkmath.NewUint(50)
 	// DefaultVatCleanupSnapshots   = DefaultVatCleanupDefault
 	// DefaultVatCleanupTranscripts = DefaultVatCleanupDefault
 	DefaultVatCleanupBudget = []UintMapEntry{

package/x/swingset/types/expected_keepers.go

@@ -1,9 +1,14 @@
+//go:generate mockgen -source=expected_keepers.go -destination=../testutil/mocks.go -package=testutil
+
 package types
 
 import (
+	"context"
+
 	sdkmath "cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
+
+	agoric "github.com/Agoric/agoric-sdk/golang/cosmos/types"
 )
 
 type SmartWalletState uint8
@@ -15,10 +20,30 @@ const (
 	SmartWalletStateProvisioned
 )
 
+// AccountKeeper defines the expected interface for the auth module keeper
 type AccountKeeper interface {
-	GetAccount(ctx sdk.Context, addr sdk.AccAddress) authtypes.AccountI
-	NewAccountWithAddress(ctx sdk.Context, addr sdk.AccAddress) authtypes.AccountI
-	SetAccount(ctx sdk.Context, acc authtypes.AccountI)
+	GetAccount(ctx context.Context, addr sdk.AccAddress) sdk.AccountI
+	NewAccountWithAddress(ctx context.Context, addr sdk.AccAddress) sdk.AccountI
+	SetAccount(ctx context.Context, acc sdk.AccountI)
+}
+
+// BankKeeper defines the expected interface for the bank module keeper
+type BankKeeper interface {
+	GetAllBalances(ctx context.Context, addr sdk.AccAddress) sdk.Coins
+	SendCoinsFromAccountToModule(ctx context.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins) error
+}
+
+// VstorageKeeper defines the expected interface for the vstorage module keeper
+type VstorageKeeper interface {
+	PushQueueItem(ctx sdk.Context, path string, value string) error
+	HasEntry(ctx sdk.Context, path string) bool
+	GetQueueLength(ctx sdk.Context, path string) (sdkmath.Int, error)
+	GetEntry(ctx sdk.Context, path string) agoric.KVEntry
+	SetStorage(ctx sdk.Context, entry agoric.KVEntry)
+	LegacySetStorageAndNotify(ctx sdk.Context, entry agoric.KVEntry)
+	PathToEncodedKey(path string) []byte
+	GetStoreName() string
+	GetChildren(ctx sdk.Context, path string) []string
 }
 
 type SwingSetKeeper interface {

package/x/swingset/types/msgs.go

@@ -9,11 +9,16 @@ import (
 
 	sdkioerrors "cosmossdk.io/errors"
 	sdkmath "cosmossdk.io/math"
+	"cosmossdk.io/x/tx/signing"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 
 	"github.com/Agoric/agoric-sdk/golang/cosmos/vm"
+
+	"google.golang.org/protobuf/proto"
+	"google.golang.org/protobuf/protoadapt"
+	"google.golang.org/protobuf/reflect/protoreflect"
 )
 
 const RouterKey = ModuleName // this was defined in your key.go file
@@ -24,6 +29,7 @@ var (
 	_ sdk.Msg = &MsgInstallBundle{}
 	_ sdk.Msg = &MsgWalletAction{}
 	_ sdk.Msg = &MsgWalletSpendAction{}
+	_ sdk.Msg = &MsgCoreEval{}
 
 	_ vm.ControllerAdmissionMsg = &MsgDeliverInbound{}
 	_ vm.ControllerAdmissionMsg = &MsgInstallBundle{}
@@ -32,6 +38,42 @@ var (
 	_ vm.ControllerAdmissionMsg = &MsgWalletSpendAction{}
 )
 
+// Replacing msg.GetSigners() but before we can adopt AddressString.
+// https://github.com/cosmos/cosmos-sdk/issues/20077#issuecomment-2062601533
+func createSignerFieldFunc(fieldName protoreflect.Name) signing.GetSignersFunc {
+	return func(msgIn proto.Message) ([][]byte, error) {
+		msg := msgIn.ProtoReflect()
+		if !msg.Has(msg.Descriptor().Fields().ByName(fieldName)) {
+			return nil, sdkioerrors.Wrapf(sdkerrors.ErrInvalidRequest, "message %T does not have field %s", msgIn, fieldName)
+		}
+		addr := msg.Get(msg.Descriptor().Fields().ByName(fieldName)).Interface().([]byte)
+		return [][]byte{addr}, nil
+	}
+}
+
+func DefineCustomGetSigners(options *signing.Options) {
+	options.DefineCustomGetSigners(
+		proto.MessageName(protoadapt.MessageV2Of(&MsgDeliverInbound{})),
+		createSignerFieldFunc("submitter"),
+	)
+	options.DefineCustomGetSigners(
+		proto.MessageName(protoadapt.MessageV2Of(&MsgProvision{})),
+		createSignerFieldFunc("submitter"),
+	)
+	options.DefineCustomGetSigners(
+		proto.MessageName(protoadapt.MessageV2Of(&MsgInstallBundle{})),
+		createSignerFieldFunc("submitter"),
+	)
+	options.DefineCustomGetSigners(
+		proto.MessageName(protoadapt.MessageV2Of(&MsgWalletAction{})),
+		createSignerFieldFunc("owner"),
+	)
+	options.DefineCustomGetSigners(
+		proto.MessageName(protoadapt.MessageV2Of(&MsgWalletSpendAction{})),
+		createSignerFieldFunc("owner"),
+	)
+}
+
 // Contextual information about the message source of an action on an inbound queue.
 // This context should be unique per inboundQueueRecord.
 type ActionContext struct {
@@ -46,6 +88,7 @@ type ActionContext struct {
 	// 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"`
@@ -172,18 +215,6 @@ func (msg MsgDeliverInbound) ValidateBasic() error {
 	return nil
 }
 
-// GetSignBytes encodes the message for signing
-func (msg MsgDeliverInbound) GetSignBytes() []byte {
-	// FIXME: This compensates for Amino maybe returning nil instead of empty slices.
-	if msg.Messages == nil {
-		msg.Messages = []string{}
-	}
-	if msg.Nums == nil {
-		msg.Nums = []uint64{}
-	}
-	return sdk.MustSortJSON(ModuleAminoCdc.MustMarshalJSON(&msg))
-}
-
 // GetSigners defines whose signature is required
 func (msg MsgDeliverInbound) GetSigners() []sdk.AccAddress {
 	return []sdk.AccAddress{msg.Submitter}
@@ -222,32 +253,17 @@ func (msg MsgWalletAction) IsHighPriority(ctx sdk.Context, data interface{}) (bo
 	return false, nil
 }
 
+// GetSigners defines whose signature is required
 func (msg MsgWalletAction) GetSigners() []sdk.AccAddress {
 	return []sdk.AccAddress{msg.Owner}
 }
 
-// GetSignBytes encodes the message for signing
-func (msg MsgWalletAction) GetSignBytes() []byte {
-	return sdk.MustSortJSON(ModuleAminoCdc.MustMarshalJSON(&msg))
-}
-
 // Route should return the name of the module
 func (msg MsgWalletAction) Route() string { return RouterKey }
 
 // Type should return the action
 func (msg MsgWalletAction) Type() string { return "wallet_action" }
 
-// Route should return the name of the module
-func (msg MsgWalletSpendAction) Route() string { return RouterKey }
-
-// Type should return the action
-func (msg MsgWalletSpendAction) Type() string { return "wallet_spend_action" }
-
-// GetSignBytes encodes the message for signing
-func (msg MsgWalletSpendAction) GetSignBytes() []byte {
-	return sdk.MustSortJSON(ModuleAminoCdc.MustMarshalJSON(&msg))
-}
-
 // ValidateBasic runs stateless checks on the message
 func (msg MsgWalletAction) ValidateBasic() error {
 	if msg.Owner.Empty() {
@@ -300,10 +316,17 @@ func (msg MsgWalletSpendAction) IsHighPriority(ctx sdk.Context, data interface{}
 	return keeper.IsHighPriorityAddress(ctx, msg.Owner)
 }
 
+// GetSigners defines whose signature is required
 func (msg MsgWalletSpendAction) GetSigners() []sdk.AccAddress {
 	return []sdk.AccAddress{msg.Owner}
 }
 
+// Route should return the name of the module
+func (msg MsgWalletSpendAction) Route() string { return RouterKey }
+
+// Type should return the action
+func (msg MsgWalletSpendAction) Type() string { return "wallet_spend_action" }
+
 // ValidateBasic runs stateless checks on the message
 func (msg MsgWalletSpendAction) ValidateBasic() error {
 	if msg.Owner.Empty() {
@@ -368,14 +391,6 @@ func (msg MsgProvision) IsHighPriority(ctx sdk.Context, data interface{}) (bool,
 	return false, nil
 }
 
-// GetSignBytes encodes the message for signing
-func (msg MsgProvision) GetSignBytes() []byte {
-	if msg.PowerFlags == nil {
-		msg.PowerFlags = []string{}
-	}
-	return sdk.MustSortJSON(ModuleAminoCdc.MustMarshalJSON(&msg))
-}
-
 // GetSigners defines whose signature is required
 func (msg MsgProvision) GetSigners() []sdk.AccAddress {
 	return []sdk.AccAddress{msg.Submitter}