From 520108849a04cfae7142ef5ec515e4e65fa91d9f Mon Sep 17 00:00:00 2001 From: Robert Zaremba Date: Thu, 24 Feb 2022 19:00:47 +0100 Subject: [PATCH] proto regeneration --- api/cosmos/authz/v1beta1/authz.pulsar.go | 9 ++- api/cosmos/tx/v1beta1/service.pulsar.go | 4 ++ types/tx/service.pb.go | 4 ++ x/authz/authz.pb.go | 86 +++++++++++++----------- 4 files changed, 62 insertions(+), 41 deletions(-) diff --git a/api/cosmos/authz/v1beta1/authz.pulsar.go b/api/cosmos/authz/v1beta1/authz.pulsar.go index eb75eff56b78..230ea99a24b7 100644 --- a/api/cosmos/authz/v1beta1/authz.pulsar.go +++ b/api/cosmos/authz/v1beta1/authz.pulsar.go @@ -2132,8 +2132,11 @@ type Grant struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Authorization *anypb.Any `protobuf:"bytes,1,opt,name=authorization,proto3" json:"authorization,omitempty"` - Expiration *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=expiration,proto3" json:"expiration,omitempty"` + Authorization *anypb.Any `protobuf:"bytes,1,opt,name=authorization,proto3" json:"authorization,omitempty"` + // time when the grant will expire and will be pruned. If null, then the grant + // doesn't have a time expiration (other conditions in `authorization` + // may apply to invalidate the grant) + Expiration *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=expiration,proto3" json:"expiration,omitempty"` } func (x *Grant) Reset() { @@ -2294,7 +2297,7 @@ var file_cosmos_authz_v1beta1_authz_proto_rawDesc = []byte{ 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x42, 0x08, 0xc8, 0xde, 0x1f, - 0x00, 0x90, 0xdf, 0x1f, 0x01, 0x52, 0x0a, 0x65, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, + 0x01, 0x90, 0xdf, 0x1f, 0x01, 0x52, 0x0a, 0x65, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x91, 0x02, 0x0a, 0x12, 0x47, 0x72, 0x61, 0x6e, 0x74, 0x41, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x32, 0x0a, 0x07, 0x67, 0x72, 0x61, 0x6e, 0x74, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d, 0x14, 0x63, diff --git a/api/cosmos/tx/v1beta1/service.pulsar.go b/api/cosmos/tx/v1beta1/service.pulsar.go index 8540bf41c75f..ec4afdbe92bd 100644 --- a/api/cosmos/tx/v1beta1/service.pulsar.go +++ b/api/cosmos/tx/v1beta1/service.pulsar.go @@ -5909,6 +5909,8 @@ func (x *GetTxResponse) GetTxResponse() *v1beta11.TxResponse { // GetBlockWithTxsRequest is the request type for the Service.GetBlockWithTxs // RPC method. +// +// Since: cosmos-sdk 0.45.2 type GetBlockWithTxsRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -5955,6 +5957,8 @@ func (x *GetBlockWithTxsRequest) GetPagination() *v1beta1.PageRequest { } // GetBlockWithTxsResponse is the response type for the Service.GetBlockWithTxs method. +// +// Since: cosmos-sdk 0.45.2 type GetBlockWithTxsResponse struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/types/tx/service.pb.go b/types/tx/service.pb.go index b33e2a7a2f87..ee8ee8ac5608 100644 --- a/types/tx/service.pb.go +++ b/types/tx/service.pb.go @@ -553,6 +553,8 @@ func (m *GetTxResponse) GetTxResponse() *types.TxResponse { // GetBlockWithTxsRequest is the request type for the Service.GetBlockWithTxs // RPC method. +// +// Since: cosmos-sdk 0.45.2 type GetBlockWithTxsRequest struct { // height is the height of the block to query. Height int64 `protobuf:"varint,1,opt,name=height,proto3" json:"height,omitempty"` @@ -608,6 +610,8 @@ func (m *GetBlockWithTxsRequest) GetPagination() *query.PageRequest { } // GetBlockWithTxsResponse is the response type for the Service.GetBlockWithTxs method. +// +// Since: cosmos-sdk 0.45.2 type GetBlockWithTxsResponse struct { // txs are the transactions in the block. Txs []*Tx `protobuf:"bytes,1,rep,name=txs,proto3" json:"txs,omitempty"` diff --git a/x/authz/authz.pb.go b/x/authz/authz.pb.go index 2c8aac50f41c..f38de1b41f42 100644 --- a/x/authz/authz.pb.go +++ b/x/authz/authz.pb.go @@ -73,7 +73,10 @@ var xxx_messageInfo_GenericAuthorization proto.InternalMessageInfo // the provide method with expiration time. type Grant struct { Authorization *types.Any `protobuf:"bytes,1,opt,name=authorization,proto3" json:"authorization,omitempty"` - Expiration time.Time `protobuf:"bytes,2,opt,name=expiration,proto3,stdtime" json:"expiration"` + // time when the grant will expire and will be pruned. If null, then the grant + // doesn't have a time expiration (other conditions in `authorization` + // may apply to invalidate the grant) + Expiration *time.Time `protobuf:"bytes,2,opt,name=expiration,proto3,stdtime" json:"expiration,omitempty"` } func (m *Grant) Reset() { *m = Grant{} } @@ -200,33 +203,33 @@ func init() { func init() { proto.RegisterFile("cosmos/authz/v1beta1/authz.proto", fileDescriptor_544dc2e84b61c637) } var fileDescriptor_544dc2e84b61c637 = []byte{ - // 410 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x52, 0x3d, 0x6f, 0xda, 0x40, - 0x18, 0xf6, 0x41, 0xbf, 0x38, 0x44, 0xd5, 0x5a, 0x1e, 0x80, 0xc1, 0x20, 0xab, 0x03, 0x0b, 0xb6, - 0xa0, 0x9d, 0xda, 0x09, 0xab, 0x12, 0xea, 0xd0, 0xa1, 0x2e, 0x5d, 0xba, 0x20, 0x1b, 0x2e, 0x87, - 0x15, 0xce, 0x67, 0xdd, 0x9d, 0x23, 0xcc, 0xaf, 0x20, 0x7b, 0x7e, 0x06, 0x3f, 0x02, 0x65, 0x42, - 0x99, 0x32, 0xe5, 0x03, 0xfe, 0x48, 0xc4, 0x9d, 0xad, 0x40, 0x58, 0xa2, 0x28, 0x93, 0xef, 0x7d, - 0xee, 0x79, 0x9e, 0x7b, 0xdf, 0xc7, 0x2f, 0x6c, 0x8e, 0x28, 0x27, 0x94, 0x3b, 0x7e, 0x22, 0x26, - 0x73, 0xe7, 0xac, 0x13, 0x20, 0xe1, 0x77, 0x54, 0x65, 0xc7, 0x8c, 0x0a, 0xaa, 0x1b, 0x8a, 0x61, - 0x2b, 0x2c, 0x63, 0xd4, 0x6b, 0x0a, 0x1d, 0x4a, 0x8e, 0x93, 0x51, 0x64, 0x51, 0x6f, 0x60, 0x4a, - 0xf1, 0x14, 0x39, 0xb2, 0x0a, 0x92, 0x13, 0x47, 0x84, 0x04, 0x71, 0xe1, 0x93, 0x38, 0x23, 0x18, - 0x98, 0x62, 0xaa, 0x84, 0xbb, 0x53, 0x86, 0xd6, 0x9e, 0xca, 0xfc, 0x28, 0x55, 0x57, 0xd6, 0x0f, - 0x68, 0xf4, 0x51, 0x84, 0x58, 0x38, 0xea, 0x25, 0x62, 0x42, 0x59, 0x38, 0xf7, 0x45, 0x48, 0x23, - 0xfd, 0x13, 0x2c, 0x12, 0x8e, 0xab, 0xa0, 0x09, 0x5a, 0x25, 0x6f, 0x77, 0xfc, 0xfe, 0xf9, 0x72, - 0xd9, 0xae, 0x1c, 0x90, 0xac, 0x0b, 0x00, 0xdf, 0xf6, 0x99, 0x1f, 0x09, 0xfd, 0x37, 0xac, 0xf8, - 0xfb, 0x57, 0x52, 0x58, 0xee, 0x1a, 0xb6, 0x7a, 0xd9, 0xce, 0x5f, 0xb6, 0x7b, 0x51, 0xea, 0x1e, - 0x3b, 0x79, 0x87, 0x6a, 0xfd, 0x27, 0x84, 0x68, 0x16, 0x87, 0x4c, 0x79, 0x15, 0xa4, 0x57, 0xfd, - 0xc8, 0x6b, 0x90, 0x0f, 0xef, 0x7e, 0x58, 0xdd, 0x34, 0xb4, 0xc5, 0x6d, 0x03, 0x78, 0x7b, 0x3a, - 0xeb, 0xbc, 0x00, 0x75, 0xd9, 0xde, 0xe1, 0x68, 0x5d, 0xf8, 0x1e, 0xef, 0x50, 0xc4, 0xd4, 0x78, - 0x6e, 0xf5, 0x6a, 0xd9, 0xce, 0x7f, 0x45, 0x6f, 0x3c, 0x66, 0x88, 0xf3, 0xbf, 0x82, 0x85, 0x11, - 0xf6, 0x72, 0xe2, 0xa3, 0x06, 0xc9, 0x6e, 0x9e, 0xa1, 0x41, 0xc7, 0x99, 0x14, 0x5f, 0x31, 0x93, - 0x37, 0x2f, 0xcc, 0xe4, 0x1b, 0xfc, 0x28, 0x23, 0xf9, 0x93, 0xa0, 0x04, 0xfd, 0x12, 0x88, 0xe8, - 0x16, 0xac, 0x10, 0x8e, 0x87, 0x22, 0x8d, 0xd1, 0x30, 0x61, 0x53, 0x5e, 0x05, 0xcd, 0x62, 0xab, - 0xe4, 0x95, 0x09, 0xc7, 0x83, 0x34, 0x46, 0xff, 0xd8, 0x94, 0xbb, 0xee, 0xea, 0xde, 0xd4, 0x56, - 0x1b, 0x13, 0xac, 0x37, 0x26, 0xb8, 0xdb, 0x98, 0x60, 0xb1, 0x35, 0xb5, 0xf5, 0xd6, 0xd4, 0xae, - 0xb7, 0xa6, 0xf6, 0xff, 0x0b, 0x0e, 0xc5, 0x24, 0x09, 0xec, 0x11, 0x25, 0xd9, 0xba, 0x66, 0x9f, - 0x36, 0x1f, 0x9f, 0x3a, 0x33, 0xb5, 0xf2, 0xc1, 0x3b, 0xd9, 0xe3, 0xd7, 0x87, 0x00, 0x00, 0x00, - 0xff, 0xff, 0x86, 0xd2, 0xd7, 0xaf, 0x17, 0x03, 0x00, 0x00, + // 411 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x52, 0xbb, 0x8e, 0xda, 0x40, + 0x14, 0xf5, 0x40, 0x5e, 0x0c, 0x22, 0x4a, 0x2c, 0x17, 0x40, 0x61, 0x90, 0x95, 0x82, 0x06, 0x5b, + 0x90, 0x54, 0x49, 0x85, 0x15, 0x09, 0xa5, 0x48, 0x11, 0x87, 0x34, 0x69, 0x90, 0x0d, 0x93, 0xc1, + 0x0a, 0xe3, 0xb1, 0x66, 0xc6, 0x11, 0xe6, 0x2b, 0x48, 0xbf, 0x9f, 0xc1, 0x47, 0xa0, 0xad, 0xd0, + 0x56, 0x5b, 0xed, 0x03, 0x7e, 0x64, 0xc5, 0x8c, 0xad, 0x85, 0x75, 0x43, 0xb1, 0x95, 0xe7, 0x9e, + 0x39, 0xe7, 0xcc, 0xbd, 0xc7, 0x17, 0xb6, 0x27, 0x94, 0x13, 0xca, 0x1d, 0x3f, 0x11, 0xb3, 0xa5, + 0xf3, 0xaf, 0x17, 0x20, 0xe1, 0xf7, 0x54, 0x65, 0xc7, 0x8c, 0x0a, 0xaa, 0x1b, 0x8a, 0x61, 0x2b, + 0x2c, 0x63, 0x34, 0x1b, 0x0a, 0x1d, 0x4b, 0x8e, 0x93, 0x51, 0x64, 0xd1, 0x6c, 0x61, 0x4a, 0xf1, + 0x1c, 0x39, 0xb2, 0x0a, 0x92, 0x3f, 0x8e, 0x08, 0x09, 0xe2, 0xc2, 0x27, 0x71, 0x46, 0x30, 0x30, + 0xc5, 0x54, 0x09, 0x0f, 0xa7, 0x0c, 0x6d, 0x3c, 0x95, 0xf9, 0x51, 0xaa, 0xae, 0xac, 0x2f, 0xd0, + 0x18, 0xa2, 0x08, 0xb1, 0x70, 0x32, 0x48, 0xc4, 0x8c, 0xb2, 0x70, 0xe9, 0x8b, 0x90, 0x46, 0xfa, + 0x3b, 0x58, 0x26, 0x1c, 0xd7, 0x41, 0x1b, 0x74, 0x2a, 0xde, 0xe1, 0xf8, 0xf9, 0xfd, 0xe5, 0xba, + 0x5b, 0x3b, 0x21, 0x59, 0x17, 0x00, 0xbe, 0x1c, 0x32, 0x3f, 0x12, 0xfa, 0x77, 0x58, 0xf3, 0x8f, + 0xaf, 0xa4, 0xb0, 0xda, 0x37, 0x6c, 0xf5, 0xb2, 0x9d, 0xbf, 0x6c, 0x0f, 0xa2, 0xd4, 0x2d, 0x3a, + 0x79, 0xa7, 0x6a, 0xfd, 0x2b, 0x84, 0x68, 0x11, 0x87, 0x4c, 0x79, 0x95, 0xa4, 0x57, 0xb3, 0xe0, + 0x35, 0xca, 0x87, 0x77, 0xdf, 0x6c, 0x6e, 0x5a, 0x60, 0x75, 0xdb, 0x02, 0xde, 0x91, 0xce, 0xfa, + 0x5f, 0x82, 0xba, 0x6c, 0xef, 0x74, 0xb4, 0x3e, 0x7c, 0x8d, 0x0f, 0x28, 0x62, 0x6a, 0x3c, 0xb7, + 0x7e, 0xb5, 0xee, 0xe6, 0xbf, 0x62, 0x30, 0x9d, 0x32, 0xc4, 0xf9, 0x4f, 0xc1, 0xc2, 0x08, 0x7b, + 0x39, 0xf1, 0x51, 0x83, 0x64, 0x37, 0x67, 0x68, 0x50, 0x31, 0x93, 0xf2, 0x33, 0x66, 0xf2, 0xe2, + 0xac, 0x4c, 0xb4, 0x42, 0x26, 0x9f, 0xe0, 0x5b, 0x19, 0xc9, 0x8f, 0x04, 0x25, 0xe8, 0x9b, 0x40, + 0x44, 0xb7, 0x60, 0x8d, 0x70, 0x3c, 0x16, 0x69, 0x8c, 0xc6, 0x09, 0x9b, 0xf3, 0x3a, 0x68, 0x97, + 0x3b, 0x15, 0xaf, 0x4a, 0x38, 0x1e, 0xa5, 0x31, 0xfa, 0xc5, 0xe6, 0xdc, 0x75, 0x37, 0xf7, 0xa6, + 0xb6, 0xd9, 0x99, 0x60, 0xbb, 0x33, 0xc1, 0xdd, 0xce, 0x04, 0xab, 0xbd, 0xa9, 0x6d, 0xf7, 0xa6, + 0x76, 0xbd, 0x37, 0xb5, 0xdf, 0x1f, 0x70, 0x28, 0x66, 0x49, 0x60, 0x4f, 0x28, 0xc9, 0xd6, 0x35, + 0xfb, 0x74, 0xf9, 0xf4, 0xaf, 0xb3, 0x50, 0x2b, 0x1f, 0xbc, 0x92, 0x3d, 0x7e, 0x7c, 0x08, 0x00, + 0x00, 0xff, 0xff, 0x1a, 0x53, 0xcf, 0xcf, 0x17, 0x03, 0x00, 0x00, } func (m *GenericAuthorization) Marshal() (dAtA []byte, err error) { @@ -279,14 +282,16 @@ func (m *Grant) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - n1, err1 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Expiration, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Expiration):]) - if err1 != nil { - return 0, err1 + if m.Expiration != nil { + n1, err1 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.Expiration, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.Expiration):]) + if err1 != nil { + return 0, err1 + } + i -= n1 + i = encodeVarintAuthz(dAtA, i, uint64(n1)) + i-- + dAtA[i] = 0x12 } - i -= n1 - i = encodeVarintAuthz(dAtA, i, uint64(n1)) - i-- - dAtA[i] = 0x12 if m.Authorization != nil { { size, err := m.Authorization.MarshalToSizedBuffer(dAtA[:i]) @@ -425,8 +430,10 @@ func (m *Grant) Size() (n int) { l = m.Authorization.Size() n += 1 + l + sovAuthz(uint64(l)) } - l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Expiration) - n += 1 + l + sovAuthz(uint64(l)) + if m.Expiration != nil { + l = github_com_gogo_protobuf_types.SizeOfStdTime(*m.Expiration) + n += 1 + l + sovAuthz(uint64(l)) + } return n } @@ -650,7 +657,10 @@ func (m *Grant) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Expiration, dAtA[iNdEx:postIndex]); err != nil { + if m.Expiration == nil { + m.Expiration = new(time.Time) + } + if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(m.Expiration, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex