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

package/x/swingset/types/params_test.go

@@ -4,6 +4,7 @@ import (
 	"reflect"
 	"testing"
 
+	sdkmath "cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
@@ -37,44 +38,44 @@ func TestAddStorageBeanCost(t *testing.T) {
 		},
 		{
 			name: "already_only_different",
-			in:   []beans{NewStringBeans(BeansPerStorageByte, sdk.NewUint(123))},
-			want: []beans{NewStringBeans(BeansPerStorageByte, sdk.NewUint(123))},
+			in:   []beans{NewStringBeans(BeansPerStorageByte, sdkmath.NewUint(123))},
+			want: []beans{NewStringBeans(BeansPerStorageByte, sdkmath.NewUint(123))},
 		},
 		{
 			name: "already_same",
 			in: []beans{
-				NewStringBeans("foo", sdk.NewUint(123)),
+				NewStringBeans("foo", sdkmath.NewUint(123)),
 				defaultStorageCost,
-				NewStringBeans("bar", sdk.NewUint(456)),
+				NewStringBeans("bar", sdkmath.NewUint(456)),
 			},
 			want: []beans{
-				NewStringBeans("foo", sdk.NewUint(123)),
+				NewStringBeans("foo", sdkmath.NewUint(123)),
 				defaultStorageCost,
-				NewStringBeans("bar", sdk.NewUint(456)),
+				NewStringBeans("bar", sdkmath.NewUint(456)),
 			},
 		},
 		{
 			name: "already_different",
 			in: []beans{
-				NewStringBeans("foo", sdk.NewUint(123)),
-				NewStringBeans(BeansPerStorageByte, sdk.NewUint(789)),
-				NewStringBeans("bar", sdk.NewUint(456)),
+				NewStringBeans("foo", sdkmath.NewUint(123)),
+				NewStringBeans(BeansPerStorageByte, sdkmath.NewUint(789)),
+				NewStringBeans("bar", sdkmath.NewUint(456)),
 			},
 			want: []beans{
-				NewStringBeans("foo", sdk.NewUint(123)),
-				NewStringBeans(BeansPerStorageByte, sdk.NewUint(789)),
-				NewStringBeans("bar", sdk.NewUint(456)),
+				NewStringBeans("foo", sdkmath.NewUint(123)),
+				NewStringBeans(BeansPerStorageByte, sdkmath.NewUint(789)),
+				NewStringBeans("bar", sdkmath.NewUint(456)),
 			},
 		},
 		{
 			name: "missing",
 			in: []beans{
-				NewStringBeans("foo", sdk.NewUint(123)),
-				NewStringBeans("bar", sdk.NewUint(456)),
+				NewStringBeans("foo", sdkmath.NewUint(123)),
+				NewStringBeans("bar", sdkmath.NewUint(456)),
 			},
 			want: []beans{
-				NewStringBeans("foo", sdk.NewUint(123)),
-				NewStringBeans("bar", sdk.NewUint(456)),
+				NewStringBeans("foo", sdkmath.NewUint(123)),
+				NewStringBeans("bar", sdkmath.NewUint(456)),
 				defaultStorageCost,
 			},
 		},
@@ -118,17 +119,17 @@ func TestUpdateParamsFromEmpty(t *testing.T) {
 
 func TestUpdateParamsFromExisting(t *testing.T) {
 	defaultBeansPerUnit := DefaultBeansPerUnit()
-	customBeansPerUnit := NewStringBeans("foo", sdk.NewUint(1))
+	customBeansPerUnit := NewStringBeans("foo", sdkmath.NewUint(1))
 	customPowerFlagFee := NewPowerFlagFee("bar", sdk.NewCoins(sdk.NewInt64Coin("baz", 2)))
 	customQueueSize := NewQueueSize("qux", int32(3))
-	customVatCleanup := UintMapEntry{"corge", sdk.NewUint(4)}
+	customVatCleanup := UintMapEntry{"corge", sdkmath.NewUint(4)}
 	in := Params{
 		BeansPerUnit:       append([]StringBeans{customBeansPerUnit}, defaultBeansPerUnit[2:4]...),
 		BootstrapVatConfig: "",
 		FeeUnitPrice:       sdk.NewCoins(sdk.NewInt64Coin("denom", 789)),
 		PowerFlagFees:      []PowerFlagFee{customPowerFlagFee},
 		QueueMax:           []QueueSize{NewQueueSize(QueueInbound, int32(10)), customQueueSize},
-		VatCleanupBudget:   []UintMapEntry{customVatCleanup, UintMapEntry{VatCleanupDefault, sdk.NewUint(10)}},
+		VatCleanupBudget:   []UintMapEntry{customVatCleanup, UintMapEntry{VatCleanupDefault, sdkmath.NewUint(10)}},
 	}
 	want := Params{
 		BeansPerUnit:       append(append(in.BeansPerUnit, defaultBeansPerUnit[0:2]...), defaultBeansPerUnit[4:]...),
@@ -161,7 +162,7 @@ func TestValidateParams(t *testing.T) {
 		t.Errorf("unexpected ValidateBasic() error with default params: %v", err)
 	}
 
-	customVatCleanup := UintMapEntry{"corge", sdk.NewUint(4)}
+	customVatCleanup := UintMapEntry{"corge", sdkmath.NewUint(4)}
 	params.VatCleanupBudget = append(params.VatCleanupBudget, customVatCleanup)
 	err = params.ValidateBasic()
 	if err != nil {

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

@@ -4,9 +4,12 @@
 package types
 
 import (
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
+	_ "github.com/cosmos/cosmos-proto"
 	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	types "github.com/cosmos/cosmos-sdk/types"
+	_ "github.com/cosmos/cosmos-sdk/types/tx/amino"
 	_ "github.com/cosmos/gogoproto/gogoproto"
 	proto "github.com/cosmos/gogoproto/proto"
 	io "io"
@@ -298,7 +301,7 @@ type StringBeans struct {
 	// What the beans are for.
 	Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
 	// The actual bean value.
-	Beans github_com_cosmos_cosmos_sdk_types.Uint `protobuf:"bytes,2,opt,name=beans,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Uint" json:"beans"`
+	Beans cosmossdk_io_math.Uint `protobuf:"bytes,2,opt,name=beans,proto3,customtype=cosmossdk.io/math.Uint" json:"beans"`
 }
 
 func (m *StringBeans) Reset()         { *m = StringBeans{} }
@@ -454,8 +457,8 @@ func (m *QueueSize) GetSize_() int32 {
 // The value uses cosmos-sdk Uint rather than a native Go type to ensure that
 // zeroes survive "omitempty" JSON serialization.
 type UintMapEntry struct {
-	Key   string                                  `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
-	Value github_com_cosmos_cosmos_sdk_types.Uint `protobuf:"bytes,2,opt,name=value,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Uint" json:"value"`
+	Key   string                 `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
+	Value cosmossdk_io_math.Uint `protobuf:"bytes,2,opt,name=value,proto3,customtype=cosmossdk.io/math.Uint" json:"value"`
 }
 
 func (m *UintMapEntry) Reset()         { *m = UintMapEntry{} }
@@ -632,64 +635,67 @@ func init() {
 func init() { proto.RegisterFile("agoric/swingset/swingset.proto", fileDescriptor_ff9c341e0de15f8b) }
 
 var fileDescriptor_ff9c341e0de15f8b = []byte{
-	// 897 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0x4d, 0x6f, 0xe3, 0x44,
-	0x18, 0x8e, 0xc9, 0x07, 0xcd, 0x9b, 0x6c, 0x5b, 0x86, 0x4a, 0x1b, 0x2a, 0x36, 0xae, 0x7c, 0xa1,
-	0xd2, 0x6a, 0x93, 0x2d, 0x08, 0x21, 0x65, 0xc5, 0x21, 0x8e, 0xb2, 0x5a, 0x09, 0x2d, 0xca, 0x3a,
-	0x2a, 0x07, 0x04, 0xb2, 0x26, 0xce, 0xc4, 0x4c, 0xeb, 0x78, 0xbc, 0x9e, 0x49, 0xda, 0xee, 0x1f,
-	0x80, 0x23, 0xe2, 0xc4, 0xb1, 0x67, 0x7e, 0xc9, 0x1e, 0xf7, 0x88, 0x38, 0x98, 0x55, 0x7b, 0x41,
-	0x3d, 0xe6, 0x88, 0x84, 0x84, 0xe6, 0x23, 0xae, 0x45, 0x17, 0x51, 0x21, 0xed, 0xc9, 0xf3, 0x7e,
-	0x3f, 0xef, 0xf3, 0x8c, 0x6d, 0x68, 0xe3, 0x90, 0xa5, 0x34, 0xe8, 0xf2, 0x13, 0x1a, 0x87, 0x9c,
-	0x88, 0xfc, 0xd0, 0x49, 0x52, 0x26, 0x18, 0xda, 0xd2, 0xf1, 0xce, 0xda, 0xbd, 0xbb, 0x13, 0xb2,
-	0x90, 0xa9, 0x58, 0x57, 0x9e, 0x74, 0xda, 0x6e, 0x3b, 0x60, 0x7c, 0xce, 0x78, 0x77, 0x82, 0x39,
-	0xe9, 0x2e, 0x0f, 0x26, 0x44, 0xe0, 0x83, 0x6e, 0xc0, 0x68, 0xac, 0xe3, 0xce, 0xf7, 0x16, 0x6c,
-	0x0f, 0x58, 0x4a, 0x86, 0x4b, 0x1c, 0x8d, 0x52, 0x96, 0x30, 0x8e, 0x23, 0xb4, 0x03, 0x55, 0x41,
-	0x45, 0x44, 0x5a, 0xd6, 0x9e, 0xb5, 0x5f, 0xf7, 0xb4, 0x81, 0xf6, 0xa0, 0x31, 0x25, 0x3c, 0x48,
-	0x69, 0x22, 0x28, 0x8b, 0x5b, 0xef, 0xa8, 0x58, 0xd1, 0x85, 0x3e, 0x85, 0x2a, 0x59, 0xe2, 0x88,
-	0xb7, 0xca, 0x7b, 0xe5, 0xfd, 0xc6, 0xc7, 0x1f, 0x74, 0xfe, 0x81, 0xb1, 0xb3, 0x9e, 0xe4, 0x56,
-	0x5e, 0x66, 0x76, 0xc9, 0xd3, 0xd9, 0xbd, 0xca, 0x0f, 0xe7, 0x76, 0xc9, 0xe1, 0xb0, 0xb1, 0x0e,
-	0xa3, 0x1e, 0x34, 0x8f, 0x38, 0x8b, 0xfd, 0x84, 0xa4, 0x73, 0x2a, 0xb8, 0xc6, 0xe1, 0xde, 0x5d,
-	0x65, 0xf6, 0xfb, 0x67, 0x78, 0x1e, 0xf5, 0x9c, 0x62, 0xd4, 0xf1, 0x1a, 0xd2, 0x1c, 0x69, 0x0b,
-	0xdd, 0x87, 0x77, 0x8f, 0xb8, 0x1f, 0xb0, 0x29, 0xd1, 0x10, 0x5d, 0xb4, 0xca, 0xec, 0xcd, 0x75,
-	0x99, 0x0a, 0x38, 0x5e, 0xed, 0x88, 0x0f, 0xe4, 0xe1, 0x75, 0x19, 0x6a, 0x23, 0x9c, 0xe2, 0x39,
-	0x47, 0x4f, 0x60, 0x73, 0x42, 0x70, 0xcc, 0x65, 0x5b, 0x7f, 0x11, 0x53, 0xd1, 0xb2, 0xd4, 0x16,
-	0x1f, 0xde, 0xd8, 0x62, 0x2c, 0x52, 0x1a, 0x87, 0xae, 0x4c, 0x36, 0x8b, 0x34, 0x55, 0xe5, 0x88,
-	0xa4, 0x87, 0x31, 0x15, 0xe8, 0x39, 0x6c, 0xce, 0x08, 0x51, 0x3d, 0xfc, 0x24, 0xa5, 0x81, 0x04,
-	0xa2, 0xf9, 0xd0, 0x62, 0x74, 0xa4, 0x18, 0x1d, 0x23, 0x46, 0x67, 0xc0, 0x68, 0xec, 0x3e, 0x94,
-	0x6d, 0x7e, 0xf9, 0xdd, 0xde, 0x0f, 0xa9, 0xf8, 0x6e, 0x31, 0xe9, 0x04, 0x6c, 0xde, 0x35, 0xca,
-	0xe9, 0xc7, 0x03, 0x3e, 0x3d, 0xee, 0x8a, 0xb3, 0x84, 0x70, 0x55, 0xc0, 0xbd, 0xe6, 0x8c, 0x10,
-	0x39, 0x6d, 0x24, 0x07, 0xa0, 0x87, 0xb0, 0x33, 0x61, 0x4c, 0x70, 0x91, 0xe2, 0xc4, 0x5f, 0x62,
-	0xe1, 0x07, 0x2c, 0x9e, 0xd1, 0xb0, 0x55, 0x56, 0x22, 0xa1, 0x3c, 0xf6, 0x15, 0x16, 0x03, 0x15,
-	0x41, 0x5f, 0xc0, 0x56, 0xc2, 0x4e, 0x48, 0xea, 0xcf, 0x22, 0x1c, 0xfa, 0x33, 0x42, 0x78, 0xab,
-	0xa2, 0x50, 0xde, 0xbb, 0xb1, 0xef, 0x48, 0xe6, 0x3d, 0x8e, 0x70, 0xf8, 0x98, 0x10, 0xb3, 0xf0,
-	0x9d, 0xa4, 0xe0, 0xe3, 0xe8, 0x73, 0xa8, 0x3f, 0x5f, 0x90, 0x05, 0xf1, 0xe7, 0xf8, 0xb4, 0x55,
-	0x55, 0x6d, 0x76, 0x6f, 0xb4, 0x79, 0x26, 0x33, 0xc6, 0xf4, 0xc5, 0xba, 0xc7, 0x86, 0x2a, 0x79,
-	0x8a, 0x4f, 0xd1, 0x33, 0x40, 0x0a, 0x73, 0x44, 0x70, 0xbc, 0x48, 0xfc, 0xc9, 0x62, 0x1a, 0x12,
-	0xd1, 0xaa, 0xfd, 0x0b, 0x9c, 0x43, 0x1a, 0x8b, 0xa7, 0x38, 0x19, 0xc6, 0x22, 0x3d, 0x33, 0xad,
-	0xb6, 0x97, 0x58, 0x0c, 0x74, 0xb5, 0xab, 0x8a, 0x7b, 0x1b, 0x3f, 0x9f, 0xdb, 0xa5, 0x3f, 0xce,
-	0x6d, 0xcb, 0xf9, 0x12, 0xaa, 0x63, 0x81, 0x05, 0x41, 0x43, 0xb8, 0xa3, 0x41, 0xe2, 0x28, 0x62,
-	0x27, 0x64, 0x6a, 0xf4, 0xfd, 0x6f, 0xa0, 0x4d, 0x55, 0xd6, 0xd7, 0x55, 0x4e, 0x04, 0x8d, 0xc2,
-	0x05, 0x40, 0xdb, 0x50, 0x3e, 0x26, 0x67, 0xe6, 0x4d, 0x91, 0x47, 0x34, 0x84, 0xaa, 0xba, 0x0e,
-	0xe6, 0xfa, 0x75, 0x65, 0x8f, 0xdf, 0x32, 0xfb, 0xa3, 0x5b, 0x48, 0x2b, 0x57, 0xf3, 0x74, 0x75,
-	0xaf, 0xa2, 0xd0, 0xff, 0x64, 0x41, 0xb3, 0xc8, 0x3f, 0xba, 0x07, 0x70, 0xad, 0x9b, 0x19, 0x5b,
-	0xcf, 0xd5, 0x40, 0xdf, 0x42, 0x79, 0x46, 0xde, 0xca, 0x85, 0x93, 0x7d, 0x0d, 0xa8, 0xcf, 0xa0,
-	0x9e, 0x73, 0xf4, 0x06, 0x02, 0x10, 0x54, 0x38, 0x7d, 0xa1, 0x5f, 0xbf, 0xaa, 0xa7, 0xce, 0xa6,
-	0x70, 0x0e, 0xcd, 0xa2, 0x7a, 0x6f, 0x26, 0x6f, 0x89, 0xa3, 0x05, 0xf9, 0xdf, 0xe4, 0xa9, 0x6a,
-	0x33, 0xee, 0x2f, 0x0b, 0x6a, 0xc3, 0x30, 0x25, 0x9c, 0xa3, 0x47, 0xb0, 0x11, 0xd3, 0xe0, 0x38,
-	0xc6, 0x73, 0xf3, 0x55, 0x73, 0xed, 0xab, 0xcc, 0xce, 0x7d, 0xab, 0xcc, 0xde, 0xd2, 0x9f, 0x88,
-	0xb5, 0xc7, 0xf1, 0xf2, 0x20, 0xfa, 0x06, 0x2a, 0x09, 0x21, 0xa9, 0xc2, 0xd4, 0x74, 0x9f, 0x5c,
-	0x65, 0xb6, 0xb2, 0x57, 0x99, 0xdd, 0xd0, 0x45, 0xd2, 0x72, 0xfe, 0xcc, 0xec, 0x07, 0xb7, 0x80,
-	0xd9, 0x0f, 0x82, 0xfe, 0x74, 0x2a, 0x41, 0x79, 0xaa, 0x0b, 0xf2, 0xa0, 0x71, 0xad, 0xa8, 0xfe,
-	0x76, 0xd6, 0xdd, 0x83, 0x8b, 0xcc, 0x86, 0x5c, 0x78, 0x7e, 0x95, 0xd9, 0x90, 0x8b, 0xcc, 0x57,
-	0x99, 0xfd, 0x9e, 0x19, 0x9c, 0xfb, 0x1c, 0xaf, 0x90, 0xa0, 0xf6, 0x2f, 0x39, 0x02, 0xd0, 0x58,
-	0x5e, 0xea, 0xb1, 0x60, 0x29, 0xe9, 0xa7, 0x82, 0xce, 0x70, 0x20, 0xd0, 0x7d, 0xa8, 0x14, 0x68,
-	0xb8, 0x2b, 0xb7, 0x31, 0x14, 0x98, 0x6d, 0xf4, 0xfa, 0xca, 0x29, 0x93, 0xa7, 0x58, 0x60, 0xb3,
-	0xba, 0x4a, 0x96, 0xf6, 0x75, 0xb2, 0xb4, 0x1c, 0x4f, 0x39, 0xf5, 0x54, 0xf7, 0xf0, 0xe5, 0x45,
-	0xdb, 0x7a, 0x75, 0xd1, 0xb6, 0x5e, 0x5f, 0xb4, 0xad, 0x1f, 0x2f, 0xdb, 0xa5, 0x57, 0x97, 0xed,
-	0xd2, 0xaf, 0x97, 0xed, 0xd2, 0xd7, 0x8f, 0x0a, 0xf4, 0xf4, 0xf5, 0xef, 0x4d, 0xbf, 0x7b, 0x8a,
-	0x9e, 0x90, 0x45, 0x38, 0x0e, 0xd7, 0xbc, 0x9d, 0x5e, 0xff, 0xf9, 0x14, 0x6f, 0x93, 0x9a, 0xfa,
-	0x61, 0x7d, 0xf2, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0xec, 0x66, 0x1a, 0x0f, 0x19, 0x07, 0x00,
-	0x00,
+	// 951 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0xcb, 0x6f, 0x1b, 0x45,
+	0x1c, 0xf6, 0xe2, 0x07, 0xf1, 0xd8, 0x6d, 0xd2, 0x21, 0xa2, 0x4e, 0x44, 0xbd, 0xd1, 0x9e, 0x22,
+	0xaa, 0xd8, 0x0d, 0x0f, 0x21, 0xb9, 0x42, 0xc2, 0x6b, 0xa5, 0xaa, 0x84, 0x8a, 0xdc, 0xb5, 0xc2,
+	0x01, 0x8a, 0x56, 0xe3, 0xf5, 0x78, 0x3b, 0xc9, 0xee, 0xcc, 0x76, 0x67, 0xec, 0x24, 0xfd, 0x0b,
+	0x10, 0x27, 0xc4, 0x89, 0x63, 0xce, 0x9c, 0x38, 0xf0, 0x1f, 0x70, 0xa9, 0x38, 0xf5, 0x88, 0x38,
+	0x2c, 0x55, 0x72, 0x00, 0xe5, 0xe8, 0x23, 0x12, 0x12, 0x9a, 0x87, 0x37, 0xab, 0xa6, 0x88, 0x5e,
+	0xb8, 0xd8, 0xf3, 0x7b, 0x7f, 0xdf, 0xf7, 0x9b, 0xdd, 0x05, 0x6d, 0x14, 0xb2, 0x94, 0x04, 0x5d,
+	0x7e, 0x44, 0x68, 0xc8, 0xb1, 0xc8, 0x0f, 0x9d, 0x24, 0x65, 0x82, 0xc1, 0x55, 0x1d, 0xef, 0x2c,
+	0xdd, 0x9b, 0xeb, 0x21, 0x0b, 0x99, 0x8a, 0x75, 0xe5, 0x49, 0xa7, 0x6d, 0xb6, 0x03, 0xc6, 0x63,
+	0xc6, 0xbb, 0x63, 0xc4, 0x71, 0x77, 0xbe, 0x3b, 0xc6, 0x02, 0xed, 0x76, 0x03, 0x46, 0xa8, 0x89,
+	0x6f, 0xe8, 0xb8, 0xaf, 0x0b, 0xb5, 0x61, 0x42, 0x37, 0x50, 0x4c, 0x28, 0xeb, 0xaa, 0x5f, 0xed,
+	0x72, 0x7e, 0xb6, 0xc0, 0xda, 0x80, 0xa5, 0x78, 0x6f, 0x8e, 0xa2, 0x61, 0xca, 0x12, 0xc6, 0x51,
+	0x04, 0xd7, 0x41, 0x55, 0x10, 0x11, 0xe1, 0x96, 0xb5, 0x65, 0x6d, 0xd7, 0x3d, 0x6d, 0xc0, 0x2d,
+	0xd0, 0x98, 0x60, 0x1e, 0xa4, 0x24, 0x11, 0x84, 0xd1, 0xd6, 0x1b, 0x2a, 0x56, 0x74, 0xc1, 0x0f,
+	0x41, 0x15, 0xcf, 0x51, 0xc4, 0x5b, 0xe5, 0xad, 0xf2, 0x76, 0xe3, 0xbd, 0x8d, 0xce, 0x4b, 0x8c,
+	0x3a, 0xcb, 0x49, 0x6e, 0xe5, 0x59, 0x66, 0x97, 0x3c, 0x9d, 0xdd, 0xfb, 0xe4, 0xeb, 0x53, 0xbb,
+	0xf4, 0xcb, 0x4f, 0x3b, 0x9b, 0x06, 0x6c, 0xc8, 0xe6, 0x1d, 0x43, 0xac, 0x33, 0x60, 0x54, 0x60,
+	0x2a, 0xbe, 0xf9, 0xe3, 0xc7, 0x77, 0x37, 0x72, 0xe1, 0x5e, 0x06, 0xec, 0x70, 0xb0, 0xb2, 0xf4,
+	0xc1, 0x1e, 0x68, 0x1e, 0x70, 0x46, 0xfd, 0x04, 0xa7, 0x31, 0x11, 0x5c, 0x73, 0x70, 0x6f, 0x2e,
+	0x32, 0xfb, 0xad, 0x13, 0x14, 0x47, 0x3d, 0xa7, 0x18, 0x75, 0xbc, 0x86, 0x34, 0x87, 0xda, 0x82,
+	0xb7, 0xc1, 0x9b, 0x07, 0xdc, 0x0f, 0xd8, 0x04, 0x6b, 0x7a, 0x2e, 0x5c, 0x64, 0xf6, 0xf5, 0x65,
+	0x99, 0x0a, 0x38, 0x5e, 0xed, 0x80, 0x0f, 0xe4, 0xe1, 0x45, 0x19, 0xd4, 0x86, 0x28, 0x45, 0x31,
+	0x87, 0xf7, 0xc1, 0xf5, 0x31, 0x46, 0x94, 0xcb, 0xb6, 0xfe, 0x8c, 0x12, 0xd1, 0xb2, 0x94, 0x02,
+	0xef, 0x5c, 0x51, 0x60, 0x24, 0x52, 0x42, 0x43, 0x57, 0x26, 0x1b, 0x11, 0x9a, 0xaa, 0x72, 0x88,
+	0xd3, 0x7d, 0x4a, 0x04, 0x7c, 0x02, 0xae, 0x4f, 0x31, 0x56, 0x3d, 0xfc, 0x24, 0x25, 0x81, 0x04,
+	0xa2, 0xb5, 0x34, 0xe2, 0xc8, 0xb5, 0x17, 0xd4, 0x21, 0xd4, 0xbd, 0x23, 0xdb, 0xfc, 0xf0, 0xbb,
+	0xbd, 0x1d, 0x12, 0xf1, 0x78, 0x36, 0xee, 0x04, 0x2c, 0x36, 0x6b, 0x37, 0x7f, 0x3b, 0x7c, 0x72,
+	0xd8, 0x15, 0x27, 0x09, 0xe6, 0xaa, 0x80, 0x7b, 0xcd, 0x29, 0xc6, 0x72, 0xda, 0x50, 0x0e, 0x80,
+	0x77, 0xc0, 0xfa, 0x98, 0x31, 0xc1, 0x45, 0x8a, 0x12, 0x7f, 0x8e, 0x84, 0x1f, 0x30, 0x3a, 0x25,
+	0x61, 0xab, 0xac, 0x16, 0x0c, 0xf3, 0xd8, 0xe7, 0x48, 0x0c, 0x54, 0x04, 0x7e, 0x0a, 0x56, 0x13,
+	0x76, 0x84, 0x53, 0x7f, 0x1a, 0xa1, 0xd0, 0x9f, 0x62, 0xcc, 0x5b, 0x15, 0x85, 0xf2, 0xd6, 0x15,
+	0xbe, 0x43, 0x99, 0x77, 0x2f, 0x42, 0xe1, 0x3d, 0x8c, 0x0d, 0xe1, 0x6b, 0x49, 0xc1, 0xc7, 0xe1,
+	0xc7, 0xa0, 0xfe, 0x64, 0x86, 0x67, 0xd8, 0x8f, 0xd1, 0x71, 0xab, 0xaa, 0xda, 0x6c, 0x5e, 0x69,
+	0xf3, 0x50, 0x66, 0x8c, 0xc8, 0xd3, 0x65, 0x8f, 0x15, 0x55, 0xf2, 0x00, 0x1d, 0xc3, 0x87, 0x00,
+	0x2a, 0xcc, 0x11, 0x46, 0x74, 0x96, 0xf8, 0xe3, 0xd9, 0x24, 0xc4, 0xa2, 0x55, 0xfb, 0x17, 0x38,
+	0xfb, 0x84, 0x8a, 0x07, 0x28, 0xd9, 0xa3, 0x22, 0x3d, 0x31, 0xad, 0xd6, 0xe6, 0x48, 0x0c, 0x74,
+	0xb5, 0xab, 0x8a, 0x7b, 0x2b, 0xdf, 0x9f, 0xda, 0xa5, 0x3f, 0x4f, 0x6d, 0xcb, 0xf9, 0x0c, 0x54,
+	0x47, 0x02, 0x09, 0x0c, 0xf7, 0xc0, 0x35, 0x0d, 0x12, 0x45, 0x11, 0x3b, 0xc2, 0x13, 0xb3, 0xdf,
+	0xff, 0x06, 0xda, 0x54, 0x65, 0x7d, 0x5d, 0xe5, 0x7c, 0x09, 0x1a, 0x85, 0x0b, 0x00, 0xd7, 0x40,
+	0xf9, 0x10, 0x9f, 0x98, 0xa7, 0x4c, 0x1e, 0xe1, 0x07, 0xa0, 0xaa, 0xae, 0x83, 0xb9, 0x7e, 0x6d,
+	0xd9, 0xe3, 0xb7, 0xcc, 0x7e, 0x5b, 0x2f, 0x92, 0x4f, 0x0e, 0x3b, 0x84, 0x75, 0x63, 0x24, 0x1e,
+	0x2b, 0x26, 0x9e, 0x4e, 0xee, 0x55, 0x14, 0xd8, 0xef, 0x2c, 0xd0, 0x2c, 0xca, 0x0d, 0x6f, 0x01,
+	0x70, 0xb9, 0x26, 0x33, 0xa5, 0x9e, 0x8b, 0x0f, 0xbf, 0x02, 0xe5, 0x29, 0xfe, 0x5f, 0xee, 0x97,
+	0xec, 0x6b, 0x40, 0x7d, 0x04, 0xea, 0xb9, 0x24, 0xaf, 0xe0, 0x0b, 0x41, 0x85, 0x93, 0xa7, 0xfa,
+	0x69, 0xab, 0x7a, 0xea, 0x6c, 0x0a, 0x1f, 0x81, 0x66, 0x71, 0x59, 0xaf, 0xd6, 0x6a, 0x8e, 0xa2,
+	0x19, 0x7e, 0x5d, 0xad, 0x54, 0xb2, 0xe9, 0xfe, 0xb7, 0x05, 0x6a, 0x7b, 0x61, 0x8a, 0x39, 0x87,
+	0x77, 0xc1, 0x0a, 0x25, 0xc1, 0x21, 0x45, 0xb1, 0x79, 0xdf, 0xb9, 0xf6, 0x45, 0x66, 0xe7, 0xbe,
+	0x45, 0x66, 0xaf, 0xea, 0x17, 0xc0, 0xd2, 0xe3, 0x78, 0x79, 0x10, 0x3e, 0x02, 0x95, 0x04, 0xe3,
+	0x54, 0x41, 0x68, 0xba, 0xf7, 0x2f, 0x32, 0x5b, 0xd9, 0x8b, 0xcc, 0x6e, 0xe8, 0x22, 0x69, 0x39,
+	0x7f, 0x65, 0xf6, 0xce, 0x6b, 0x88, 0xd7, 0x0f, 0x82, 0xfe, 0x64, 0x22, 0x41, 0x79, 0xaa, 0x0b,
+	0xf4, 0x40, 0xe3, 0x72, 0x81, 0xfa, 0xad, 0x5a, 0x77, 0x77, 0xcf, 0x32, 0x1b, 0xe4, 0x7b, 0xe6,
+	0x17, 0x99, 0x0d, 0xf2, 0x9d, 0xf2, 0x45, 0x66, 0xdf, 0x30, 0x83, 0x73, 0x9f, 0xe3, 0x15, 0x12,
+	0x14, 0xff, 0x92, 0x23, 0x00, 0x1c, 0xc9, 0x2b, 0x3b, 0x12, 0x2c, 0xc5, 0xfd, 0x54, 0x90, 0x29,
+	0x0a, 0x04, 0xbc, 0x0d, 0x2a, 0x05, 0x19, 0x6e, 0x4a, 0x36, 0x46, 0x02, 0xc3, 0x46, 0xd3, 0x57,
+	0x4e, 0x99, 0x3c, 0x41, 0x02, 0x19, 0xea, 0x2a, 0x59, 0xda, 0x97, 0xc9, 0xd2, 0x72, 0x3c, 0xe5,
+	0xd4, 0x53, 0xdd, 0xfd, 0x67, 0x67, 0x6d, 0xeb, 0xf9, 0x59, 0xdb, 0x7a, 0x71, 0xd6, 0xb6, 0xbe,
+	0x3d, 0x6f, 0x97, 0x9e, 0x9f, 0xb7, 0x4b, 0xbf, 0x9e, 0xb7, 0x4b, 0x5f, 0xdc, 0x2d, 0xc8, 0xd3,
+	0xd7, 0x9f, 0x49, 0xfd, 0x64, 0x29, 0x79, 0x42, 0x16, 0x21, 0x1a, 0x2e, 0x75, 0x3b, 0xbe, 0xfc,
+	0x82, 0x2a, 0xdd, 0xc6, 0x35, 0xf5, 0x29, 0x7b, 0xff, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x42,
+	0x9d, 0xe4, 0x1c, 0x61, 0x07, 0x00, 0x00,
 }
 
 func (this *Params) Equal(that interface{}) bool {

package/x/vbank/genesis.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/vbank/types"
-	abci "github.com/cometbft/cometbft/abci/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
@@ -29,15 +28,20 @@ func DefaultGenesisState() *types.GenesisState {
 	}
 }
 
-func InitGenesis(ctx sdk.Context, keeper Keeper, data *types.GenesisState) []abci.ValidatorUpdate {
+func InitGenesis(ctx sdk.Context, keeper Keeper, data *types.GenesisState) {
 	keeper.SetParams(ctx, data.GetParams())
 	keeper.SetState(ctx, data.GetState())
-	return []abci.ValidatorUpdate{}
 }
 
-func ExportGenesis(ctx sdk.Context, k Keeper) *types.GenesisState {
-	var gs types.GenesisState
-	gs.Params = k.GetParams(ctx)
-	gs.State = k.GetState(ctx)
-	return &gs
+func ExportGenesis(ctx sdk.Context, k Keeper) (*types.GenesisState, error) {
+	params := k.GetParams(ctx)
+	state, err := k.GetState(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to export vbank state: %s", err)
+	}
+	gs := &types.GenesisState{
+		Params: params,
+		State:  state,
+	}
+	return gs, nil
 }

package/x/vbank/handler.go

@@ -4,12 +4,13 @@ import (
 	"fmt"
 
 	sdkioerrors "cosmossdk.io/errors"
+	"github.com/cosmos/cosmos-sdk/baseapp"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
 
 // NewHandler returns a handler for "vbank" type messages.
-func NewHandler(keeper Keeper) sdk.Handler {
+func NewHandler(keeper Keeper) baseapp.MsgServiceHandler {
 	return func(ctx sdk.Context, msg sdk.Msg) (*sdk.Result, error) {
 		switch msg := msg.(type) {
 		default:

package/x/vbank/keeper/grpc_query.go

@@ -21,7 +21,10 @@ func (k Keeper) Params(c context.Context, req *types.QueryParamsRequest) (*types
 // State queries state of distribution module
 func (k Keeper) State(c context.Context, req *types.QueryStateRequest) (*types.QueryStateResponse, error) {
 	ctx := sdk.UnwrapSDKContext(c)
-	state := k.GetState(ctx)
+	state, err := k.GetState(ctx)
+	if err != nil {
+		return nil, err
+	}
 
 	return &types.QueryStateResponse{State: state}, nil
 }

package/x/vbank/keeper/keeper.go

@@ -1,9 +1,16 @@
 package keeper
 
 import (
+	"context"
+
+	"cosmossdk.io/core/address"
+	storetypes "cosmossdk.io/core/store"
+	sdkerrors "cosmossdk.io/errors"
+	"cosmossdk.io/store/prefix"
 	"github.com/cosmos/cosmos-sdk/codec"
-	storetypes "github.com/cosmos/cosmos-sdk/store/types"
+	"github.com/cosmos/cosmos-sdk/runtime"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	sdktypeserrors "github.com/cosmos/cosmos-sdk/types/errors"
 
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/vbank/types"
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
@@ -13,21 +20,32 @@ import (
 
 const stateKey string = "state"
 
+// addressToUpdatePrefix is a map of addresses to the set of denoms that need a
+// balance update. The denoms are stored as Coins, but we only use the denoms,
+// not the amounts.  This is in a transient store, so it is not persisted across
+// blocks.
+const addressToUpdatePrefix string = "addressToUpdate"
+
 // Keeper maintains the link to data storage and exposes getter/setter methods for the various parts of the state machine
 type Keeper struct {
-	storeKey   storetypes.StoreKey
-	cdc        codec.Codec
-	paramSpace paramtypes.Subspace
+	storeService  storetypes.KVStoreService
+	tstoreService storetypes.TransientStoreService
+	cdc           codec.Codec
+	paramSpace    paramtypes.Subspace
 
 	accountKeeper         types.AccountKeeper
 	bankKeeper            types.BankKeeper
 	rewardDistributorName string
 	PushAction            vm.ActionPusher
+	AddressToUpdate       map[string]sdk.Coins // address string -> Coins
 }
 
 // NewKeeper creates a new vbank Keeper instance
 func NewKeeper(
-	cdc codec.Codec, key storetypes.StoreKey, paramSpace paramtypes.Subspace,
+	cdc codec.Codec,
+	storeService storetypes.KVStoreService,
+	tstoreService storetypes.TransientStoreService,
+	paramSpace paramtypes.Subspace,
 	accountKeeper types.AccountKeeper, bankKeeper types.BankKeeper,
 	rewardDistributorName string,
 	pushAction vm.ActionPusher,
@@ -38,8 +56,9 @@ func NewKeeper(
 		paramSpace = paramSpace.WithKeyTable(types.ParamKeyTable())
 	}
 
-	return Keeper{
-		storeKey:              key,
+	k := Keeper{
+		storeService:          storeService,
+		tstoreService:         tstoreService,
 		cdc:                   cdc,
 		paramSpace:            paramSpace,
 		accountKeeper:         accountKeeper,
@@ -47,6 +66,52 @@ func NewKeeper(
 		rewardDistributorName: rewardDistributorName,
 		PushAction:            pushAction,
 	}
+
+	k.bankKeeper.AppendSendRestriction(k.monitorSend)
+	return k
+}
+
+func (k Keeper) monitorSend(
+	ctx context.Context, fromAddr, toAddr sdk.AccAddress, amt sdk.Coins,
+) (sdk.AccAddress, error) {
+	sdkCtx := sdk.UnwrapSDKContext(ctx)
+	adStore := k.OpenAddressToUpdateStore(sdkCtx)
+	if err := k.ensureAddressUpdate(adStore, fromAddr, amt); err != nil {
+		return nil, sdkerrors.Wrap(sdktypeserrors.ErrInvalidRequest, err.Error())
+	}
+	if err := k.ensureAddressUpdate(adStore, toAddr, amt); err != nil {
+		return nil, sdkerrors.Wrap(sdktypeserrors.ErrInvalidRequest, err.Error())
+	}
+	return toAddr, nil
+}
+
+// records that we want to emit a balance update for the address
+// for the given denoms. We use the Coins only to track the set of
+// denoms, not for the amounts.
+func (k Keeper) ensureAddressUpdate(adStore prefix.Store, address sdk.AccAddress, denoms sdk.Coins) error {
+	if denoms.IsZero() {
+		return nil
+	}
+
+	var newDenoms sdk.Coins
+
+	// Get the existing denoms for the address, or create a new set if it doesn't exist
+	if adStore.Has(address) {
+		// If we have existing denoms, parse them
+		bz := adStore.Get(address)
+		currentDenoms, err := sdk.ParseCoinsNormalized(string(bz))
+		if err != nil {
+			return sdkerrors.Wrap(sdktypeserrors.ErrInvalidRequest, err.Error())
+		}
+		newDenoms = currentDenoms
+	}
+
+	newDenoms = newDenoms.Add(denoms...)
+
+	// ensure the denoms are sorted before we store them
+	str := newDenoms.Sort().String()
+	adStore.Set(address, []byte(str))
+	return nil
 }
 
 func (k Keeper) GetBalance(ctx sdk.Context, addr sdk.AccAddress, denom string) sdk.Coin {
@@ -87,9 +152,13 @@ func (k Keeper) GetModuleAccountAddress(ctx sdk.Context, name string) sdk.AccAdd
 	return acct.GetAddress()
 }
 
-func (k Keeper) IsAllowedMonitoringAccount(ctx sdk.Context, addr sdk.AccAddress) bool {
+func (k Keeper) AddressCodec() address.Codec {
+	return k.accountKeeper.AddressCodec()
+}
+
+func (k Keeper) IsAllowedMonitoringAccount(ctx sdk.Context, addr string) bool {
 	params := k.GetParams(ctx)
-	return params.IsAllowedMonitoringAccount(addr.String())
+	return params.IsAllowedMonitoringAccount(addr)
 }
 
 func (k Keeper) GetParams(ctx sdk.Context) (params types.Params) {
@@ -101,23 +170,39 @@ func (k Keeper) SetParams(ctx sdk.Context, params types.Params) {
 	k.paramSpace.SetParamSet(ctx, &params)
 }
 
-func (k Keeper) GetState(ctx sdk.Context) types.State {
-	store := ctx.KVStore(k.storeKey)
-	bz := store.Get([]byte(stateKey))
-	state := types.State{}
-	k.cdc.MustUnmarshal(bz, &state)
-	return state
+func (k Keeper) GetState(ctx sdk.Context) (types.State, error) {
+	store := k.storeService.OpenKVStore(ctx)
+	var state types.State
+	bz, err := store.Get([]byte(stateKey))
+	if err != nil {
+		return state, err
+	}
+	return state, k.cdc.Unmarshal(bz, &state)
 }
 
-func (k Keeper) SetState(ctx sdk.Context, state types.State) {
-	store := ctx.KVStore(k.storeKey)
-	bz := k.cdc.MustMarshal(&state)
-	store.Set([]byte(stateKey), bz)
+func (k Keeper) SetState(ctx sdk.Context, state types.State) error {
+	store := k.storeService.OpenKVStore(ctx)
+	bz, err := k.cdc.Marshal(&state)
+	if err != nil {
+		return err
+	}
+	return store.Set([]byte(stateKey), bz)
 }
 
-func (k Keeper) GetNextSequence(ctx sdk.Context) uint64 {
-	state := k.GetState(ctx)
+func (k Keeper) GetNextSequence(ctx sdk.Context) (uint64, error) {
+	state, err := k.GetState(ctx)
+	if err != nil {
+		return 0, err
+	}
 	state.LastSequence = state.GetLastSequence() + 1
-	k.SetState(ctx, state)
-	return state.LastSequence
+	return state.LastSequence, k.SetState(ctx, state)
+}
+
+func (k Keeper) OpenAddressToUpdateStore(ctx sdk.Context) prefix.Store {
+	store := k.tstoreService.OpenTransientStore(ctx)
+	if store == nil {
+		panic("transient store is nil")
+	}
+	kvstore := runtime.KVStoreAdapter(store)
+	return prefix.NewStore(kvstore, []byte(addressToUpdatePrefix))
 }

package/x/vbank/keeper/querier.go

@@ -21,7 +21,10 @@ func queryParams(ctx sdk.Context, _ []string, _ abci.RequestQuery, k Keeper, leg
 }
 
 func queryState(ctx sdk.Context, _ []string, _ abci.RequestQuery, k Keeper, legacyQuerierCdc *codec.LegacyAmino) ([]byte, error) {
-	state := k.GetState(ctx)
+	state, err := k.GetState(ctx)
+	if err != nil {
+		return nil, err
+	}
 
 	res, err := codec.MarshalJSONIndent(legacyQuerierCdc, state)
 	if err != nil {

package/x/vbank/keeper/rewards.go

@@ -3,6 +3,7 @@ package keeper
 import (
 	"strings"
 
+	sdkmath "cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
@@ -32,7 +33,7 @@ func minCoins(a, b sdk.Coins) sdk.Coins {
 	return sdk.NewCoins(min...)
 }
 
-func mulCoins(a sdk.Coins, b sdk.Dec) sdk.Coins {
+func mulCoins(a sdk.Coins, b sdkmath.LegacyDec) sdk.Coins {
 	coins := make([]sdk.Coin, 0, len(a))
 	for _, coin := range a {
 		amount := b.MulInt(coin.Amount).TruncateInt()
@@ -46,7 +47,10 @@ func mulCoins(a sdk.Coins, b sdk.Dec) sdk.Coins {
 // DistributeRewards drives the rewards state machine.
 func (k Keeper) DistributeRewards(ctx sdk.Context) error {
 	// Distribute rewards.
-	state := k.GetState(ctx)
+	state, err := k.GetState(ctx)
+	if err != nil {
+		return err
+	}
 	params := k.GetParams(ctx)
 
 	smoothingBlocks := params.GetSmoothingBlocks()