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

package/x/vbank/module.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	stdlog "log"
 
+	"cosmossdk.io/core/appmodule"
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/spf13/cobra"
 
@@ -17,21 +18,27 @@ import (
 	cdctypes "github.com/cosmos/cosmos-sdk/codec/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 
-	abci "github.com/cometbft/cometbft/abci/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 )
 
 // type check to ensure the interface is properly implemented
 var (
-	_ module.AppModule      = AppModule{}
-	_ module.AppModuleBasic = AppModuleBasic{}
+	_ module.AppModule        = AppModule{}
+	_ module.AppModuleBasic   = AppModuleBasic{}
+	_ module.HasGenesis       = AppModule{}
+	_ appmodule.HasEndBlocker = AppModule{}
 )
 
 // app module Basics object
 type AppModuleBasic struct {
 }
 
+// IsAppModule implements the appmodule.AppModule interface.
+func (am AppModule) IsAppModule() {}
+
+// IsOnePerModuleType is a marker function just indicates that this is a one-per-module type.
+func (am AppModule) IsOnePerModuleType() {}
+
 func (AppModuleBasic) Name() string {
 	return ModuleName
 }
@@ -93,90 +100,52 @@ func (AppModule) Name() string {
 
 func (AppModule) ConsensusVersion() uint64 { return 2 }
 
-// BeginBlock implements the AppModule interface
-func (am AppModule) BeginBlock(ctx sdk.Context, req abci.RequestBeginBlock) {
-}
-
 // EndBlock implements the AppModule interface
-func (am AppModule) EndBlock(ctx sdk.Context, req abci.RequestEndBlock) []abci.ValidatorUpdate {
-	events := ctx.EventManager().GetABCIEventHistory()
-	addressToUpdate := make(map[string]sdk.Coins, len(events)*2)
-
-	// records that we want to emit an balance update for the address
-	// for the given denoms. We use the Coins only to track the set of
-	// denoms, not for the amounts.
-	ensureAddressUpdate := func(address string, denoms sdk.Coins) {
-		if denoms.IsZero() {
-			return
-		}
-		currentDenoms := sdk.NewCoins()
-		if coins, ok := addressToUpdate[address]; ok {
-			currentDenoms = coins
-		}
-		addressToUpdate[address] = currentDenoms.Add(denoms...)
-	}
-
-	/* Scan for all the events matching (taken from cosmos-sdk/x/bank/spec/04_events.md):
-
-	type: "coin_received"
-	  "receiver": {recipient address}
-	  "amount": {Coins string}
-	type: "coin_spent"
-	  "spender": {spender address}
-	  "amount": {Coins string}
-	*/
-NextEvent:
-	for _, event := range events {
-		switch event.Type {
-		case banktypes.EventTypeCoinReceived, banktypes.EventTypeCoinSpent:
-			var addr string
-			denoms := sdk.NewCoins()
-			for _, attr := range event.GetAttributes() {
-				switch string(attr.GetKey()) {
-				case banktypes.AttributeKeyReceiver, banktypes.AttributeKeySpender:
-					addr = string(attr.GetValue())
-				case sdk.AttributeKeyAmount:
-					coins, err := sdk.ParseCoinsNormalized(string(attr.GetValue()))
-					if err != nil {
-						stdlog.Println("Cannot ensure vbank balance for", addr, err)
-						break NextEvent
-					}
-					denoms = coins
-				}
-			}
-			if addr != "" && !denoms.IsZero() {
-				ensureAddressUpdate(addr, denoms)
-			}
-		}
-	}
+func (am AppModule) EndBlock(ctx context.Context) error {
+	sdkCtx := sdk.UnwrapSDKContext(ctx)
 
-	// Prune the addressToUpdate map to only include module accounts.  We prune
+	// Prune the AddressToUpdate map to only include module accounts.  We prune
 	// only after recording and consolidating all account updates to minimize the
 	// number of account keeper queries.
-	unfilteredAddresses := addressToUpdate
-	addressToUpdate = make(map[string]sdk.Coins, len(addressToUpdate))
-	for addr, denoms := range unfilteredAddresses {
-		accAddr, err := sdk.AccAddressFromBech32(addr)
-		if err == nil && am.keeper.IsAllowedMonitoringAccount(ctx, accAddr) {
-			// Pass through the module account.
-			addressToUpdate[addr] = denoms
+	filteredAddresses := make(map[string]sdk.Coins, len(am.keeper.AddressToUpdate))
+	adStore := am.keeper.OpenAddressToUpdateStore(sdkCtx)
+	iterator := adStore.Iterator(nil, nil)
+	defer iterator.Close()
+	for ; iterator.Valid(); iterator.Next() {
+		addrBz := iterator.Key()
+		addr, err := am.keeper.AddressCodec().BytesToString(addrBz)
+		if err != nil {
+			return err
+		}
+		if am.keeper.IsAllowedMonitoringAccount(sdkCtx, addr) {
+			// We're committed to monitor this address, so parse the denoms.
+			denomsBz := iterator.Value()
+			denoms, err := sdk.ParseCoinsNormalized(string(denomsBz))
+			if err != nil {
+				return err
+			}
+			filteredAddresses[addr] = denoms
 		}
 	}
 
 	// Dump all the addressToBalances entries to SwingSet.
-	action := getBalanceUpdate(ctx, am.keeper, addressToUpdate)
+	action, err := getBalanceUpdate(sdkCtx, am.keeper, filteredAddresses)
+	if err != nil {
+		return err
+	}
 	if action != nil {
-		err := am.PushAction(ctx, action)
+		err := am.PushAction(sdkCtx, action)
 		if err != nil {
-			panic(err)
+			return err
 		}
 	}
 
-	if err := am.keeper.DistributeRewards(ctx); err != nil {
+	if err := am.keeper.DistributeRewards(sdkCtx); err != nil {
 		stdlog.Println("Cannot distribute rewards", err.Error())
+		return err
 	}
 
-	return []abci.ValidatorUpdate{}
+	return nil
 }
 
 // RegisterInvariants implements the AppModule interface
@@ -199,15 +168,18 @@ func (am AppModule) RegisterServices(cfg module.Configurator) {
 
 // InitGenesis performs genesis initialization for the ibc-transfer module. It returns
 // no validator updates.
-func (am AppModule) InitGenesis(ctx sdk.Context, cdc codec.JSONCodec, data json.RawMessage) []abci.ValidatorUpdate {
+func (am AppModule) InitGenesis(ctx sdk.Context, cdc codec.JSONCodec, data json.RawMessage) {
 	var genesisState types.GenesisState
 	cdc.MustUnmarshalJSON(data, &genesisState)
-	return InitGenesis(ctx, am.keeper, &genesisState)
+	InitGenesis(ctx, am.keeper, &genesisState)
 }
 
 // ExportGenesis returns the exported genesis state as raw bytes for the ibc-transfer
 // module.
 func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.RawMessage {
-	gs := ExportGenesis(ctx, am.keeper)
+	gs, err := ExportGenesis(ctx, am.keeper)
+	if err != nil {
+		panic(err)
+	}
 	return cdc.MustMarshalJSON(gs)
 }

package/x/vbank/types/expected_keepers.go

@@ -1,22 +1,27 @@
 package types
 
 import (
+	context "context"
+
+	address "cosmossdk.io/core/address"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
+	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 )
 
 // A subset of github.com/cosmos/cosmos-sdk/x/bank/keeper.Keeper
 type BankKeeper interface {
-	BurnCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) error
-	GetAllBalances(ctx sdk.Context, addr sdk.AccAddress) sdk.Coins
-	GetBalance(ctx sdk.Context, addr sdk.AccAddress, denom string) sdk.Coin
-	MintCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) error
-	SendCoinsFromAccountToModule(ctx sdk.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins) error
-	SendCoinsFromModuleToAccount(ctx sdk.Context, senderModule string, recipientAddr sdk.AccAddress, amt sdk.Coins) error
-	SendCoinsFromModuleToModule(ctx sdk.Context, senderModule, recipientModule string, amt sdk.Coins) error
+	AppendSendRestriction(restriction banktypes.SendRestrictionFn)
+	BurnCoins(ctx context.Context, moduleName string, amt sdk.Coins) error
+	GetAllBalances(ctx context.Context, addr sdk.AccAddress) sdk.Coins
+	GetBalance(ctx context.Context, addr sdk.AccAddress, denom string) sdk.Coin
+	MintCoins(ctx context.Context, moduleName string, amt sdk.Coins) error
+	SendCoinsFromAccountToModule(ctx context.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins) error
+	SendCoinsFromModuleToAccount(ctx context.Context, senderModule string, recipientAddr sdk.AccAddress, amt sdk.Coins) error
+	SendCoinsFromModuleToModule(ctx context.Context, senderModule, recipientModule string, amt sdk.Coins) error
 }
 
 type AccountKeeper interface {
-	GetModuleAccount(ctx sdk.Context, name string) authtypes.ModuleAccountI
-	GetAccount(ctx sdk.Context, addr sdk.AccAddress) authtypes.AccountI
+	GetModuleAccount(ctx context.Context, name string) sdk.ModuleAccountI
+	GetAccount(ctx context.Context, addr sdk.AccAddress) sdk.AccountI
+	AddressCodec() address.Codec
 }

package/x/vbank/types/key.go

@@ -7,6 +7,9 @@ const (
 	// StoreKey to be used when creating the KVStore
 	StoreKey = ModuleName
 
+	// TStoreKey to be used when creating the transient store.
+	TStoreKey = "transient_" + ModuleName
+
 	ReservePoolName   = "vbank/reserve"
 	GiveawayPoolName  = "vbank/giveaway"
 	ProvisionPoolName = "vbank/provision"

package/x/vbank/types/params.go

@@ -5,6 +5,7 @@ import (
 
 	yaml "gopkg.in/yaml.v2"
 
+	sdkmath "cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
@@ -31,7 +32,7 @@ func DefaultParams() Params {
 	return Params{
 		RewardEpochDurationBlocks: 0,
 		RewardSmoothingBlocks:     1,
-		PerEpochRewardFraction:    sdk.OneDec(),
+		PerEpochRewardFraction:    sdkmath.LegacyOneDec(),
 		AllowedMonitoringAccounts: []string{provisionAddress.String()},
 	}
 }
@@ -141,7 +142,7 @@ func validateRewardEpochDurationBlocks(i interface{}) error {
 }
 
 func validatePerEpochRewardFraction(i interface{}) error {
-	v, ok := i.(sdk.Dec)
+	v, ok := i.(sdkmath.LegacyDec)
 	if !ok {
 		return fmt.Errorf("invalid parameter type: %T", i)
 	}
@@ -150,7 +151,7 @@ func validatePerEpochRewardFraction(i interface{}) error {
 		return fmt.Errorf("per epoch reward fraction must be nonnegative: %s", v)
 	}
 
-	if v.GT(sdk.OneDec()) {
+	if v.GT(sdkmath.LegacyOneDec()) {
 		return fmt.Errorf("per epoch reward fraction must be less than or equal to one: %s", v)
 	}
 

package/x/vbank/types/vbank.pb.go

@@ -4,6 +4,7 @@
 package types
 
 import (
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
 	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	types "github.com/cosmos/cosmos-sdk/types"
@@ -34,7 +35,7 @@ type Params struct {
 	// per_epoch_reward_fraction is a fraction of the reward pool to distrubute
 	// once every reward epoch.  If less than zero, use approximately continuous
 	// per-block distribution.
-	PerEpochRewardFraction github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=per_epoch_reward_fraction,json=perEpochRewardFraction,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"per_epoch_reward_fraction" yaml:"discrete_epoch_reward_fraction"`
+	PerEpochRewardFraction cosmossdk_io_math.LegacyDec `protobuf:"bytes,2,opt,name=per_epoch_reward_fraction,json=perEpochRewardFraction,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"per_epoch_reward_fraction" yaml:"discrete_epoch_reward_fraction"`
 	// reward_smoothing_blocks is the number of blocks over which to distribute
 	// an epoch's rewards.  If zero, use the same value as
 	// reward_epoch_duration_blocks.
@@ -181,45 +182,45 @@ func init() {
 func init() { proto.RegisterFile("agoric/vbank/vbank.proto", fileDescriptor_5e89b3b9e5e671b4) }
 
 var fileDescriptor_5e89b3b9e5e671b4 = []byte{
-	// 597 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0x3f, 0x6f, 0xd3, 0x4e,
-	0x18, 0xc7, 0xe3, 0x26, 0xbf, 0xea, 0xd7, 0x6b, 0x19, 0x30, 0x05, 0x9c, 0x16, 0xd9, 0xd1, 0x21,
-	0x4a, 0x18, 0xb0, 0x55, 0x58, 0x50, 0x25, 0x86, 0x9a, 0xd2, 0x0d, 0x54, 0xb9, 0x03, 0x52, 0x97,
-	0xe8, 0x7c, 0xb9, 0x3a, 0x56, 0x6d, 0x3f, 0xe1, 0xee, 0xd2, 0xd2, 0x95, 0x57, 0x80, 0x98, 0x60,
-	0xeb, 0xcc, 0x2b, 0xe9, 0xd8, 0x05, 0x09, 0x21, 0x61, 0x50, 0xbb, 0x30, 0xe7, 0x15, 0xa0, 0xfb,
-	0x53, 0xda, 0x20, 0x14, 0x60, 0x49, 0xe2, 0x7c, 0xbe, 0xcf, 0x93, 0xef, 0xf3, 0x27, 0x0f, 0xf2,
-	0x48, 0x06, 0x3c, 0xa7, 0xd1, 0x7e, 0x4a, 0xaa, 0x3d, 0xf3, 0x1a, 0x0e, 0x39, 0x48, 0x70, 0x17,
-	0x0c, 0x09, 0xf5, 0x77, 0x4b, 0x8b, 0x19, 0x64, 0xa0, 0x41, 0xa4, 0x3e, 0x19, 0xcd, 0x92, 0x4f,
-	0x41, 0x94, 0x20, 0xa2, 0x94, 0x08, 0x16, 0xed, 0xaf, 0xa6, 0x4c, 0x92, 0xd5, 0x88, 0x42, 0x5e,
-	0x19, 0x8e, 0x3f, 0x36, 0xd1, 0xec, 0x16, 0xe1, 0xa4, 0x14, 0xee, 0x00, 0xdd, 0xe2, 0xec, 0x80,
-	0xf0, 0x7e, 0x8f, 0x0d, 0x81, 0x0e, 0x7a, 0xfd, 0x11, 0x27, 0x32, 0x87, 0xaa, 0x97, 0x16, 0x40,
-	0xf7, 0x84, 0xe7, 0x74, 0x9c, 0x6e, 0x33, 0xbe, 0x3b, 0xae, 0x83, 0xdb, 0x87, 0xa4, 0x2c, 0xd6,
-	0xf0, 0x34, 0x35, 0x4e, 0xda, 0x06, 0x3f, 0x55, 0x74, 0xc3, 0xc2, 0x58, 0x33, 0xf7, 0xad, 0x83,
-	0xda, 0x43, 0xc6, 0x6d, 0xa4, 0x4d, 0xb3, 0xcb, 0x09, 0x55, 0x1a, 0x6f, 0xa6, 0xe3, 0x74, 0xe7,
-	0xe2, 0x17, 0xc7, 0x75, 0xd0, 0xf8, 0x5c, 0x07, 0x2b, 0x59, 0x2e, 0x07, 0xa3, 0x34, 0xa4, 0x50,
-	0x46, 0xb6, 0x16, 0xf3, 0x76, 0x5f, 0xf4, 0xf7, 0x22, 0x79, 0x38, 0x64, 0x22, 0xdc, 0x60, 0x74,
-	0x5c, 0x07, 0x77, 0x8c, 0xab, 0x7e, 0x2e, 0x28, 0x67, 0x92, 0xfd, 0x3e, 0x3b, 0x4e, 0x6e, 0x0c,
-	0x19, 0xd7, 0xa6, 0x12, 0x4d, 0x36, 0x2d, 0x70, 0x77, 0xd0, 0x4d, 0xab, 0x15, 0x25, 0x80, 0x1c,
-	0xe4, 0x55, 0x76, 0x5e, 0x79, 0x53, 0x57, 0x8e, 0xc7, 0x75, 0xe0, 0x4f, 0x54, 0xfe, 0xab, 0x10,
-	0x27, 0xd7, 0x0d, 0xd9, 0x3e, 0x07, 0xb6, 0xe0, 0x5d, 0xb4, 0x4c, 0x8a, 0x02, 0x0e, 0x58, 0xbf,
-	0x57, 0x42, 0x95, 0x4b, 0xe0, 0x2a, 0x88, 0x50, 0x0a, 0xa3, 0x4a, 0x0a, 0xaf, 0xd5, 0x69, 0x76,
-	0xe7, 0xe2, 0x95, 0x71, 0x1d, 0x60, 0x93, 0x7f, 0x8a, 0x18, 0x27, 0x6d, 0x4b, 0x9f, 0xfd, 0x84,
-	0xeb, 0x96, 0xad, 0xfd, 0xff, 0xee, 0x28, 0x68, 0x7c, 0x3f, 0x0a, 0x1c, 0xfc, 0xa5, 0x89, 0xfe,
-	0xdb, 0x96, 0x44, 0x32, 0xf7, 0xb5, 0x83, 0xe6, 0xad, 0xdf, 0x21, 0x40, 0xe1, 0x39, 0x9d, 0x66,
-	0x77, 0xfe, 0x41, 0x3b, 0x34, 0x5d, 0x0c, 0xd5, 0x62, 0x84, 0x76, 0x31, 0xc2, 0x27, 0x90, 0x57,
-	0xf1, 0xa6, 0xea, 0xfc, 0xb8, 0x0e, 0xdc, 0x89, 0x5a, 0x55, 0x2c, 0xfe, 0xf0, 0x35, 0xe8, 0xfe,
-	0xc5, 0x3c, 0x54, 0x1a, 0x91, 0x20, 0x13, 0xb9, 0x05, 0x50, 0xb8, 0xef, 0x1d, 0x74, 0xcd, 0x26,
-	0xd2, 0xad, 0xea, 0x91, 0x52, 0x39, 0xf6, 0x66, 0xfe, 0x64, 0xe6, 0xb9, 0x35, 0xb3, 0x34, 0x61,
-	0xe6, 0x72, 0x8e, 0x7f, 0x33, 0x75, 0xd5, 0x64, 0xd0, 0x73, 0x59, 0xd7, 0xf1, 0xee, 0x63, 0x74,
-	0xa5, 0x20, 0x42, 0xf6, 0x04, 0x7b, 0x39, 0x62, 0x15, 0x65, 0x7a, 0xdc, 0xad, 0xd8, 0x1b, 0xd7,
-	0xc1, 0xa2, 0xf9, 0xd5, 0x09, 0x8c, 0x93, 0x05, 0xf5, 0xbc, 0x6d, 0x1f, 0xdd, 0x0a, 0xf9, 0x9a,
-	0x5b, 0x6b, 0xfd, 0x5c, 0x48, 0x9e, 0xa7, 0xa3, 0x8b, 0xff, 0x82, 0xd7, 0xd2, 0xeb, 0x73, 0xef,
-	0x62, 0x45, 0xa7, 0xeb, 0x71, 0xb2, 0xac, 0x04, 0x66, 0x3d, 0x37, 0x2e, 0x61, 0x6d, 0x7a, 0xad,
-	0xa5, 0xe6, 0x1b, 0x27, 0xc7, 0xa7, 0xbe, 0x73, 0x72, 0xea, 0x3b, 0xdf, 0x4e, 0x7d, 0xe7, 0xcd,
-	0x99, 0xdf, 0x38, 0x39, 0xf3, 0x1b, 0x9f, 0xce, 0xfc, 0xc6, 0xce, 0xa3, 0x4b, 0xbd, 0x58, 0x37,
-	0xa7, 0xc3, 0xdc, 0x09, 0xdd, 0x8b, 0x0c, 0x0a, 0x52, 0x65, 0xe7, 0x4d, 0x7a, 0x65, 0xaf, 0x8a,
-	0xee, 0x50, 0x3a, 0xab, 0x4f, 0xc2, 0xc3, 0x1f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x60, 0x18, 0x80,
-	0x8f, 0x72, 0x04, 0x00, 0x00,
+	// 606 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0x31, 0x6f, 0xd3, 0x40,
+	0x14, 0xc7, 0xe3, 0x26, 0x54, 0xf4, 0x5a, 0x06, 0x4c, 0x01, 0xa7, 0x45, 0x76, 0x74, 0x08, 0x08,
+	0x03, 0xb6, 0x0a, 0x0b, 0xaa, 0xc4, 0x50, 0x53, 0x3a, 0x15, 0x54, 0xb9, 0x5b, 0x97, 0xe8, 0x7c,
+	0xbe, 0x3a, 0x56, 0x6c, 0xbf, 0x70, 0x77, 0x69, 0xe9, 0xca, 0xc2, 0xca, 0x08, 0x5b, 0x67, 0x3e,
+	0x49, 0xc5, 0xd4, 0x11, 0x21, 0x61, 0x50, 0xbb, 0x30, 0xfb, 0x13, 0x20, 0xdf, 0x5d, 0x69, 0x83,
+	0x50, 0x11, 0x4b, 0x92, 0xcb, 0xef, 0xff, 0x9e, 0xff, 0xef, 0xdd, 0xf3, 0x43, 0x0e, 0x49, 0x81,
+	0x67, 0x34, 0xd8, 0x8b, 0x49, 0x39, 0xd2, 0x9f, 0xfe, 0x98, 0x83, 0x04, 0x7b, 0x41, 0x13, 0x5f,
+	0xfd, 0xb7, 0xb4, 0x98, 0x42, 0x0a, 0x0a, 0x04, 0xcd, 0x2f, 0xad, 0x59, 0x72, 0x29, 0x88, 0x02,
+	0x44, 0x10, 0x13, 0xc1, 0x82, 0xbd, 0x95, 0x98, 0x49, 0xb2, 0x12, 0x50, 0xc8, 0x4a, 0xcd, 0xf1,
+	0xe7, 0x36, 0x9a, 0xdd, 0x22, 0x9c, 0x14, 0xc2, 0x1e, 0xa2, 0x3b, 0x9c, 0xed, 0x13, 0x9e, 0x0c,
+	0xd8, 0x18, 0xe8, 0x70, 0x90, 0x4c, 0x38, 0x91, 0x19, 0x94, 0x83, 0x38, 0x07, 0x3a, 0x12, 0x8e,
+	0xd5, 0xb3, 0xfa, 0xed, 0xf0, 0x41, 0x5d, 0x79, 0x77, 0x0f, 0x48, 0x91, 0xaf, 0xe2, 0xcb, 0xd4,
+	0x38, 0xea, 0x6a, 0xfc, 0xa2, 0xa1, 0xeb, 0x06, 0x86, 0x8a, 0xd9, 0xef, 0x2c, 0xd4, 0x1d, 0x33,
+	0x6e, 0x22, 0x4d, 0x9a, 0x5d, 0x4e, 0x68, 0xa3, 0x71, 0x66, 0x7a, 0x56, 0x7f, 0x2e, 0xdc, 0x3c,
+	0xaa, 0xbc, 0xd6, 0xd7, 0xca, 0x5b, 0xd6, 0x05, 0x88, 0x64, 0xe4, 0x67, 0x10, 0x14, 0x44, 0x0e,
+	0xfd, 0x4d, 0x96, 0x12, 0x7a, 0xb0, 0xce, 0x68, 0x5d, 0x79, 0xf7, 0xb4, 0x95, 0x24, 0x13, 0x94,
+	0x33, 0xc9, 0xfe, 0x9e, 0x12, 0x47, 0xb7, 0xc6, 0x8c, 0x2b, 0x27, 0x91, 0x22, 0x1b, 0x06, 0xd8,
+	0x3b, 0xe8, 0xb6, 0xd1, 0x8a, 0x02, 0x40, 0x0e, 0xb3, 0x32, 0x3d, 0x2b, 0xb7, 0xad, 0xca, 0xc5,
+	0x75, 0xe5, 0xb9, 0x53, 0xe5, 0xfe, 0x29, 0xc4, 0xd1, 0x4d, 0x4d, 0xb6, 0xcf, 0x80, 0xa9, 0x72,
+	0x17, 0x2d, 0x93, 0x3c, 0x87, 0x7d, 0x96, 0x0c, 0x0a, 0x28, 0x33, 0x09, 0xbc, 0x09, 0x22, 0x94,
+	0xc2, 0xa4, 0x94, 0xc2, 0xe9, 0xf4, 0xda, 0xfd, 0xb9, 0xf0, 0x7e, 0x5d, 0x79, 0x58, 0xe7, 0xbf,
+	0x44, 0x8c, 0xa3, 0xae, 0xa1, 0x2f, 0x7f, 0xc3, 0x35, 0xc3, 0x56, 0xaf, 0x7e, 0x38, 0xf4, 0x5a,
+	0x3f, 0x0f, 0x3d, 0x0b, 0x7f, 0x6b, 0xa3, 0x2b, 0xdb, 0x92, 0x48, 0x66, 0xbf, 0xb5, 0xd0, 0xbc,
+	0xf1, 0x3b, 0x06, 0xc8, 0x1d, 0xab, 0xd7, 0xee, 0xcf, 0x3f, 0xee, 0xfa, 0xba, 0x99, 0x7e, 0x33,
+	0x0d, 0xbe, 0x99, 0x06, 0xff, 0x39, 0x64, 0x65, 0xb8, 0xd1, 0xb4, 0xbb, 0xae, 0x3c, 0x7b, 0xaa,
+	0xd6, 0x26, 0x16, 0x7f, 0xfa, 0xee, 0xf5, 0xd3, 0x4c, 0x0e, 0x27, 0xb1, 0x4f, 0xa1, 0x08, 0xcc,
+	0x40, 0xe9, 0xaf, 0x47, 0x22, 0x19, 0x05, 0xf2, 0x60, 0xcc, 0x84, 0x4a, 0x23, 0x22, 0xa4, 0x23,
+	0xb7, 0x00, 0x72, 0xfb, 0xa3, 0x85, 0x6e, 0x98, 0x44, 0xaa, 0x55, 0x03, 0x52, 0x34, 0x8e, 0x9d,
+	0x99, 0x7f, 0x99, 0x79, 0x65, 0xcc, 0x2c, 0x4d, 0x99, 0xb9, 0x98, 0xe3, 0xff, 0x4c, 0x5d, 0xd7,
+	0x19, 0xd4, 0xbd, 0xac, 0xa9, 0x78, 0xfb, 0x19, 0xba, 0x96, 0x13, 0x21, 0x07, 0x82, 0xbd, 0x9e,
+	0xb0, 0x92, 0x32, 0x75, 0xdd, 0x9d, 0xd0, 0xa9, 0x2b, 0x6f, 0x51, 0x3f, 0x75, 0x0a, 0xe3, 0x68,
+	0xa1, 0x39, 0x6f, 0x9b, 0xa3, 0x5d, 0x22, 0x57, 0x71, 0x63, 0x2d, 0xc9, 0x84, 0xe4, 0x59, 0x3c,
+	0x39, 0x7f, 0x01, 0x9c, 0x8e, 0x1a, 0x9f, 0x87, 0xe7, 0x23, 0x7a, 0xb9, 0x1e, 0x47, 0xcb, 0x8d,
+	0x40, 0x8f, 0xe7, 0xfa, 0x05, 0xac, 0x4c, 0xaf, 0x76, 0x9a, 0xfb, 0x0d, 0xa3, 0xa3, 0x13, 0xd7,
+	0x3a, 0x3e, 0x71, 0xad, 0x1f, 0x27, 0xae, 0xf5, 0xfe, 0xd4, 0x6d, 0x1d, 0x9f, 0xba, 0xad, 0x2f,
+	0xa7, 0x6e, 0x6b, 0xe7, 0xe9, 0x85, 0x5e, 0xac, 0xe9, 0x7d, 0xa1, 0x97, 0x83, 0xea, 0x45, 0x0a,
+	0x39, 0x29, 0xd3, 0xb3, 0x26, 0xbd, 0x31, 0xab, 0x44, 0x75, 0x28, 0x9e, 0x55, 0x7b, 0xe0, 0xc9,
+	0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x8e, 0xe4, 0xc6, 0x3a, 0x67, 0x04, 0x00, 0x00,
 }
 
 func (this *Params) Equal(that interface{}) bool {

package/x/vbank/vbank.go

@@ -7,6 +7,7 @@ import (
 	stdlog "log"
 	"sort"
 
+	sdkmath "cosmossdk.io/math"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/vm"
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -76,13 +77,16 @@ type VbankBalanceUpdate struct {
 // getBalanceUpdate returns a bridge message containing the current bank balance
 // for the given addresses each for the specified denominations. Coins are used
 // only to track the set of denoms, not for the particular nonzero amounts.
-func getBalanceUpdate(ctx sdk.Context, keeper Keeper, addressToUpdate map[string]sdk.Coins) vm.Action {
+func getBalanceUpdate(ctx sdk.Context, keeper Keeper, addressToUpdate map[string]sdk.Coins) (vm.Action, error) {
 	nentries := len(addressToUpdate)
 	if nentries == 0 {
-		return nil
+		return nil, nil
 	}
 
-	nonce := keeper.GetNextSequence(ctx)
+	nonce, err := keeper.GetNextSequence(ctx)
+	if err != nil {
+		return nil, err
+	}
 	event := VbankBalanceUpdate{
 		Nonce:   nonce,
 		Updated: make([]VbankSingleBalanceUpdate, 0, nentries),
@@ -112,7 +116,7 @@ func getBalanceUpdate(ctx sdk.Context, keeper Keeper, addressToUpdate map[string
 	sort.Sort(event.Updated)
 
 	// Populate the event default fields (even though event does not embed vm.ActionHeader)
-	return vm.PopulateAction(ctx, event)
+	return vm.PopulateAction(ctx, event), nil
 }
 
 func marshal(event vm.Jsonable) ([]byte, error) {
@@ -157,7 +161,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)
 		}
-		value, ok := sdk.NewIntFromString(msg.Amount)
+		value, ok := sdkmath.NewIntFromString(msg.Amount)
 		if !ok {
 			return "", fmt.Errorf("cannot convert %s to int", msg.Amount)
 		}
@@ -167,7 +171,11 @@ func (ch portHandler) Receive(cctx context.Context, str string) (ret 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))
+		action, err := getBalanceUpdate(ctx, keeper, addressToBalances)
+		if err != nil {
+			return "", err
+		}
+		bz, err := marshal(action)
 		if err != nil {
 			return "", err
 		}
@@ -185,7 +193,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)
 		}
-		value, ok := sdk.NewIntFromString(msg.Amount)
+		value, ok := sdkmath.NewIntFromString(msg.Amount)
 		if !ok {
 			return "", fmt.Errorf("cannot convert %s to int", msg.Amount)
 		}
@@ -195,7 +203,11 @@ func (ch portHandler) Receive(cctx context.Context, str string) (ret 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))
+		action, err := getBalanceUpdate(ctx, keeper, addressToBalances)
+		if err != nil {
+			return "", err
+		}
+		bz, err := marshal(action)
 		if err != nil {
 			return "", err
 		}
@@ -206,7 +218,7 @@ func (ch portHandler) Receive(cctx context.Context, str string) (ret string, err
 		}
 
 	case "VBANK_GIVE_TO_REWARD_DISTRIBUTOR":
-		value, ok := sdk.NewIntFromString(msg.Amount)
+		value, ok := sdkmath.NewIntFromString(msg.Amount)
 		if !ok {
 			return "", fmt.Errorf("cannot convert %s to int", msg.Amount)
 		}
@@ -214,7 +226,10 @@ func (ch portHandler) Receive(cctx context.Context, str string) (ret string, err
 		if err := keeper.StoreRewardCoins(ctx, coins); err != nil {
 			return "", fmt.Errorf("cannot store reward %s coins: %s", coins.Sort().String(), err)
 		}
-		state := keeper.GetState(ctx)
+		state, err := keeper.GetState(ctx)
+		if err != nil {
+			return "", err
+		}
 		state.RewardPool = state.RewardPool.Add(coins...)
 		keeper.SetState(ctx, state)
 		// We don't supply the module balance, since the controller shouldn't know.