diff --git a/proto/sedachain/data_proxy/v1/data_proxy.proto b/proto/sedachain/data_proxy/v1/data_proxy.proto index 05159b0d..aee87d81 100644 --- a/proto/sedachain/data_proxy/v1/data_proxy.proto +++ b/proto/sedachain/data_proxy/v1/data_proxy.proto @@ -33,14 +33,14 @@ message ProxyConfig { // fee_update defines an upcoming fee change which will take effect at a // future height. - FeeUpdate fee_update = 5 [ (gogoproto.nullable) = true ]; + FeeUpdate fee_update = 5; } // FeeUpdate defines a new fee amount and the height at which it will take // effect. message FeeUpdate { // new_fee defines the new fee for the data proxy. - cosmos.base.v1beta1.Coin new_fee = 1 [ (gogoproto.nullable) = false ]; + cosmos.base.v1beta1.Coin new_fee = 1; // update_height defines the height after which the new fee comes into effect. int64 update_height = 2; diff --git a/proto/sedachain/data_proxy/v1/tx.proto b/proto/sedachain/data_proxy/v1/tx.proto index de7945f0..85045f8f 100644 --- a/proto/sedachain/data_proxy/v1/tx.proto +++ b/proto/sedachain/data_proxy/v1/tx.proto @@ -66,7 +66,7 @@ message MsgEditDataProxy { string new_memo = 3; - cosmos.base.v1beta1.Coin new_fee = 4 [ (gogoproto.nullable) = true ]; + cosmos.base.v1beta1.Coin new_fee = 4; // 0 will default to the minimum delay configured in the params uint32 fee_update_delay = 5; diff --git a/x/data-proxy/keeper/abci.go b/x/data-proxy/keeper/abci.go index 901ddd04..0221cfc6 100644 --- a/x/data-proxy/keeper/abci.go +++ b/x/data-proxy/keeper/abci.go @@ -41,7 +41,7 @@ func (k *Keeper) ProcessFeeUpdates(ctx sdk.Context) error { return err } - proxyConfig.Fee = &proxyConfig.FeeUpdate.NewFee + proxyConfig.Fee = proxyConfig.FeeUpdate.NewFee proxyConfig.FeeUpdate = nil if err := k.DataProxyConfigs.Set(ctx, pubkey, proxyConfig); err != nil { diff --git a/x/data-proxy/keeper/genesis_test.go b/x/data-proxy/keeper/genesis_test.go index c349cd1c..98bee51b 100644 --- a/x/data-proxy/keeper/genesis_test.go +++ b/x/data-proxy/keeper/genesis_test.go @@ -34,7 +34,7 @@ func (s *KeeperTestSuite) TestImportExportGenesis() { Fee: s.NewFeeFromString("5000"), Memo: "not my proxy friend", FeeUpdate: &types.FeeUpdate{ - NewFee: *s.NewFeeFromString("10000"), + NewFee: s.NewFeeFromString("10000"), UpdateHeight: 500, }, }, diff --git a/x/data-proxy/keeper/grpc_query_test.go b/x/data-proxy/keeper/grpc_query_test.go index 81a8c8d3..fd255ba7 100644 --- a/x/data-proxy/keeper/grpc_query_test.go +++ b/x/data-proxy/keeper/grpc_query_test.go @@ -38,7 +38,7 @@ func (s *KeeperTestSuite) TestQuerier_ProxyConfig() { Fee: &sdk.Coin{Denom: "aseda", Amount: math.NewInt(5)}, Memo: "", FeeUpdate: &types.FeeUpdate{ - NewFee: sdk.Coin{Denom: "aseda", Amount: math.NewInt(10)}, + NewFee: &sdk.Coin{Denom: "aseda", Amount: math.NewInt(10)}, UpdateHeight: 6, }, }, diff --git a/x/data-proxy/keeper/keeper.go b/x/data-proxy/keeper/keeper.go index 36b09526..80275f65 100644 --- a/x/data-proxy/keeper/keeper.go +++ b/x/data-proxy/keeper/keeper.go @@ -88,7 +88,7 @@ func (k Keeper) processProxyFeeUpdate(ctx sdk.Context, pubKeyBytes []byte, proxy // Determine update height updateHeight := ctx.BlockHeight() + int64(updateDelay) feeUpdate := &types.FeeUpdate{ - NewFee: *newFee, + NewFee: newFee, UpdateHeight: updateHeight, } diff --git a/x/data-proxy/keeper/keeper_test.go b/x/data-proxy/keeper/keeper_test.go index 535d21e7..771a0c1a 100644 --- a/x/data-proxy/keeper/keeper_test.go +++ b/x/data-proxy/keeper/keeper_test.go @@ -23,7 +23,7 @@ func (s *KeeperTestSuite) TestKeeper_EndBlockFeeUpdate() { Memo: "test", FeeUpdate: &types.FeeUpdate{ UpdateHeight: 0, - NewFee: *s.NewFeeFromString("987654321"), + NewFee: s.NewFeeFromString("987654321"), }, AdminAddress: "seda1uea9km4nup9q7qu96ak683kc67x9jf7ste45z5", }) @@ -77,7 +77,7 @@ func (s *KeeperTestSuite) TestKeeper_EndBlockFeeUpdate() { Memo: "test", FeeUpdate: &types.FeeUpdate{ UpdateHeight: updateHeight, - NewFee: *s.NewFeeFromString("30"), + NewFee: s.NewFeeFromString("30"), }, AdminAddress: "seda1uea9km4nup9q7qu96ak683kc67x9jf7ste45z5", }) @@ -99,12 +99,12 @@ func (s *KeeperTestSuite) TestKeeper_EndBlockFeeUpdate() { Memo: "test", FeeUpdate: &types.FeeUpdate{ UpdateHeight: 1, - NewFee: *s.NewFeeFromString("30"), + NewFee: s.NewFeeFromString("30"), }, AdminAddress: "seda1uea9km4nup9q7qu96ak683kc67x9jf7ste45z5", } if i < 5 { - expected.Fee = &expected.FeeUpdate.NewFee + expected.Fee = expected.FeeUpdate.NewFee expected.FeeUpdate = nil } @@ -138,12 +138,12 @@ func (s *KeeperTestSuite) TestKeeper_EndBlockFeeUpdate() { Memo: "test", FeeUpdate: &types.FeeUpdate{ UpdateHeight: 1, - NewFee: *s.NewFeeFromString("30"), + NewFee: s.NewFeeFromString("30"), }, AdminAddress: "seda1uea9km4nup9q7qu96ak683kc67x9jf7ste45z5", } - expected.Fee = &expected.FeeUpdate.NewFee + expected.Fee = expected.FeeUpdate.NewFee expected.FeeUpdate = nil s.Require().Equal(expected, proxyConfig) diff --git a/x/data-proxy/keeper/msg_server_test.go b/x/data-proxy/keeper/msg_server_test.go index 26d2b3b7..f519137e 100644 --- a/x/data-proxy/keeper/msg_server_test.go +++ b/x/data-proxy/keeper/msg_server_test.go @@ -252,7 +252,7 @@ func (s *KeeperTestSuite) TestMsgServer_EditDataProxy() { Fee: s.NewFeeFromString("9"), Memo: "test", FeeUpdate: &types.FeeUpdate{ - NewFee: *s.NewFeeFromString("1337"), + NewFee: s.NewFeeFromString("1337"), // Height in test is 0, so update height should be minimum UpdateHeight: int64(types.DefaultMinFeeUpdateDelay), }, @@ -275,7 +275,7 @@ func (s *KeeperTestSuite) TestMsgServer_EditDataProxy() { Fee: s.NewFeeFromString("9"), Memo: "test", FeeUpdate: &types.FeeUpdate{ - NewFee: *s.NewFeeFromString("1337"), + NewFee: s.NewFeeFromString("1337"), UpdateHeight: int64(types.DefaultMinFeeUpdateDelay + 100), }, AdminAddress: "seda1uea9km4nup9q7qu96ak683kc67x9jf7ste45z5", diff --git a/x/data-proxy/types/data_proxy.pb.go b/x/data-proxy/types/data_proxy.pb.go index 0c51fa9b..cf3d8b50 100644 --- a/x/data-proxy/types/data_proxy.pb.go +++ b/x/data-proxy/types/data_proxy.pb.go @@ -160,7 +160,7 @@ func (m *ProxyConfig) GetFeeUpdate() *FeeUpdate { // effect. type FeeUpdate struct { // new_fee defines the new fee for the data proxy. - NewFee types.Coin `protobuf:"bytes,1,opt,name=new_fee,json=newFee,proto3" json:"new_fee"` + NewFee *types.Coin `protobuf:"bytes,1,opt,name=new_fee,json=newFee,proto3" json:"new_fee,omitempty"` // update_height defines the height after which the new fee comes into effect. UpdateHeight int64 `protobuf:"varint,2,opt,name=update_height,json=updateHeight,proto3" json:"update_height,omitempty"` } @@ -198,11 +198,11 @@ func (m *FeeUpdate) XXX_DiscardUnknown() { var xxx_messageInfo_FeeUpdate proto.InternalMessageInfo -func (m *FeeUpdate) GetNewFee() types.Coin { +func (m *FeeUpdate) GetNewFee() *types.Coin { if m != nil { return m.NewFee } - return types.Coin{} + return nil } func (m *FeeUpdate) GetUpdateHeight() int64 { @@ -223,35 +223,34 @@ func init() { } var fileDescriptor_ce367ef351b38f5e = []byte{ - // 436 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x52, 0xc1, 0x6e, 0xd3, 0x40, - 0x10, 0xcd, 0x92, 0x10, 0x94, 0x6d, 0x83, 0xc4, 0x2a, 0x12, 0x6e, 0x0f, 0x6e, 0x15, 0x2e, 0x91, - 0x50, 0x76, 0x15, 0x10, 0x12, 0xe2, 0x52, 0x91, 0xa2, 0xc2, 0x8d, 0xca, 0x88, 0x0b, 0x17, 0x6b, - 0x63, 0x8f, 0xed, 0x45, 0xf5, 0xae, 0xe5, 0xdd, 0xa4, 0xf5, 0x5f, 0xf0, 0x09, 0x7c, 0x04, 0x1f, - 0xd1, 0x63, 0xc5, 0x89, 0x13, 0x42, 0xc9, 0x85, 0x9f, 0x40, 0x42, 0xbb, 0xeb, 0x84, 0x5e, 0xe8, - 0x6d, 0xe7, 0xbd, 0xe7, 0x99, 0xf7, 0xc6, 0x83, 0x27, 0x1a, 0x52, 0x9e, 0x14, 0x5c, 0x48, 0x96, - 0x72, 0xc3, 0xe3, 0xaa, 0x56, 0x57, 0x0d, 0x5b, 0xcd, 0x6e, 0x55, 0xb4, 0xaa, 0x95, 0x51, 0xe4, - 0xf1, 0x4e, 0x49, 0x6f, 0x71, 0xab, 0xd9, 0xe1, 0x28, 0x57, 0xb9, 0x72, 0x1a, 0x66, 0x5f, 0x5e, - 0x7e, 0x78, 0x90, 0x28, 0x5d, 0x2a, 0x1d, 0x7b, 0xc2, 0x17, 0x2d, 0x15, 0xfa, 0x8a, 0x2d, 0xb8, - 0x06, 0xb6, 0x9a, 0x2d, 0xc0, 0xf0, 0x19, 0x4b, 0x94, 0x90, 0x9e, 0x1f, 0x9f, 0xe0, 0xfe, 0x39, - 0xaf, 0x79, 0xa9, 0x09, 0xc3, 0xa3, 0x52, 0xc8, 0x38, 0x03, 0x88, 0x97, 0x55, 0xca, 0x0d, 0xc4, - 0x29, 0x5c, 0xf0, 0x26, 0x40, 0xc7, 0x68, 0x32, 0x8c, 0x1e, 0x95, 0x42, 0x9e, 0x01, 0x7c, 0x74, - 0xcc, 0x1b, 0x4b, 0xbc, 0xea, 0xfd, 0xfe, 0x7a, 0x84, 0xc6, 0x7f, 0x10, 0xde, 0x3b, 0xb7, 0xf6, - 0x4e, 0x95, 0xcc, 0x44, 0x4e, 0x4e, 0xf0, 0xc3, 0x8a, 0x37, 0x6a, 0x69, 0x62, 0x9e, 0xa6, 0x35, - 0x68, 0xed, 0x1a, 0x0c, 0xe6, 0xc1, 0xf7, 0x6f, 0xd3, 0x51, 0x6b, 0xed, 0xb5, 0x67, 0x3e, 0x98, - 0x5a, 0xc8, 0x3c, 0x1a, 0x7a, 0x7d, 0x0b, 0x92, 0xa7, 0xb8, 0x9b, 0x01, 0x04, 0xf7, 0x8e, 0xd1, - 0x64, 0xef, 0xd9, 0x01, 0x6d, 0x3f, 0xb1, 0xfe, 0x69, 0xeb, 0x9f, 0x9e, 0x2a, 0x21, 0x23, 0xab, - 0x22, 0x04, 0xf7, 0x4a, 0x28, 0x55, 0xd0, 0xb5, 0x33, 0x22, 0xf7, 0x26, 0x4f, 0xf0, 0x90, 0xa7, - 0x36, 0xca, 0xd6, 0x40, 0xcf, 0x91, 0xfb, 0x0e, 0xdc, 0x4e, 0x79, 0x8b, 0xf1, 0xbf, 0xa4, 0xc1, - 0x7d, 0x37, 0x6c, 0x4c, 0xff, 0xb3, 0x76, 0xba, 0x4b, 0x3e, 0xef, 0x5d, 0xff, 0x3c, 0x42, 0xd1, - 0x20, 0xdb, 0x02, 0xe3, 0xcf, 0x78, 0xb0, 0x63, 0xc9, 0x4b, 0xfc, 0x40, 0xc2, 0xa5, 0xdd, 0xa1, - 0x4b, 0x7d, 0x97, 0x7f, 0xd7, 0xa9, 0x13, 0xf5, 0x25, 0x5c, 0x9e, 0x01, 0x58, 0xd3, 0xed, 0xd6, - 0x0b, 0x10, 0x79, 0x61, 0x5c, 0xfe, 0x6e, 0xb4, 0xef, 0xc1, 0x77, 0x0e, 0x9b, 0xbf, 0xbf, 0x5e, - 0x87, 0xe8, 0x66, 0x1d, 0xa2, 0x5f, 0xeb, 0x10, 0x7d, 0xd9, 0x84, 0x9d, 0x9b, 0x4d, 0xd8, 0xf9, - 0xb1, 0x09, 0x3b, 0x9f, 0x5e, 0xe4, 0xc2, 0x14, 0xcb, 0x05, 0x4d, 0x54, 0xc9, 0x6c, 0x08, 0xf7, - 0x73, 0x13, 0x75, 0xe1, 0x8a, 0xa9, 0xbf, 0xb9, 0x2b, 0x77, 0x67, 0x53, 0x7f, 0x75, 0xa6, 0xa9, - 0x40, 0x2f, 0xfa, 0x4e, 0xf7, 0xfc, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x7e, 0xe3, 0x70, 0x28, - 0x9a, 0x02, 0x00, 0x00, + // 425 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x52, 0xc1, 0x6e, 0x13, 0x31, + 0x10, 0x8d, 0x49, 0x08, 0x8a, 0xdb, 0x20, 0x61, 0x45, 0x62, 0xdb, 0xc3, 0x52, 0x85, 0x4b, 0x24, + 0x14, 0x5b, 0x29, 0xe2, 0xc2, 0xa5, 0x6a, 0x8b, 0x2a, 0x6e, 0x54, 0x8b, 0xb8, 0x70, 0x59, 0x39, + 0xeb, 0xc9, 0xae, 0xa5, 0xae, 0xbd, 0x5a, 0x3b, 0x69, 0xf7, 0x2f, 0xf8, 0x04, 0x3e, 0x82, 0x8f, + 0xe0, 0x58, 0x71, 0xe2, 0x88, 0x92, 0x0b, 0x7f, 0xc0, 0x15, 0xd9, 0xde, 0x84, 0x5c, 0xe8, 0x6d, + 0xe6, 0xbd, 0xb7, 0x3b, 0xef, 0x8d, 0x07, 0x4f, 0x0c, 0x08, 0x9e, 0x15, 0x5c, 0x2a, 0x26, 0xb8, + 0xe5, 0x69, 0x55, 0xeb, 0xbb, 0x86, 0xad, 0x66, 0x7b, 0x1d, 0xad, 0x6a, 0x6d, 0x35, 0x79, 0xbe, + 0x53, 0xd2, 0x3d, 0x6e, 0x35, 0x3b, 0x1e, 0xe5, 0x3a, 0xd7, 0x5e, 0xc3, 0x5c, 0x15, 0xe4, 0xc7, + 0x47, 0x99, 0x36, 0xa5, 0x36, 0x69, 0x20, 0x42, 0xd3, 0x52, 0x71, 0xe8, 0xd8, 0x9c, 0x1b, 0x60, + 0xab, 0xd9, 0x1c, 0x2c, 0x9f, 0xb1, 0x4c, 0x4b, 0x15, 0xf8, 0xf1, 0x19, 0xee, 0x5f, 0xf3, 0x9a, + 0x97, 0x86, 0x30, 0x3c, 0x2a, 0xa5, 0x4a, 0x17, 0x00, 0xe9, 0xb2, 0x12, 0xdc, 0x42, 0x2a, 0xe0, + 0x86, 0x37, 0x11, 0x3a, 0x41, 0x93, 0x61, 0xf2, 0xac, 0x94, 0xea, 0x0a, 0xe0, 0x93, 0x67, 0xde, + 0x39, 0xe2, 0x6d, 0xef, 0xf7, 0xd7, 0x17, 0x68, 0xfc, 0x07, 0xe1, 0x83, 0x6b, 0x67, 0xef, 0x52, + 0xab, 0x85, 0xcc, 0xc9, 0x19, 0x7e, 0x5a, 0xf1, 0x46, 0x2f, 0x6d, 0xca, 0x85, 0xa8, 0xc1, 0x18, + 0xff, 0x83, 0xc1, 0x45, 0xf4, 0xe3, 0xdb, 0x74, 0xd4, 0x5a, 0x3b, 0x0f, 0xcc, 0x47, 0x5b, 0x4b, + 0x95, 0x27, 0xc3, 0xa0, 0x6f, 0x41, 0xf2, 0x0a, 0x77, 0x17, 0x00, 0xd1, 0xa3, 0x13, 0x34, 0x39, + 0x38, 0x3d, 0xa2, 0xed, 0x27, 0xce, 0x3f, 0x6d, 0xfd, 0xd3, 0x4b, 0x2d, 0x55, 0xe2, 0x54, 0x84, + 0xe0, 0x5e, 0x09, 0xa5, 0x8e, 0xba, 0x6e, 0x46, 0xe2, 0x6b, 0xf2, 0x12, 0x0f, 0xb9, 0x70, 0x51, + 0xb6, 0x06, 0x7a, 0x9e, 0x3c, 0xf4, 0xe0, 0x76, 0xca, 0x39, 0xc6, 0xff, 0x92, 0x46, 0x8f, 0xfd, + 0xb0, 0x31, 0xfd, 0xcf, 0xda, 0xe9, 0x2e, 0x79, 0x32, 0x58, 0x6c, 0xcb, 0xb1, 0xc0, 0x83, 0x1d, + 0x4e, 0x4e, 0xf1, 0x13, 0x05, 0xb7, 0x6e, 0x7b, 0x3e, 0xef, 0x83, 0xce, 0xfb, 0x0a, 0x6e, 0xaf, + 0x00, 0x9c, 0xd1, 0x76, 0xd3, 0x05, 0xc8, 0xbc, 0xb0, 0x3e, 0x73, 0x37, 0x39, 0x0c, 0xe0, 0x7b, + 0x8f, 0x5d, 0x7c, 0xf8, 0xbe, 0x8e, 0xd1, 0xfd, 0x3a, 0x46, 0xbf, 0xd6, 0x31, 0xfa, 0xb2, 0x89, + 0x3b, 0xf7, 0x9b, 0xb8, 0xf3, 0x73, 0x13, 0x77, 0x3e, 0xbf, 0xc9, 0xa5, 0x2d, 0x96, 0x73, 0x9a, + 0xe9, 0x92, 0x39, 0xe3, 0xfe, 0x41, 0x33, 0x7d, 0xe3, 0x9b, 0x69, 0xb8, 0xb3, 0x3b, 0x7f, 0x5b, + 0xd3, 0x70, 0x69, 0xb6, 0xa9, 0xc0, 0xcc, 0xfb, 0x5e, 0xf7, 0xfa, 0x6f, 0x00, 0x00, 0x00, 0xff, + 0xff, 0xf0, 0xdd, 0xe5, 0x56, 0x8e, 0x02, 0x00, 0x00, } func (this *Params) Equal(that interface{}) bool { @@ -399,16 +398,18 @@ func (m *FeeUpdate) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x10 } - { - size, err := m.NewFee.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.NewFee != nil { + { + size, err := m.NewFee.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintDataProxy(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintDataProxy(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0xa } - i-- - dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -470,8 +471,10 @@ func (m *FeeUpdate) Size() (n int) { } var l int _ = l - l = m.NewFee.Size() - n += 1 + l + sovDataProxy(uint64(l)) + if m.NewFee != nil { + l = m.NewFee.Size() + n += 1 + l + sovDataProxy(uint64(l)) + } if m.UpdateHeight != 0 { n += 1 + sovDataProxy(uint64(m.UpdateHeight)) } @@ -829,6 +832,9 @@ func (m *FeeUpdate) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.NewFee == nil { + m.NewFee = &types.Coin{} + } if err := m.NewFee.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/x/data-proxy/types/tx.pb.go b/x/data-proxy/types/tx.pb.go index b3447a11..357dcda8 100644 --- a/x/data-proxy/types/tx.pb.go +++ b/x/data-proxy/types/tx.pb.go @@ -502,53 +502,53 @@ func init() { func init() { proto.RegisterFile("sedachain/data_proxy/v1/tx.proto", fileDescriptor_40160e30cd70b841) } var fileDescriptor_40160e30cd70b841 = []byte{ - // 729 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x95, 0xcd, 0x4e, 0xdb, 0x4a, - 0x14, 0xc7, 0x63, 0x92, 0x1b, 0x2e, 0x03, 0xe1, 0x63, 0x84, 0x94, 0x0f, 0x21, 0x83, 0xb2, 0xca, - 0xe5, 0x2a, 0x36, 0xa1, 0xa2, 0xaa, 0x90, 0x50, 0x05, 0xa5, 0xa8, 0x52, 0x15, 0x15, 0xb9, 0xed, - 0xa6, 0x1b, 0x6b, 0x12, 0x9f, 0x38, 0x6e, 0xb1, 0xc7, 0xf2, 0x4c, 0x08, 0xde, 0xf6, 0x09, 0xba, - 0xec, 0xba, 0x4f, 0x40, 0xa5, 0x3e, 0x04, 0xea, 0x0a, 0x75, 0xd5, 0x55, 0x55, 0xc1, 0xa2, 0xaf, - 0x51, 0xcd, 0xd8, 0x49, 0x6c, 0x4a, 0x12, 0xe8, 0x6e, 0xe6, 0x9c, 0xff, 0x9c, 0x8f, 0x9f, 0x8f, - 0x67, 0xd0, 0x06, 0x03, 0x8b, 0xb4, 0xbb, 0xc4, 0xf1, 0x74, 0x8b, 0x70, 0x62, 0xfa, 0x01, 0x3d, - 0x0b, 0xf5, 0xd3, 0x86, 0xce, 0xcf, 0x34, 0x3f, 0xa0, 0x9c, 0xe2, 0xe2, 0x50, 0xa1, 0x8d, 0x14, - 0xda, 0x69, 0xa3, 0xb2, 0x6a, 0x53, 0x9b, 0x4a, 0x8d, 0x2e, 0x56, 0x91, 0xbc, 0x52, 0x6e, 0x53, - 0xe6, 0x52, 0x66, 0x46, 0x8e, 0x68, 0x13, 0xbb, 0xd4, 0x68, 0xa7, 0xb7, 0x08, 0x03, 0xfd, 0xb4, - 0xd1, 0x02, 0x4e, 0x1a, 0x7a, 0x9b, 0x3a, 0x5e, 0xec, 0x2f, 0xc6, 0x7e, 0x97, 0xd9, 0xa2, 0x02, - 0x97, 0xd9, 0xb1, 0xa3, 0x36, 0xae, 0xc8, 0x44, 0x41, 0x52, 0x59, 0xfd, 0x34, 0x83, 0x56, 0x9b, - 0xcc, 0x36, 0xc0, 0x76, 0x18, 0x87, 0xe0, 0x90, 0x70, 0x72, 0x2c, 0xdc, 0x78, 0x0f, 0x15, 0x88, - 0xe5, 0x3a, 0x9e, 0x49, 0x2c, 0x2b, 0x00, 0xc6, 0x4a, 0xca, 0x86, 0x52, 0x9b, 0x3b, 0x28, 0x7d, - 0xfb, 0x52, 0x5f, 0x8d, 0x8b, 0xdc, 0x8f, 0x3c, 0x2f, 0x79, 0xe0, 0x78, 0xb6, 0xb1, 0x20, 0xe5, - 0xb1, 0x0d, 0x3f, 0x46, 0x8b, 0x3e, 0x09, 0x69, 0x8f, 0x0f, 0xcf, 0xcf, 0x4c, 0x39, 0x5f, 0x88, - 0xf4, 0x83, 0x00, 0xff, 0xa3, 0x6c, 0x07, 0xa0, 0x94, 0xdd, 0x50, 0x6a, 0xf3, 0xdb, 0x65, 0x2d, - 0x3e, 0x22, 0x48, 0x68, 0x31, 0x09, 0xed, 0x09, 0x75, 0x3c, 0x43, 0xa8, 0x30, 0x46, 0x39, 0x17, - 0x5c, 0x5a, 0xca, 0x89, 0x1c, 0x86, 0x5c, 0xe3, 0x22, 0x9a, 0xf5, 0x7b, 0x2d, 0xf3, 0x1d, 0x84, - 0xa5, 0x7f, 0xa4, 0x39, 0xef, 0xf7, 0x5a, 0xcf, 0x21, 0xc4, 0x6b, 0x68, 0x8e, 0x39, 0xb6, 0x47, - 0x78, 0x2f, 0x80, 0x52, 0x5e, 0xba, 0x46, 0x86, 0x5d, 0xfc, 0xfe, 0xd7, 0xf9, 0x66, 0xba, 0xf5, - 0xaa, 0x8a, 0xd6, 0x6e, 0x63, 0x64, 0x00, 0xf3, 0xa9, 0xc7, 0xa0, 0xfa, 0x79, 0x06, 0x2d, 0x37, - 0x99, 0xfd, 0xd4, 0x72, 0xf8, 0x08, 0xe0, 0x16, 0xca, 0x33, 0xf0, 0x2c, 0x08, 0xa6, 0x92, 0x8b, - 0x75, 0xf8, 0x08, 0x61, 0x0f, 0xfa, 0xe6, 0x3d, 0xb9, 0x2d, 0x7b, 0xd0, 0x3f, 0x4e, 0xa1, 0x2b, - 0xa3, 0x7f, 0x45, 0x1c, 0x49, 0x24, 0x2b, 0xfb, 0x9b, 0xf5, 0xa0, 0xdf, 0x14, 0x50, 0x1e, 0x21, - 0xb1, 0x34, 0x05, 0xd9, 0xdc, 0x14, 0xb2, 0x07, 0xb9, 0x8b, 0x1f, 0xeb, 0x8a, 0x91, 0xf7, 0xa0, - 0x7f, 0x04, 0x80, 0x6b, 0x68, 0xb9, 0x03, 0x60, 0xf6, 0x7c, 0x8b, 0x70, 0x30, 0x2d, 0x38, 0x21, - 0x11, 0xd7, 0x82, 0xb1, 0xd8, 0x01, 0x78, 0x2d, 0xcd, 0x87, 0xc2, 0x9a, 0x04, 0x9f, 0x4f, 0x82, - 0xdf, 0x9d, 0x17, 0x68, 0xe3, 0x66, 0xab, 0xe7, 0x8a, 0x64, 0xf6, 0x2a, 0x20, 0x1e, 0xeb, 0x40, - 0xb0, 0x2f, 0x80, 0xff, 0x05, 0xb3, 0x43, 0xb4, 0x22, 0x1a, 0x4a, 0x8f, 0xea, 0x34, 0x64, 0x4b, - 0x1e, 0xf4, 0xf7, 0x93, 0xd3, 0x9a, 0x28, 0x39, 0x3b, 0xbe, 0xe4, 0x0a, 0x2a, 0xdd, 0xac, 0x78, - 0x38, 0x02, 0x47, 0xd2, 0x97, 0x9a, 0x80, 0x81, 0x0f, 0x6f, 0xa2, 0x95, 0x04, 0xba, 0x2e, 0x38, - 0x76, 0x97, 0xcb, 0x06, 0xb3, 0xc6, 0xd2, 0x90, 0xdd, 0x33, 0x69, 0xae, 0x7e, 0x54, 0xd0, 0x52, - 0x93, 0xd9, 0x91, 0xed, 0x98, 0x04, 0xc4, 0x65, 0xf8, 0x21, 0x9a, 0x23, 0x3d, 0xde, 0xa5, 0x81, - 0xc3, 0xc3, 0xa9, 0x60, 0x46, 0x52, 0xbc, 0x87, 0xf2, 0xbe, 0x8c, 0x20, 0x81, 0xcc, 0x6f, 0xaf, - 0x6b, 0x63, 0x6e, 0x26, 0x2d, 0x4a, 0x24, 0xbf, 0x78, 0xc6, 0x88, 0x0f, 0xed, 0x2e, 0x8a, 0xde, - 0x47, 0xe1, 0xaa, 0x65, 0x54, 0xbc, 0x51, 0xd9, 0xa0, 0xc3, 0xed, 0xaf, 0x59, 0x94, 0x6d, 0x32, - 0x1b, 0x87, 0x68, 0xe5, 0xcf, 0x9b, 0xa4, 0x3e, 0x36, 0xed, 0x6d, 0x3f, 0x55, 0x65, 0xe7, 0x5e, - 0xf2, 0x21, 0x64, 0x17, 0x15, 0xd2, 0xff, 0xdf, 0x7f, 0x93, 0xe2, 0xa4, 0xa4, 0x95, 0xc6, 0x9d, - 0xa5, 0xc9, 0x74, 0xe9, 0xd1, 0x9d, 0x98, 0x2e, 0x25, 0x9d, 0x9c, 0xee, 0xd6, 0xf1, 0xc2, 0x6f, - 0xd1, 0x42, 0x6a, 0x24, 0x6a, 0x93, 0x42, 0x24, 0x95, 0x95, 0xad, 0xbb, 0x2a, 0x07, 0xb9, 0x0e, - 0x5e, 0x5c, 0x5c, 0xa9, 0xca, 0xe5, 0x95, 0xaa, 0xfc, 0xbc, 0x52, 0x95, 0x0f, 0xd7, 0x6a, 0xe6, - 0xf2, 0x5a, 0xcd, 0x7c, 0xbf, 0x56, 0x33, 0x6f, 0x76, 0x6c, 0x87, 0x77, 0x7b, 0x2d, 0xad, 0x4d, - 0x5d, 0x5d, 0x44, 0x95, 0x4f, 0x48, 0x9b, 0x9e, 0xc8, 0x4d, 0x3d, 0x7a, 0x6f, 0xce, 0xe4, 0x1b, - 0x53, 0x8f, 0x5e, 0x1c, 0x1e, 0xfa, 0xc0, 0x5a, 0x79, 0xa9, 0x7b, 0xf0, 0x3b, 0x00, 0x00, 0xff, - 0xff, 0x6b, 0x3d, 0x45, 0xc4, 0x3b, 0x07, 0x00, 0x00, + // 726 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x95, 0x4d, 0x4f, 0xdb, 0x48, + 0x18, 0xc7, 0x63, 0x92, 0x0d, 0xcb, 0x40, 0x78, 0x19, 0x21, 0xe5, 0x45, 0xc8, 0xa0, 0x9c, 0xb2, + 0xac, 0x62, 0x93, 0xac, 0xd8, 0x03, 0x12, 0xaa, 0xa0, 0x14, 0x55, 0xaa, 0xa2, 0x22, 0xb7, 0xbd, + 0xf4, 0x62, 0x4d, 0xe2, 0x27, 0x8e, 0x5b, 0xec, 0xb1, 0x3c, 0x13, 0x82, 0xaf, 0xfd, 0x04, 0x3d, + 0xf6, 0xdc, 0x6b, 0x2f, 0x1c, 0xfa, 0x21, 0x50, 0x4f, 0xa8, 0xa7, 0x9e, 0xaa, 0x0a, 0x0e, 0xfd, + 0x1a, 0xd5, 0x8c, 0x9d, 0xc4, 0xa6, 0x24, 0x81, 0xde, 0x3c, 0xcf, 0xff, 0x3f, 0xcf, 0xcb, 0xcf, + 0x63, 0x0f, 0xda, 0x62, 0x60, 0x91, 0x4e, 0x8f, 0x38, 0x9e, 0x6e, 0x11, 0x4e, 0x4c, 0x3f, 0xa0, + 0xe7, 0xa1, 0x7e, 0xd6, 0xd0, 0xf9, 0xb9, 0xe6, 0x07, 0x94, 0x53, 0x5c, 0x1c, 0x39, 0xb4, 0xb1, + 0x43, 0x3b, 0x6b, 0x54, 0xd6, 0x6d, 0x6a, 0x53, 0xe9, 0xd1, 0xc5, 0x53, 0x64, 0xaf, 0x94, 0x3b, + 0x94, 0xb9, 0x94, 0x99, 0x91, 0x10, 0x2d, 0x62, 0x49, 0x8d, 0x56, 0x7a, 0x9b, 0x30, 0xd0, 0xcf, + 0x1a, 0x6d, 0xe0, 0xa4, 0xa1, 0x77, 0xa8, 0xe3, 0xc5, 0x7a, 0x31, 0xd6, 0x5d, 0x66, 0x8b, 0x0e, + 0x5c, 0x66, 0xc7, 0x42, 0x6d, 0x52, 0x93, 0x89, 0x86, 0xa4, 0xb3, 0xfa, 0x71, 0x0e, 0xad, 0xb7, + 0x98, 0x6d, 0x80, 0xed, 0x30, 0x0e, 0xc1, 0x11, 0xe1, 0xe4, 0x44, 0xc8, 0x78, 0x1f, 0x15, 0x88, + 0xe5, 0x3a, 0x9e, 0x49, 0x2c, 0x2b, 0x00, 0xc6, 0x4a, 0xca, 0x96, 0x52, 0x5b, 0x38, 0x2c, 0x7d, + 0xfd, 0x5c, 0x5f, 0x8f, 0x9b, 0x3c, 0x88, 0x94, 0x17, 0x3c, 0x70, 0x3c, 0xdb, 0x58, 0x92, 0xf6, + 0x38, 0x86, 0x1f, 0xa1, 0x65, 0x9f, 0x84, 0xb4, 0xcf, 0x47, 0xfb, 0xe7, 0x66, 0xec, 0x2f, 0x44, + 0xfe, 0x61, 0x82, 0x7f, 0x51, 0xb6, 0x0b, 0x50, 0xca, 0x6e, 0x29, 0xb5, 0xc5, 0x66, 0x59, 0x8b, + 0xb7, 0x08, 0x12, 0x5a, 0x4c, 0x42, 0x7b, 0x4c, 0x1d, 0xcf, 0x10, 0x2e, 0x8c, 0x51, 0xce, 0x05, + 0x97, 0x96, 0x72, 0xa2, 0x86, 0x21, 0x9f, 0x71, 0x11, 0xcd, 0xfb, 0xfd, 0xb6, 0xf9, 0x16, 0xc2, + 0xd2, 0x5f, 0x32, 0x9c, 0xf7, 0xfb, 0xed, 0x67, 0x10, 0xe2, 0x0d, 0xb4, 0xc0, 0x1c, 0xdb, 0x23, + 0xbc, 0x1f, 0x40, 0x29, 0x2f, 0xa5, 0x71, 0x60, 0x0f, 0xbf, 0xfb, 0x79, 0xb1, 0x9d, 0x1e, 0xbd, + 0xaa, 0xa2, 0x8d, 0xbb, 0x18, 0x19, 0xc0, 0x7c, 0xea, 0x31, 0xa8, 0x7e, 0x9a, 0x43, 0xab, 0x2d, + 0x66, 0x3f, 0xb1, 0x1c, 0x3e, 0x06, 0xb8, 0x83, 0xf2, 0x0c, 0x3c, 0x0b, 0x82, 0x99, 0xe4, 0x62, + 0x1f, 0x3e, 0x46, 0xd8, 0x83, 0x81, 0xf9, 0x40, 0x6e, 0xab, 0x1e, 0x0c, 0x4e, 0x52, 0xe8, 0xca, + 0xe8, 0x6f, 0x91, 0x47, 0x12, 0xc9, 0xca, 0xf9, 0xe6, 0x3d, 0x18, 0xb4, 0x04, 0x94, 0x26, 0x12, + 0x8f, 0xa6, 0x20, 0x9b, 0x9b, 0x45, 0x36, 0xef, 0xc1, 0xe0, 0x18, 0x00, 0xd7, 0xd0, 0x6a, 0x17, + 0xc0, 0xec, 0xfb, 0x16, 0xe1, 0x60, 0x5a, 0x70, 0x4a, 0x22, 0xa2, 0x05, 0x63, 0xb9, 0x0b, 0xf0, + 0x4a, 0x86, 0x8f, 0x44, 0x34, 0x89, 0x3c, 0x9f, 0x44, 0xbe, 0xb7, 0x28, 0xa0, 0xc6, 0x63, 0x56, + 0x2f, 0x14, 0x49, 0xeb, 0x65, 0x40, 0x3c, 0xd6, 0x85, 0xe0, 0x40, 0xa0, 0xfe, 0x03, 0x5a, 0x47, + 0x68, 0x4d, 0x8c, 0x92, 0x3e, 0xa4, 0xb3, 0x60, 0xad, 0x78, 0x30, 0x38, 0x48, 0x9e, 0xd3, 0x44, + 0xcb, 0xd9, 0xc9, 0x2d, 0x57, 0x50, 0xe9, 0x76, 0xc7, 0xa3, 0x97, 0x7f, 0x2c, 0xb5, 0xd4, 0xbb, + 0x1f, 0x6a, 0x78, 0x1b, 0xad, 0x25, 0xd0, 0xf5, 0xc0, 0xb1, 0x7b, 0x5c, 0x0e, 0x98, 0x35, 0x56, + 0x46, 0xec, 0x9e, 0xca, 0x70, 0xf5, 0x83, 0x82, 0x56, 0x5a, 0xcc, 0x8e, 0x62, 0x27, 0x24, 0x20, + 0x2e, 0xc3, 0xff, 0xa3, 0x05, 0xd2, 0xe7, 0x3d, 0x1a, 0x38, 0x3c, 0x9c, 0x09, 0x66, 0x6c, 0xc5, + 0xfb, 0x28, 0xef, 0xcb, 0x0c, 0x12, 0xc8, 0x62, 0x73, 0x53, 0x9b, 0xf0, 0x4f, 0xd2, 0xa2, 0x42, + 0x87, 0xb9, 0xcb, 0xef, 0x9b, 0x19, 0x23, 0xde, 0xb4, 0xb7, 0x2c, 0x66, 0x1f, 0xa7, 0xab, 0x96, + 0x51, 0xf1, 0x56, 0x67, 0xc3, 0x09, 0x9b, 0x5f, 0xb2, 0x28, 0xdb, 0x62, 0x36, 0x0e, 0xd1, 0xda, + 0xef, 0xff, 0x90, 0xfa, 0xc4, 0xb2, 0x77, 0x7d, 0x4e, 0x95, 0xdd, 0x07, 0xd9, 0x47, 0x90, 0x5d, + 0x54, 0x48, 0x7f, 0x79, 0xff, 0x4c, 0xcb, 0x93, 0xb2, 0x56, 0x1a, 0xf7, 0xb6, 0x26, 0xcb, 0xa5, + 0x8f, 0xee, 0xd4, 0x72, 0x29, 0xeb, 0xf4, 0x72, 0x77, 0x1e, 0x2f, 0xfc, 0x06, 0x2d, 0xa5, 0x8e, + 0x44, 0x6d, 0x5a, 0x8a, 0xa4, 0xb3, 0xb2, 0x73, 0x5f, 0xe7, 0xb0, 0xd6, 0xe1, 0xf3, 0xcb, 0x6b, + 0x55, 0xb9, 0xba, 0x56, 0x95, 0x1f, 0xd7, 0xaa, 0xf2, 0xfe, 0x46, 0xcd, 0x5c, 0xdd, 0xa8, 0x99, + 0x6f, 0x37, 0x6a, 0xe6, 0xf5, 0xae, 0xed, 0xf0, 0x5e, 0xbf, 0xad, 0x75, 0xa8, 0xab, 0x8b, 0xac, + 0xf2, 0xf2, 0xe8, 0xd0, 0x53, 0xb9, 0xa8, 0x47, 0x37, 0xcd, 0xb9, 0xbc, 0x5d, 0xea, 0xd1, 0x5d, + 0xc3, 0x43, 0x1f, 0x58, 0x3b, 0x2f, 0x7d, 0xff, 0xfd, 0x0a, 0x00, 0x00, 0xff, 0xff, 0xdd, 0x2b, + 0x73, 0xaf, 0x35, 0x07, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used.