From 02035ebc2983ae132ffc46abe5d42de03e8519a2 Mon Sep 17 00:00:00 2001 From: tkernell Date: Tue, 9 Apr 2024 18:59:54 -0500 Subject: [PATCH] get agg api update --- api/layer/bridge/query.pulsar.go | 36 ++- evm/test/Bridge-TestsAuto.js | 62 ++--- proto/layer/bridge/query.proto | 2 +- .../cli/query_get_current_aggregate_report.go | 8 +- .../query_get_current_aggregate_report.go | 9 +- x/bridge/types/query.pb.go | 226 +++++++++--------- x/bridge/types/query.pb.gw.go | 4 +- 7 files changed, 161 insertions(+), 186 deletions(-) diff --git a/api/layer/bridge/query.pulsar.go b/api/layer/bridge/query.pulsar.go index ef5a8c080..1b52a1bcc 100644 --- a/api/layer/bridge/query.pulsar.go +++ b/api/layer/bridge/query.pulsar.go @@ -9490,8 +9490,8 @@ func (x *fastReflection_QueryGetCurrentAggregateReportRequest) Interface() proto // While iterating, mutating operations may only be performed // on the current field descriptor. func (x *fastReflection_QueryGetCurrentAggregateReportRequest) Range(f func(protoreflect.FieldDescriptor, protoreflect.Value) bool) { - if len(x.QueryId) != 0 { - value := protoreflect.ValueOfBytes(x.QueryId) + if x.QueryId != "" { + value := protoreflect.ValueOfString(x.QueryId) if !f(fd_QueryGetCurrentAggregateReportRequest_query_id, value) { return } @@ -9512,7 +9512,7 @@ func (x *fastReflection_QueryGetCurrentAggregateReportRequest) Range(f func(prot func (x *fastReflection_QueryGetCurrentAggregateReportRequest) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { case "layer.bridge.QueryGetCurrentAggregateReportRequest.query_id": - return len(x.QueryId) != 0 + return x.QueryId != "" default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: layer.bridge.QueryGetCurrentAggregateReportRequest")) @@ -9530,7 +9530,7 @@ func (x *fastReflection_QueryGetCurrentAggregateReportRequest) Has(fd protorefle func (x *fastReflection_QueryGetCurrentAggregateReportRequest) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { case "layer.bridge.QueryGetCurrentAggregateReportRequest.query_id": - x.QueryId = nil + x.QueryId = "" default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: layer.bridge.QueryGetCurrentAggregateReportRequest")) @@ -9549,7 +9549,7 @@ func (x *fastReflection_QueryGetCurrentAggregateReportRequest) Get(descriptor pr switch descriptor.FullName() { case "layer.bridge.QueryGetCurrentAggregateReportRequest.query_id": value := x.QueryId - return protoreflect.ValueOfBytes(value) + return protoreflect.ValueOfString(value) default: if descriptor.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: layer.bridge.QueryGetCurrentAggregateReportRequest")) @@ -9571,7 +9571,7 @@ func (x *fastReflection_QueryGetCurrentAggregateReportRequest) Get(descriptor pr func (x *fastReflection_QueryGetCurrentAggregateReportRequest) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { case "layer.bridge.QueryGetCurrentAggregateReportRequest.query_id": - x.QueryId = value.Bytes() + x.QueryId = value.Interface().(string) default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: layer.bridge.QueryGetCurrentAggregateReportRequest")) @@ -9608,7 +9608,7 @@ func (x *fastReflection_QueryGetCurrentAggregateReportRequest) Mutable(fd protor func (x *fastReflection_QueryGetCurrentAggregateReportRequest) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { case "layer.bridge.QueryGetCurrentAggregateReportRequest.query_id": - return protoreflect.ValueOfBytes(nil) + return protoreflect.ValueOfString("") default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: layer.bridge.QueryGetCurrentAggregateReportRequest")) @@ -9771,7 +9771,7 @@ func (x *fastReflection_QueryGetCurrentAggregateReportRequest) ProtoMethods() *p if wireType != 2 { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field QueryId", wireType) } - var byteLen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow @@ -9781,25 +9781,23 @@ func (x *fastReflection_QueryGetCurrentAggregateReportRequest) ProtoMethods() *p } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength } - postIndex := iNdEx + byteLen + postIndex := iNdEx + intStringLen if postIndex < 0 { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength } if postIndex > l { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } - x.QueryId = append(x.QueryId[:0], dAtA[iNdEx:postIndex]...) - if x.QueryId == nil { - x.QueryId = []byte{} - } + x.QueryId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex @@ -16676,7 +16674,7 @@ type QueryGetCurrentAggregateReportRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - QueryId []byte `protobuf:"bytes,1,opt,name=query_id,json=queryId,proto3" json:"query_id,omitempty"` + QueryId string `protobuf:"bytes,1,opt,name=query_id,json=queryId,proto3" json:"query_id,omitempty"` } func (x *QueryGetCurrentAggregateReportRequest) Reset() { @@ -16699,11 +16697,11 @@ func (*QueryGetCurrentAggregateReportRequest) Descriptor() ([]byte, []int) { return file_layer_bridge_query_proto_rawDescGZIP(), []int{21} } -func (x *QueryGetCurrentAggregateReportRequest) GetQueryId() []byte { +func (x *QueryGetCurrentAggregateReportRequest) GetQueryId() string { if x != nil { return x.QueryId } - return nil + return "" } type QueryGetCurrentAggregateReportResponse struct { @@ -17402,7 +17400,7 @@ var file_layer_bridge_query_proto_rawDesc = []byte{ 0x72, 0x53, 0x65, 0x74, 0x22, 0x42, 0x0a, 0x25, 0x51, 0x75, 0x65, 0x72, 0x79, 0x47, 0x65, 0x74, 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x19, 0x0a, - 0x08, 0x71, 0x75, 0x65, 0x72, 0x79, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, + 0x08, 0x71, 0x75, 0x65, 0x72, 0x79, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x71, 0x75, 0x65, 0x72, 0x79, 0x49, 0x64, 0x22, 0x7d, 0x0a, 0x26, 0x51, 0x75, 0x65, 0x72, 0x79, 0x47, 0x65, 0x74, 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, diff --git a/evm/test/Bridge-TestsAuto.js b/evm/test/Bridge-TestsAuto.js index 56e9f0f68..8ead87fe8 100644 --- a/evm/test/Bridge-TestsAuto.js +++ b/evm/test/Bridge-TestsAuto.js @@ -563,35 +563,27 @@ describe("BlobstreamO - Auto Function and e2e Tests", function () { ethUsdRep0 = await h.getCurrentAggregateReport(ETH_USD_QUERY_ID) console.log("ethUsdRep0: ", ethUsdRep0) - // snapshots = await h.getSnapshotsByReport(ETH_USD_QUERY_ID, ethUsdRep0.report.timestamp) - // console.log("snapshots: ", snapshots) - // lastSnapshot = snapshots[snapshots.length - 1] - // attestationData = await h.getAttestationDataBySnapshot(lastSnapshot) - // console.log("attestationData: ", attestationData) - - // oattests = await h.getAttestationsBySnapshot(lastSnapshot, valSet1) - // if (oattests.length == 0) { - // sleeptime = 2 - // console.log("no attestations found, sleeping for ", sleeptime, " seconds...") - // await h.sleep(2) - // oattests = await h.getAttestationsBySnapshot(lastSnapshot, valSet1) - // } - // console.log("oattests: ", oattests) - - // console.log("verifying oracle data...") - // await bridge.verifyOracleData( - // attestationData, - // valSet1, - // oattests, - // ) - - // // request new attestations - // currentBlock = await h.getBlock() - // currentTime = currentBlock.timestamp - // console.log("currentTime: ", currentTime) - // pastReport = await h.getDataBefore(ETH_USD_QUERY_ID, currentTime) - // console.log("pastReport: ", pastReport) - // // await h.requestAttestations(ETH_USD_QUERY_ID, pastReport.timestamp) + snapshots = await h.getSnapshotsByReport(ETH_USD_QUERY_ID, ethUsdRep0.report.timestamp) + console.log("snapshots: ", snapshots) + lastSnapshot = snapshots[snapshots.length - 1] + attestationData = await h.getAttestationDataBySnapshot(lastSnapshot) + console.log("attestationData: ", attestationData) + + oattests = await h.getAttestationsBySnapshot(lastSnapshot, valSet1) + if (oattests.length == 0) { + sleeptime = 2 + console.log("no attestations found, sleeping for ", sleeptime, " seconds...") + await h.sleep(2) + oattests = await h.getAttestationsBySnapshot(lastSnapshot, valSet1) + } + console.log("oattests: ", oattests) + + console.log("verifying oracle data...") + await bridge.verifyOracleData( + attestationData, + valSet1, + oattests, + ) }) it("query layer api, deploy and verify with real params", async function () { @@ -647,16 +639,4 @@ describe("BlobstreamO - Auto Function and e2e Tests", function () { ) }) - - it("try wallet", async function () { - wallet = await h.createCosmosWallet() - console.log("wallet: ", wallet) - - currentBlock = await h.getBlock() - currentTime = currentBlock.timestamp - 100 - pastReport = await h.getDataBefore(ETH_USD_QUERY_ID, currentTime) - console.log("pastReport: ", pastReport) - - await h.requestAttestations(ETH_USD_QUERY_ID, pastReport.timestamp) - }) }) diff --git a/proto/layer/bridge/query.proto b/proto/layer/bridge/query.proto index 496d1c736..60f6dae06 100644 --- a/proto/layer/bridge/query.proto +++ b/proto/layer/bridge/query.proto @@ -161,7 +161,7 @@ message QueryGetValsetByTimestampResponse { } message QueryGetCurrentAggregateReportRequest { - bytes query_id = 1; + string query_id = 1; } message QueryGetCurrentAggregateReportResponse { diff --git a/x/bridge/client/cli/query_get_current_aggregate_report.go b/x/bridge/client/cli/query_get_current_aggregate_report.go index deb887fe1..0f8fecad5 100644 --- a/x/bridge/client/cli/query_get_current_aggregate_report.go +++ b/x/bridge/client/cli/query_get_current_aggregate_report.go @@ -6,7 +6,6 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/tellor-io/layer/utils" "github.com/tellor-io/layer/x/bridge/types" ) @@ -28,12 +27,7 @@ func CmdGetCurrentAggregateReport() *cobra.Command { queryClient := types.NewQueryClient(clientCtx) - qIdBz, err := utils.QueryBytesFromString(queryId) - if err != nil { - return err - } - - params := &types.QueryGetCurrentAggregateReportRequest{QueryId: qIdBz} + params := &types.QueryGetCurrentAggregateReportRequest{QueryId: queryId} res, err := queryClient.GetCurrentAggregateReport(cmd.Context(), params) if err != nil { diff --git a/x/bridge/keeper/query_get_current_aggregate_report.go b/x/bridge/keeper/query_get_current_aggregate_report.go index d4ef15177..5360c8133 100644 --- a/x/bridge/keeper/query_get_current_aggregate_report.go +++ b/x/bridge/keeper/query_get_current_aggregate_report.go @@ -2,6 +2,7 @@ package keeper import ( "context" + "encoding/hex" "github.com/tellor-io/layer/x/bridge/types" "google.golang.org/grpc/codes" @@ -13,7 +14,11 @@ func (k Keeper) GetCurrentAggregateReport(ctx context.Context, req *types.QueryG return nil, status.Error(codes.InvalidArgument, "invalid request") } - aggregate, timestamp := k.oracleKeeper.GetCurrentAggregateReport(ctx, req.QueryId) + queryId, err := hex.DecodeString(req.QueryId) + if err != nil { + return nil, status.Error(codes.InvalidArgument, "invalid query id") + } + aggregate, timestamp := k.oracleKeeper.GetCurrentAggregateReport(ctx, queryId) if aggregate == nil { return nil, status.Error(codes.NotFound, "aggregate not found") } @@ -30,7 +35,7 @@ func (k Keeper) GetCurrentAggregateReport(ctx context.Context, req *types.QueryG // convert oracletypes.Aggregate to bridgetypes.Aggregate bridgeAggregate := types.Aggregate{ - QueryId: req.QueryId, + QueryId: aggregate.QueryId, AggregateValue: aggregate.AggregateValue, AggregateReporter: aggregate.AggregateReporter, ReporterPower: aggregate.ReporterPower, diff --git a/x/bridge/types/query.pb.go b/x/bridge/types/query.pb.go index d7fec9bf2..a8349954e 100644 --- a/x/bridge/types/query.pb.go +++ b/x/bridge/types/query.pb.go @@ -1036,7 +1036,7 @@ func (m *QueryGetValsetByTimestampResponse) GetBridgeValidatorSet() []*BridgeVal } type QueryGetCurrentAggregateReportRequest struct { - QueryId []byte `protobuf:"bytes,1,opt,name=query_id,json=queryId,proto3" json:"query_id,omitempty"` + QueryId string `protobuf:"bytes,1,opt,name=query_id,json=queryId,proto3" json:"query_id,omitempty"` } func (m *QueryGetCurrentAggregateReportRequest) Reset() { *m = QueryGetCurrentAggregateReportRequest{} } @@ -1072,11 +1072,11 @@ func (m *QueryGetCurrentAggregateReportRequest) XXX_DiscardUnknown() { var xxx_messageInfo_QueryGetCurrentAggregateReportRequest proto.InternalMessageInfo -func (m *QueryGetCurrentAggregateReportRequest) GetQueryId() []byte { +func (m *QueryGetCurrentAggregateReportRequest) GetQueryId() string { if m != nil { return m.QueryId } - return nil + return "" } type QueryGetCurrentAggregateReportResponse struct { @@ -1780,109 +1780,109 @@ func init() { func init() { proto.RegisterFile("layer/bridge/query.proto", fileDescriptor_e48df680904493de) } var fileDescriptor_e48df680904493de = []byte{ - // 1623 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0x4b, 0x8f, 0x13, 0xc7, - 0x16, 0x9e, 0x1e, 0xcf, 0xcb, 0x07, 0xb8, 0x40, 0x61, 0x41, 0x8f, 0x65, 0x8c, 0xe9, 0xcb, 0xe5, - 0x9a, 0xc7, 0x75, 0x33, 0xc3, 0x73, 0x2e, 0x10, 0x31, 0x1e, 0x08, 0x8c, 0x14, 0xa2, 0xc1, 0x83, - 0x88, 0xc2, 0xc6, 0x2a, 0xdb, 0x45, 0xbb, 0x85, 0xdd, 0x6d, 0xba, 0xcb, 0x0e, 0xd6, 0x68, 0x36, - 0xd9, 0x66, 0x13, 0x29, 0xca, 0x3e, 0x7f, 0x20, 0x8b, 0x44, 0x59, 0x45, 0xd9, 0x46, 0x62, 0x17, - 0x94, 0x6c, 0xb2, 0x8a, 0x12, 0x88, 0x94, 0x1f, 0x90, 0x3f, 0x10, 0x75, 0x75, 0xf5, 0xbb, 0xab, - 0xed, 0x19, 0x25, 0xab, 0x71, 0xd7, 0x39, 0x75, 0xea, 0xfb, 0x4e, 0x9d, 0x3a, 0xf5, 0xd5, 0x80, - 0xdc, 0xc3, 0x63, 0x62, 0xa9, 0x2d, 0x4b, 0xef, 0x68, 0x44, 0x7d, 0x31, 0x24, 0xd6, 0xb8, 0x36, - 0xb0, 0x4c, 0x6a, 0xa2, 0x83, 0xcc, 0x52, 0x73, 0x2d, 0xc5, 0x82, 0x66, 0x6a, 0x26, 0x33, 0xa8, - 0xce, 0x2f, 0xd7, 0xa7, 0x58, 0xd2, 0x4c, 0x53, 0xeb, 0x11, 0x15, 0x0f, 0x74, 0x15, 0x1b, 0x86, - 0x49, 0x31, 0xd5, 0x4d, 0xc3, 0xe6, 0xd6, 0xf3, 0x6d, 0xd3, 0xee, 0x9b, 0xb6, 0xda, 0xc2, 0x36, - 0x0f, 0xad, 0x8e, 0x56, 0x5a, 0x84, 0xe2, 0x15, 0x75, 0x80, 0x35, 0xdd, 0x60, 0xce, 0xdc, 0x77, - 0x39, 0x82, 0x63, 0x80, 0x2d, 0xdc, 0xf7, 0xc2, 0x94, 0x5c, 0x93, 0x69, 0xe1, 0xb6, 0xb3, 0x94, - 0xa6, 0x59, 0x44, 0xc3, 0x94, 0xb8, 0x56, 0xa5, 0x00, 0xe8, 0x91, 0x13, 0x7a, 0x8b, 0x4d, 0x69, - 0x90, 0x17, 0x43, 0x62, 0x53, 0x65, 0x13, 0x8e, 0x45, 0x46, 0xed, 0x81, 0x69, 0xd8, 0x04, 0xad, - 0xc2, 0x82, 0x1b, 0x5a, 0x96, 0x2a, 0x52, 0xf5, 0xc0, 0x6a, 0xa1, 0x16, 0x26, 0x59, 0x73, 0xbd, - 0xeb, 0x73, 0xaf, 0x7e, 0x39, 0x35, 0xd3, 0xe0, 0x9e, 0x4a, 0x19, 0x4a, 0x2c, 0xd4, 0x7d, 0x42, - 0xef, 0x8d, 0xfa, 0x4f, 0x70, 0x4f, 0xef, 0x60, 0x6a, 0x5a, 0xfe, 0x52, 0x06, 0x9c, 0x14, 0xd8, - 0xf9, 0xa2, 0x0f, 0x01, 0xb9, 0xf1, 0x7d, 0xdb, 0x36, 0xa1, 0xb2, 0x54, 0xc9, 0x55, 0x0f, 0xac, - 0x9e, 0x8c, 0x02, 0xa8, 0x47, 0xfd, 0x1a, 0x29, 0x13, 0x95, 0x33, 0xa0, 0x78, 0xeb, 0xf9, 0xe3, - 0x1b, 0x5d, 0xd2, 0x7e, 0x3e, 0x30, 0x75, 0x83, 0x7a, 0xa8, 0x3e, 0x80, 0x7f, 0x67, 0x7a, 0x71, - 0x6c, 0x97, 0xe0, 0xd8, 0x28, 0x69, 0x66, 0xd9, 0xc9, 0x37, 0xd2, 0x4c, 0xca, 0x23, 0x38, 0x1c, - 0x43, 0x89, 0xaa, 0x70, 0x98, 0xd0, 0x2e, 0xb1, 0xc8, 0xb0, 0xbf, 0xde, 0xe9, 0x58, 0xc4, 0xb6, - 0x79, 0x80, 0xf8, 0x30, 0x2a, 0xc0, 0xfc, 0xc0, 0xfc, 0x88, 0x58, 0xf2, 0x6c, 0x45, 0xaa, 0xce, - 0x35, 0xdc, 0x0f, 0xa5, 0x0d, 0xa8, 0x9e, 0xe0, 0xf9, 0x77, 0xa7, 0xed, 0x9b, 0x59, 0x90, 0x93, - 0xab, 0xb8, 0x3b, 0x8e, 0xb6, 0x04, 0x6b, 0x39, 0x35, 0x52, 0xc9, 0x5c, 0x6b, 0x9b, 0xd0, 0xb4, - 0xe5, 0x50, 0x0d, 0x90, 0x9f, 0xbd, 0xc7, 0x7a, 0x9f, 0xd8, 0x14, 0xf7, 0x07, 0x8c, 0x76, 0xae, - 0x91, 0x62, 0x41, 0x37, 0xe0, 0x84, 0x3f, 0xba, 0xe5, 0x64, 0xe5, 0x71, 0xd7, 0x22, 0x76, 0xd7, - 0xec, 0x75, 0xe4, 0x1c, 0x9b, 0x24, 0x32, 0xa3, 0xf3, 0x70, 0x64, 0x14, 0x5a, 0xf9, 0x01, 0xb6, - 0xbb, 0xf2, 0x5c, 0x45, 0xaa, 0x1e, 0x6c, 0x24, 0xc6, 0x45, 0xdb, 0x3d, 0xcf, 0xdc, 0x53, 0xb7, - 0xfb, 0x5b, 0x09, 0x94, 0x24, 0xe5, 0xc0, 0x81, 0x27, 0x30, 0x9d, 0xae, 0xb4, 0x1f, 0xba, 0xb3, - 0x7b, 0xa7, 0x9b, 0x4b, 0xa7, 0xab, 0x6c, 0x41, 0x29, 0x0b, 0x7b, 0x56, 0xf5, 0x0b, 0xd2, 0xf1, - 0x00, 0xaa, 0x19, 0xc7, 0x2a, 0xd2, 0x83, 0x50, 0x09, 0xf2, 0x34, 0x96, 0x8a, 0x60, 0x40, 0xf9, - 0x4a, 0x82, 0x73, 0x53, 0x84, 0xe2, 0xe7, 0xb4, 0x0c, 0xd0, 0x8e, 0x1f, 0xcf, 0xd0, 0x88, 0x63, - 0x1f, 0xe1, 0x9e, 0xcd, 0xf3, 0x31, 0xeb, 0xda, 0x83, 0x91, 0x28, 0x96, 0x5c, 0x0c, 0x0b, 0x3a, - 0x0b, 0xff, 0x1a, 0x44, 0x37, 0x61, 0x8e, 0xb9, 0xc4, 0x46, 0x95, 0x3b, 0x29, 0xec, 0xfd, 0x3d, - 0xad, 0x8f, 0x37, 0x8d, 0x0e, 0x79, 0xe9, 0xb1, 0x2f, 0xc0, 0xbc, 0xee, 0x7c, 0x73, 0xe6, 0xee, - 0x87, 0xb2, 0x99, 0x42, 0x3a, 0x19, 0x81, 0x93, 0xce, 0x4e, 0xe0, 0x1a, 0x2c, 0x87, 0x42, 0xd9, - 0x84, 0x6e, 0xeb, 0xda, 0x94, 0xb9, 0xbf, 0x05, 0xc5, 0xb4, 0xa9, 0x41, 0xae, 0x6d, 0x5d, 0x33, - 0x30, 0x1d, 0x5a, 0xc4, 0x66, 0x0d, 0x27, 0xdf, 0x08, 0x8d, 0x28, 0x1f, 0xc2, 0x85, 0x50, 0xc3, - 0xe7, 0xad, 0xad, 0x3e, 0xf6, 0xf9, 0xf0, 0x11, 0x0f, 0x4a, 0xb8, 0x60, 0xa3, 0xed, 0x31, 0x31, - 0xae, 0xbc, 0x0f, 0x17, 0xa7, 0x0b, 0x1d, 0x40, 0x25, 0xa3, 0x58, 0xd3, 0x0d, 0x8d, 0x28, 0x77, - 0xa0, 0x12, 0x25, 0x5a, 0x1f, 0xfb, 0xd9, 0x9e, 0x2e, 0x55, 0x16, 0x9c, 0xce, 0x88, 0xf0, 0xcf, - 0xdc, 0x70, 0x75, 0xf8, 0x8f, 0xb7, 0xe6, 0xc6, 0xd0, 0xb2, 0x88, 0x41, 0xd7, 0xbd, 0x4b, 0xbf, - 0x41, 0x06, 0xa6, 0xe5, 0x5d, 0x72, 0x68, 0x19, 0x96, 0x98, 0xac, 0x68, 0xea, 0x1d, 0x7e, 0x68, - 0x17, 0xd9, 0xf7, 0x66, 0x47, 0xd9, 0x85, 0xb3, 0x93, 0x62, 0x70, 0xf0, 0x57, 0x21, 0xef, 0x6b, - 0x0a, 0xde, 0xf2, 0x4f, 0x44, 0x31, 0x07, 0x33, 0x03, 0xcf, 0x68, 0xda, 0xdc, 0xeb, 0x2c, 0x94, - 0xb6, 0x4f, 0x72, 0x90, 0xf7, 0xa7, 0x65, 0xe0, 0x74, 0x8e, 0x9e, 0x1f, 0xf3, 0x09, 0xee, 0x0d, - 0x09, 0x3f, 0xbc, 0xb1, 0x51, 0x74, 0x11, 0x8e, 0xe2, 0x28, 0x01, 0x62, 0xb1, 0x83, 0x9c, 0x6f, - 0x24, 0x0d, 0xe8, 0x0c, 0x1c, 0xb2, 0xf8, 0x6f, 0xd6, 0x3e, 0xf9, 0x79, 0x8e, 0x0e, 0x3a, 0x31, - 0x6d, 0x8a, 0x8d, 0x0e, 0xb6, 0x3a, 0x77, 0xc9, 0x48, 0x67, 0x72, 0x8c, 0xdd, 0x05, 0x52, 0x23, - 0x69, 0x40, 0xb7, 0x21, 0xef, 0x4d, 0xb7, 0xe5, 0x05, 0xb6, 0xb7, 0xa7, 0x44, 0x79, 0xe2, 0x7e, - 0x8d, 0x60, 0x06, 0x92, 0x61, 0xf1, 0x59, 0x0f, 0x6b, 0x1a, 0xe9, 0xc8, 0x8b, 0x15, 0xa9, 0xba, - 0xd4, 0xf0, 0x3e, 0x9d, 0x4e, 0x61, 0x98, 0x46, 0x9b, 0xc8, 0x4b, 0x6e, 0xa7, 0x60, 0x1f, 0x68, - 0x15, 0x0a, 0x31, 0x5e, 0xac, 0x39, 0xc8, 0x79, 0xe6, 0x94, 0x6a, 0x43, 0xc7, 0x61, 0xa1, 0x4b, - 0x74, 0xad, 0x4b, 0x65, 0x60, 0x5e, 0xfc, 0x4b, 0xb9, 0x07, 0x47, 0x13, 0xd8, 0x50, 0x11, 0x96, - 0x3c, 0x74, 0xfc, 0xe4, 0xf8, 0xdf, 0x51, 0x9d, 0x92, 0xf3, 0x74, 0xca, 0xe3, 0xa0, 0xe3, 0xdc, - 0xc5, 0x14, 0xd7, 0xc9, 0x33, 0xd3, 0x22, 0x93, 0x6b, 0x31, 0x59, 0x2a, 0x91, 0x13, 0xf6, 0x22, - 0x68, 0x46, 0xe1, 0xa8, 0x93, 0xab, 0xd3, 0x15, 0xc4, 0xfb, 0xa9, 0xce, 0xa7, 0x41, 0x5b, 0xd8, - 0x36, 0xf0, 0xc0, 0xee, 0x9a, 0xd4, 0xae, 0x8f, 0xa3, 0x67, 0x4b, 0x06, 0x0f, 0x3f, 0xcf, 0x8e, - 0x98, 0x4e, 0x3e, 0x1c, 0x7b, 0x3d, 0x68, 0x18, 0x29, 0xb1, 0x83, 0xce, 0x6e, 0x7b, 0x46, 0xde, - 0x61, 0x83, 0x01, 0xe5, 0xdd, 0xe0, 0x9a, 0x59, 0xa7, 0xd4, 0x89, 0xeb, 0x14, 0x20, 0x4b, 0xce, - 0xd8, 0x8b, 0xe9, 0xc1, 0x2c, 0xc2, 0x92, 0x37, 0xd1, 0xdb, 0x45, 0xef, 0x5b, 0xf9, 0x73, 0x36, - 0xb8, 0x6d, 0x32, 0x02, 0x71, 0x4c, 0xfb, 0x24, 0x9c, 0x72, 0x82, 0x73, 0xa9, 0x27, 0x38, 0xec, - 0x17, 0x1c, 0xca, 0xb0, 0x9f, 0x7b, 0x2a, 0xa3, 0x57, 0xfd, 0x7c, 0xe2, 0xaa, 0x77, 0x0e, 0x46, - 0x40, 0x26, 0x10, 0x5b, 0x0b, 0xcc, 0x33, 0xd5, 0xe6, 0xc8, 0xad, 0x81, 0x45, 0x46, 0xba, 0x39, - 0xb4, 0xdd, 0x9d, 0x08, 0xa6, 0x2d, 0xb2, 0x69, 0x22, 0xb3, 0x23, 0x91, 0x0c, 0xf2, 0x92, 0xc6, - 0x67, 0x2d, 0xb9, 0x0f, 0x84, 0x14, 0x93, 0xb2, 0x11, 0x74, 0xef, 0x50, 0xd2, 0xed, 0xbd, 0x6d, - 0xdd, 0x7b, 0x41, 0xfb, 0x16, 0x05, 0xe1, 0xdb, 0xa6, 0xc0, 0xc1, 0x10, 0x65, 0xaf, 0x9a, 0x22, - 0x63, 0xab, 0xbf, 0x21, 0x98, 0x67, 0xe1, 0xd0, 0x73, 0x58, 0xe0, 0x8a, 0x35, 0x26, 0xeb, 0x93, - 0x6f, 0xc8, 0xe2, 0xe9, 0x0c, 0x0f, 0x77, 0x71, 0xa5, 0xf4, 0xf1, 0x4f, 0xbf, 0x7f, 0x36, 0x7b, - 0x1c, 0x15, 0xd4, 0x94, 0xe7, 0x2b, 0xfa, 0x5c, 0x82, 0x23, 0xf1, 0x57, 0x21, 0x3a, 0x9f, 0x12, - 0x55, 0xf0, 0xb4, 0x2c, 0x5e, 0x98, 0xca, 0x97, 0x63, 0xa9, 0x32, 0x2c, 0x0a, 0xaa, 0x44, 0xb1, - 0x68, 0x84, 0x36, 0xc9, 0xa8, 0xdf, 0x1c, 0x05, 0x10, 0xbe, 0x94, 0xe0, 0x78, 0xba, 0xea, 0x44, - 0x97, 0xd2, 0x57, 0x14, 0x3f, 0x34, 0x8b, 0x2b, 0x7b, 0x98, 0xc1, 0x91, 0xd6, 0x18, 0xd2, 0x2a, - 0x3a, 0x9b, 0x44, 0xea, 0xa3, 0x6c, 0x86, 0x2a, 0xfe, 0x47, 0x09, 0x4a, 0x59, 0x2a, 0x19, 0x5d, - 0x9b, 0x1a, 0x43, 0x74, 0x87, 0xaf, 0xef, 0x79, 0x1e, 0x67, 0xb0, 0xce, 0x18, 0xdc, 0x44, 0x6b, - 0xd3, 0x31, 0x68, 0xba, 0x05, 0xa1, 0xee, 0xf8, 0x5d, 0x63, 0x17, 0xfd, 0x10, 0x23, 0x15, 0x57, - 0xc1, 0x13, 0x49, 0x09, 0x84, 0xf7, 0x44, 0x52, 0x22, 0xb9, 0xad, 0xbc, 0xc3, 0x48, 0xdd, 0x40, - 0xd7, 0xb2, 0x48, 0xf9, 0x0c, 0x9a, 0xad, 0x71, 0x93, 0x69, 0x7a, 0x75, 0x87, 0xfd, 0xd9, 0x75, - 0xca, 0xfd, 0x50, 0x44, 0x51, 0xa3, 0xff, 0x0a, 0xa1, 0x44, 0xe5, 0x7a, 0xb1, 0x3a, 0xd9, 0x91, - 0x83, 0x5c, 0x61, 0x20, 0x2f, 0xa0, 0x73, 0xa9, 0x20, 0x6d, 0x42, 0x9b, 0xb6, 0xae, 0x45, 0x33, - 0xfd, 0x87, 0x04, 0xa7, 0x26, 0x08, 0x6a, 0xb4, 0x26, 0x3c, 0x69, 0x93, 0xf4, 0x7d, 0xf1, 0xff, - 0xfb, 0x99, 0xca, 0xd9, 0x3c, 0x64, 0x6c, 0xee, 0xa3, 0x7b, 0xe9, 0x67, 0x16, 0xbb, 0xee, 0x4e, - 0xaa, 0x83, 0x1d, 0xe0, 0x83, 0xea, 0x4e, 0xfc, 0xf5, 0xb0, 0x8b, 0xbe, 0x96, 0xa0, 0x90, 0x26, - 0xd4, 0x51, 0x2d, 0x2b, 0xbf, 0xc9, 0x37, 0x41, 0x51, 0x9d, 0xda, 0x9f, 0x13, 0x59, 0x63, 0x44, - 0x2e, 0xa3, 0x15, 0xe1, 0xb6, 0xb4, 0xc6, 0x41, 0xed, 0x44, 0xb6, 0xe7, 0x7b, 0x09, 0x96, 0x85, - 0x2a, 0x1d, 0x5d, 0x4e, 0x47, 0x92, 0xf9, 0x2e, 0x28, 0x5e, 0xd9, 0xdb, 0x24, 0xce, 0xe1, 0x36, - 0xe3, 0x70, 0x1d, 0x5d, 0x4d, 0x72, 0x68, 0xbb, 0x33, 0x9b, 0xfe, 0x55, 0xdd, 0x74, 0xa5, 0xa2, - 0xba, 0xe3, 0x69, 0xbe, 0x5d, 0xf4, 0x85, 0x5b, 0xfe, 0x81, 0x86, 0x13, 0x95, 0x7f, 0x42, 0x3b, - 0x8a, 0xca, 0x3f, 0x29, 0x07, 0x95, 0x5b, 0x0c, 0xe3, 0x35, 0x74, 0x25, 0x89, 0xb1, 0x83, 0x29, - 0x6e, 0xb6, 0x98, 0x7b, 0x08, 0x56, 0x24, 0xd5, 0xdf, 0xb9, 0xf5, 0x91, 0xd0, 0x65, 0xa2, 0xfa, - 0x10, 0x89, 0x43, 0x51, 0x7d, 0x08, 0x05, 0x9f, 0xb2, 0xc1, 0x70, 0xdf, 0x46, 0x37, 0x93, 0xb8, - 0x7d, 0xdd, 0xe7, 0x94, 0x48, 0x24, 0xad, 0x9b, 0x31, 0xf8, 0xfc, 0x1e, 0x10, 0x4a, 0x39, 0x51, - 0xcb, 0x9c, 0x24, 0x22, 0x45, 0x2d, 0x73, 0xa2, 0x66, 0xcc, 0xba, 0x07, 0x42, 0x02, 0x84, 0x6f, - 0xcd, 0xd8, 0xa7, 0xaa, 0xee, 0x78, 0xbf, 0xfc, 0xf2, 0x4f, 0x57, 0x39, 0xa2, 0xf2, 0xcf, 0x14, - 0x56, 0xa2, 0xf2, 0xcf, 0x16, 0x52, 0x59, 0xe5, 0x1f, 0x16, 0x53, 0x02, 0x1e, 0xf5, 0x8d, 0x57, - 0x6f, 0xca, 0xd2, 0xeb, 0x37, 0x65, 0xe9, 0xd7, 0x37, 0x65, 0xe9, 0xd3, 0xb7, 0xe5, 0x99, 0xd7, - 0x6f, 0xcb, 0x33, 0x3f, 0xbf, 0x2d, 0xcf, 0x3c, 0x3d, 0xa7, 0xe9, 0xb4, 0x3b, 0x6c, 0xd5, 0xda, - 0x66, 0x5f, 0xa5, 0xa4, 0xd7, 0x33, 0xad, 0xff, 0xe9, 0x26, 0x5f, 0xe4, 0xa5, 0xb7, 0x0c, 0x1d, - 0x0f, 0x88, 0xdd, 0x5a, 0x60, 0xff, 0xd3, 0xbf, 0xfc, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0x6b, - 0x4e, 0x9f, 0xa8, 0x96, 0x18, 0x00, 0x00, + // 1626 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0xcf, 0x6f, 0x1b, 0xc5, + 0x17, 0xcf, 0xc6, 0xf9, 0xe5, 0xd7, 0xf4, 0xdb, 0x76, 0x6a, 0xb5, 0x1b, 0x2b, 0x75, 0xdd, 0xfd, + 0x96, 0xe2, 0xfe, 0xc0, 0xdb, 0xa4, 0x3f, 0x43, 0x5b, 0xd4, 0x38, 0x2d, 0x6d, 0x24, 0x8a, 0x52, + 0xa7, 0x2a, 0xa2, 0x17, 0x6b, 0x6c, 0x4f, 0xd7, 0xab, 0xda, 0xbb, 0xee, 0xee, 0xd8, 0xd4, 0x8a, + 0x72, 0xe1, 0xca, 0x05, 0x09, 0x71, 0xe7, 0x1f, 0xe0, 0x00, 0xe2, 0x84, 0xb8, 0x22, 0xf5, 0x46, + 0x05, 0x17, 0x4e, 0x08, 0x5a, 0x24, 0xfe, 0x00, 0xfe, 0x01, 0xb4, 0xb3, 0xb3, 0xbf, 0x77, 0xd6, + 0x4e, 0x04, 0xa7, 0x78, 0xe7, 0xbd, 0x79, 0xf3, 0xf9, 0xbc, 0x79, 0xf3, 0xe6, 0x33, 0x01, 0xb9, + 0x8b, 0x47, 0xc4, 0x52, 0x9b, 0x96, 0xde, 0xd6, 0x88, 0xfa, 0x7c, 0x40, 0xac, 0x51, 0xb5, 0x6f, + 0x99, 0xd4, 0x44, 0x8b, 0xcc, 0x52, 0x75, 0x2d, 0xc5, 0x82, 0x66, 0x6a, 0x26, 0x33, 0xa8, 0xce, + 0x2f, 0xd7, 0xa7, 0xb8, 0xac, 0x99, 0xa6, 0xd6, 0x25, 0x2a, 0xee, 0xeb, 0x2a, 0x36, 0x0c, 0x93, + 0x62, 0xaa, 0x9b, 0x86, 0xcd, 0xad, 0xe7, 0x5a, 0xa6, 0xdd, 0x33, 0x6d, 0xb5, 0x89, 0x6d, 0x1e, + 0x5a, 0x1d, 0xae, 0x34, 0x09, 0xc5, 0x2b, 0x6a, 0x1f, 0x6b, 0xba, 0xc1, 0x9c, 0xb9, 0xef, 0x52, + 0x04, 0x47, 0x1f, 0x5b, 0xb8, 0xe7, 0x85, 0x59, 0x76, 0x4d, 0xa6, 0x85, 0x5b, 0xce, 0x52, 0x9a, + 0x66, 0x11, 0x0d, 0x53, 0xe2, 0x5a, 0x95, 0x02, 0xa0, 0x87, 0x4e, 0xe8, 0x2d, 0x36, 0xa5, 0x4e, + 0x9e, 0x0f, 0x88, 0x4d, 0x95, 0x4d, 0x38, 0x1a, 0x19, 0xb5, 0xfb, 0xa6, 0x61, 0x13, 0xb4, 0x0a, + 0x73, 0x6e, 0x68, 0x59, 0x2a, 0x4b, 0x95, 0x03, 0xab, 0x85, 0x6a, 0x98, 0x64, 0xd5, 0xf5, 0xae, + 0xcd, 0xbc, 0xfc, 0xed, 0xe4, 0x54, 0x9d, 0x7b, 0x2a, 0x25, 0x58, 0x66, 0xa1, 0xee, 0x11, 0x7a, + 0x77, 0xd8, 0x7b, 0x8c, 0xbb, 0x7a, 0x1b, 0x53, 0xd3, 0xf2, 0x97, 0x32, 0xe0, 0x84, 0xc0, 0xce, + 0x17, 0x7d, 0x00, 0xc8, 0x8d, 0xef, 0xdb, 0xb6, 0x09, 0x95, 0xa5, 0x72, 0xae, 0x72, 0x60, 0xf5, + 0x44, 0x14, 0x40, 0x2d, 0xea, 0x57, 0x4f, 0x99, 0xa8, 0x9c, 0x06, 0xc5, 0x5b, 0xcf, 0x1f, 0xdf, + 0xe8, 0x90, 0xd6, 0xb3, 0xbe, 0xa9, 0x1b, 0xd4, 0x43, 0xf5, 0x11, 0xfc, 0x3f, 0xd3, 0x8b, 0x63, + 0xbb, 0x08, 0x47, 0x87, 0x49, 0x33, 0xcb, 0x4e, 0xbe, 0x9e, 0x66, 0x52, 0x1e, 0xc2, 0xa1, 0x18, + 0x4a, 0x54, 0x81, 0x43, 0x84, 0x76, 0x88, 0x45, 0x06, 0xbd, 0xf5, 0x76, 0xdb, 0x22, 0xb6, 0xcd, + 0x03, 0xc4, 0x87, 0x51, 0x01, 0x66, 0xfb, 0xe6, 0x27, 0xc4, 0x92, 0xa7, 0xcb, 0x52, 0x65, 0xa6, + 0xee, 0x7e, 0x28, 0x2d, 0x40, 0xb5, 0x04, 0xcf, 0x7f, 0x3b, 0x6d, 0xdf, 0x4d, 0x83, 0x9c, 0x5c, + 0xc5, 0xdd, 0x71, 0xb4, 0x25, 0x58, 0xcb, 0xa9, 0x91, 0x72, 0xe6, 0x5a, 0xdb, 0x84, 0xa6, 0x2d, + 0x87, 0xaa, 0x80, 0xfc, 0xec, 0x3d, 0xd2, 0x7b, 0xc4, 0xa6, 0xb8, 0xd7, 0x67, 0xb4, 0x73, 0xf5, + 0x14, 0x0b, 0xba, 0x0e, 0xc7, 0xfd, 0xd1, 0x2d, 0x27, 0x2b, 0x8f, 0x3a, 0x16, 0xb1, 0x3b, 0x66, + 0xb7, 0x2d, 0xe7, 0xd8, 0x24, 0x91, 0x19, 0x9d, 0x83, 0xc3, 0xc3, 0xd0, 0xca, 0xf7, 0xb1, 0xdd, + 0x91, 0x67, 0xca, 0x52, 0x65, 0xb1, 0x9e, 0x18, 0x17, 0x6d, 0xf7, 0x2c, 0x73, 0x4f, 0xdd, 0xee, + 0xef, 0x25, 0x50, 0x92, 0x94, 0x03, 0x07, 0x9e, 0xc0, 0x74, 0xba, 0xd2, 0x7e, 0xe8, 0x4e, 0xef, + 0x9d, 0x6e, 0x2e, 0x9d, 0xae, 0xb2, 0x05, 0xcb, 0x59, 0xd8, 0xb3, 0xaa, 0x5f, 0x90, 0x8e, 0xfb, + 0x50, 0xc9, 0x38, 0x56, 0x91, 0x1e, 0x84, 0x96, 0x21, 0x4f, 0x63, 0xa9, 0x08, 0x06, 0x94, 0x6f, + 0x24, 0x38, 0x3b, 0x41, 0x28, 0x7e, 0x4e, 0x4b, 0x00, 0xad, 0xf8, 0xf1, 0x0c, 0x8d, 0x38, 0xf6, + 0x21, 0xee, 0xda, 0x3c, 0x1f, 0xd3, 0xae, 0x3d, 0x18, 0x89, 0x62, 0xc9, 0xc5, 0xb0, 0xa0, 0x33, + 0xf0, 0xbf, 0x7e, 0x74, 0x13, 0x66, 0x98, 0x4b, 0x6c, 0x54, 0xb9, 0x9d, 0xc2, 0xde, 0xdf, 0xd3, + 0xda, 0x68, 0xd3, 0x68, 0x93, 0x17, 0x1e, 0xfb, 0x02, 0xcc, 0xea, 0xce, 0x37, 0x67, 0xee, 0x7e, + 0x28, 0x9b, 0x29, 0xa4, 0x93, 0x11, 0x38, 0xe9, 0xec, 0x04, 0xae, 0xc1, 0x52, 0x28, 0x94, 0x4d, + 0xe8, 0xb6, 0xae, 0x4d, 0x98, 0xfb, 0x9b, 0x50, 0x4c, 0x9b, 0x1a, 0xe4, 0xda, 0xd6, 0x35, 0x03, + 0xd3, 0x81, 0x45, 0x6c, 0xd6, 0x70, 0xf2, 0xf5, 0xd0, 0x88, 0xf2, 0x31, 0x9c, 0x0f, 0x35, 0x7c, + 0xde, 0xda, 0x6a, 0x23, 0x9f, 0x0f, 0x1f, 0xf1, 0xa0, 0x84, 0x0b, 0x36, 0xda, 0x1e, 0x13, 0xe3, + 0xca, 0x87, 0x70, 0x61, 0xb2, 0xd0, 0x01, 0x54, 0x32, 0x8c, 0x35, 0xdd, 0xd0, 0x88, 0x72, 0x1b, + 0xca, 0x51, 0xa2, 0xb5, 0x91, 0x9f, 0xed, 0xc9, 0x52, 0x65, 0xc1, 0xa9, 0x8c, 0x08, 0xff, 0xcd, + 0x0d, 0x57, 0x83, 0xb7, 0xbc, 0x35, 0x37, 0x06, 0x96, 0x45, 0x0c, 0xba, 0xee, 0x5d, 0xfa, 0x75, + 0xd2, 0x37, 0x2d, 0xef, 0x92, 0x43, 0x4b, 0xb0, 0xc0, 0x64, 0x45, 0x43, 0x6f, 0x73, 0xf2, 0xf3, + 0xec, 0x7b, 0xb3, 0xad, 0xec, 0xc2, 0x99, 0x71, 0x31, 0x38, 0xf8, 0x2b, 0x90, 0xf7, 0x35, 0x05, + 0x6f, 0xf9, 0xc7, 0xa3, 0x98, 0x83, 0x99, 0x81, 0x67, 0x34, 0x6d, 0xee, 0x75, 0x16, 0x4a, 0xdb, + 0x67, 0x39, 0xc8, 0xfb, 0xd3, 0x12, 0x38, 0x17, 0x7d, 0x9c, 0xce, 0xd1, 0xf3, 0x63, 0x3e, 0xc6, + 0xdd, 0x01, 0xe1, 0x87, 0x37, 0x36, 0x8a, 0x2e, 0xc0, 0x11, 0x1c, 0x25, 0x40, 0x2c, 0x76, 0x90, + 0xf3, 0xf5, 0xa4, 0x01, 0x9d, 0x86, 0x83, 0x16, 0xff, 0xcd, 0xda, 0x27, 0x3f, 0xcf, 0xd1, 0x41, + 0x27, 0xa6, 0x4d, 0xb1, 0xd1, 0xc6, 0x56, 0xfb, 0x0e, 0x19, 0xea, 0x4c, 0x8e, 0xb1, 0xbb, 0x40, + 0xaa, 0x27, 0x0d, 0xe8, 0x16, 0xe4, 0xbd, 0xe9, 0xb6, 0x3c, 0xc7, 0xf6, 0xf6, 0xa4, 0x28, 0x4f, + 0xdc, 0xaf, 0x1e, 0xcc, 0x40, 0x32, 0xcc, 0x3f, 0xed, 0x62, 0x4d, 0x23, 0x6d, 0x79, 0xbe, 0x2c, + 0x55, 0x16, 0xea, 0xde, 0xa7, 0xd3, 0x29, 0x0c, 0xd3, 0x68, 0x11, 0x79, 0xc1, 0xed, 0x14, 0xec, + 0x03, 0xad, 0x42, 0x21, 0xc6, 0x8b, 0x35, 0x07, 0x39, 0xcf, 0x9c, 0x52, 0x6d, 0xe8, 0x18, 0xcc, + 0x75, 0x88, 0xae, 0x75, 0xa8, 0x0c, 0xcc, 0x8b, 0x7f, 0x29, 0x77, 0xe1, 0x48, 0x02, 0x1b, 0x2a, + 0xc2, 0x82, 0x87, 0x8e, 0x17, 0x8f, 0xff, 0x1d, 0xd5, 0x29, 0x39, 0x4f, 0xa7, 0x3c, 0x0a, 0x3a, + 0xce, 0x1d, 0x4c, 0x71, 0x8d, 0x3c, 0x35, 0x2d, 0x22, 0xaa, 0xc5, 0xd0, 0x1e, 0x27, 0x4a, 0x25, + 0x72, 0xc2, 0x9e, 0x07, 0xcd, 0x28, 0x1c, 0x75, 0x7c, 0x75, 0xba, 0x82, 0x78, 0x3f, 0xd5, 0xf9, + 0x24, 0x68, 0x0b, 0xdb, 0x06, 0xee, 0xdb, 0x1d, 0x93, 0xda, 0xb5, 0x51, 0xf4, 0x6c, 0xc9, 0xe0, + 0xe1, 0x8f, 0x1d, 0xad, 0x64, 0xec, 0x7c, 0x38, 0xf6, 0x7a, 0xd0, 0x30, 0x52, 0x62, 0x07, 0x9d, + 0xdd, 0xf6, 0x8c, 0xbc, 0xc3, 0x06, 0x03, 0xca, 0xfb, 0xc1, 0x35, 0xb3, 0x4e, 0xa9, 0x13, 0xd7, + 0x29, 0x40, 0x96, 0x9c, 0x91, 0x17, 0xd3, 0x83, 0x59, 0x84, 0x05, 0x6f, 0xa2, 0xb7, 0x8b, 0xde, + 0xb7, 0xf2, 0xf7, 0x74, 0x70, 0xdb, 0x64, 0x04, 0xe2, 0x98, 0xf6, 0x49, 0x38, 0xe5, 0x04, 0xe7, + 0x52, 0x4f, 0x70, 0xd8, 0x2f, 0x38, 0x94, 0x61, 0x3f, 0xf7, 0x54, 0x46, 0xaf, 0xfa, 0xd9, 0xc4, + 0x55, 0xef, 0x1c, 0x8c, 0x80, 0x4c, 0x20, 0xb6, 0xe6, 0x98, 0x67, 0xaa, 0xcd, 0x91, 0x5b, 0x7d, + 0x8b, 0x0c, 0x75, 0x73, 0x60, 0xbb, 0x3b, 0x11, 0x4c, 0x9b, 0x67, 0xd3, 0x44, 0x66, 0x47, 0x22, + 0x19, 0xe4, 0x05, 0x8d, 0xcf, 0x5a, 0x70, 0x1f, 0x08, 0x29, 0x26, 0x65, 0x23, 0xe8, 0xde, 0xa1, + 0xa4, 0xdb, 0x7b, 0xdb, 0xba, 0x0f, 0x82, 0xf6, 0x2d, 0x0a, 0xc2, 0xb7, 0x4d, 0x81, 0xc5, 0x10, + 0x65, 0xaf, 0x9a, 0x22, 0x63, 0xab, 0x7f, 0x20, 0x98, 0x65, 0xe1, 0xd0, 0x33, 0x98, 0xe3, 0x8a, + 0x35, 0x26, 0xeb, 0x93, 0x6f, 0xc8, 0xe2, 0xa9, 0x0c, 0x0f, 0x77, 0x71, 0x65, 0xf9, 0xd3, 0x5f, + 0xfe, 0xfc, 0x62, 0xfa, 0x18, 0x2a, 0xa8, 0x29, 0xcf, 0x57, 0xf4, 0xa5, 0x04, 0x87, 0xe3, 0xaf, + 0x42, 0x74, 0x2e, 0x25, 0xaa, 0xe0, 0x69, 0x59, 0x3c, 0x3f, 0x91, 0x2f, 0xc7, 0x52, 0x61, 0x58, + 0x14, 0x54, 0x8e, 0x62, 0xd1, 0x08, 0x6d, 0x90, 0x61, 0xaf, 0x31, 0x0c, 0x20, 0x7c, 0x2d, 0xc1, + 0xb1, 0x74, 0xd5, 0x89, 0x2e, 0xa6, 0xaf, 0x28, 0x7e, 0x68, 0x16, 0x57, 0xf6, 0x30, 0x83, 0x23, + 0xad, 0x32, 0xa4, 0x15, 0x74, 0x26, 0x89, 0xd4, 0x47, 0xd9, 0x08, 0x55, 0xfc, 0xcf, 0x12, 0x2c, + 0x67, 0xa9, 0x64, 0x74, 0x75, 0x62, 0x0c, 0xd1, 0x1d, 0xbe, 0xb6, 0xe7, 0x79, 0x9c, 0xc1, 0x3a, + 0x63, 0x70, 0x03, 0xad, 0x4d, 0xc6, 0xa0, 0xe1, 0x16, 0x84, 0xba, 0xe3, 0x77, 0x8d, 0x5d, 0xf4, + 0x53, 0x8c, 0x54, 0x5c, 0x05, 0x8f, 0x25, 0x25, 0x10, 0xde, 0x63, 0x49, 0x89, 0xe4, 0xb6, 0xf2, + 0x1e, 0x23, 0x75, 0x1d, 0x5d, 0xcd, 0x22, 0xe5, 0x33, 0x68, 0x34, 0x47, 0x0d, 0xa6, 0xe9, 0xd5, + 0x1d, 0xf6, 0x67, 0xd7, 0x29, 0xf7, 0x83, 0x11, 0x45, 0x8d, 0xde, 0x16, 0x42, 0x89, 0xca, 0xf5, + 0x62, 0x65, 0xbc, 0x23, 0x07, 0xb9, 0xc2, 0x40, 0x9e, 0x47, 0x67, 0x53, 0x41, 0xda, 0x84, 0x36, + 0x6c, 0x5d, 0x8b, 0x66, 0xfa, 0x2f, 0x09, 0x4e, 0x8e, 0x11, 0xd4, 0x68, 0x4d, 0x78, 0xd2, 0xc6, + 0xe9, 0xfb, 0xe2, 0xbb, 0xfb, 0x99, 0xca, 0xd9, 0x3c, 0x60, 0x6c, 0xee, 0xa1, 0xbb, 0xe9, 0x67, + 0x16, 0xbb, 0xee, 0x4e, 0xaa, 0x83, 0x1d, 0xe0, 0x83, 0xea, 0x4e, 0xfc, 0xf5, 0xb0, 0x8b, 0xbe, + 0x95, 0xa0, 0x90, 0x26, 0xd4, 0x51, 0x35, 0x2b, 0xbf, 0xc9, 0x37, 0x41, 0x51, 0x9d, 0xd8, 0x9f, + 0x13, 0x59, 0x63, 0x44, 0x2e, 0xa1, 0x15, 0xe1, 0xb6, 0x34, 0x47, 0x41, 0xed, 0x44, 0xb6, 0xe7, + 0x47, 0x09, 0x96, 0x84, 0x2a, 0x1d, 0x5d, 0x4a, 0x47, 0x92, 0xf9, 0x2e, 0x28, 0x5e, 0xde, 0xdb, + 0x24, 0xce, 0xe1, 0x16, 0xe3, 0x70, 0x0d, 0x5d, 0x49, 0x72, 0x68, 0xb9, 0x33, 0x1b, 0xfe, 0x55, + 0xdd, 0x70, 0xa5, 0xa2, 0xba, 0xe3, 0x69, 0xbe, 0x5d, 0xf4, 0x95, 0x5b, 0xfe, 0x81, 0x86, 0x13, + 0x95, 0x7f, 0x42, 0x3b, 0x8a, 0xca, 0x3f, 0x29, 0x07, 0x95, 0x9b, 0x0c, 0xe3, 0x55, 0x74, 0x39, + 0x89, 0xb1, 0x8d, 0x29, 0x6e, 0x34, 0x99, 0x7b, 0x08, 0x56, 0x24, 0xd5, 0x3f, 0xb8, 0xf5, 0x91, + 0xd0, 0x65, 0xa2, 0xfa, 0x10, 0x89, 0x43, 0x51, 0x7d, 0x08, 0x05, 0x9f, 0xb2, 0xc1, 0x70, 0xdf, + 0x42, 0x37, 0x92, 0xb8, 0x7d, 0xdd, 0xe7, 0x94, 0x48, 0x24, 0xad, 0x9b, 0x31, 0xf8, 0xfc, 0x1e, + 0x10, 0x4a, 0x39, 0x51, 0xcb, 0x1c, 0x27, 0x22, 0x45, 0x2d, 0x73, 0xac, 0x66, 0xcc, 0xba, 0x07, + 0x42, 0x02, 0x84, 0x6f, 0xcd, 0xc8, 0xa7, 0xaa, 0xee, 0x78, 0xbf, 0xfc, 0xf2, 0x4f, 0x57, 0x39, + 0xa2, 0xf2, 0xcf, 0x14, 0x56, 0xa2, 0xf2, 0xcf, 0x16, 0x52, 0x59, 0xe5, 0x1f, 0x16, 0x53, 0x02, + 0x1e, 0xb5, 0x8d, 0x97, 0xaf, 0x4b, 0xd2, 0xab, 0xd7, 0x25, 0xe9, 0xf7, 0xd7, 0x25, 0xe9, 0xf3, + 0x37, 0xa5, 0xa9, 0x57, 0x6f, 0x4a, 0x53, 0xbf, 0xbe, 0x29, 0x4d, 0x3d, 0x39, 0xab, 0xe9, 0xb4, + 0x33, 0x68, 0x56, 0x5b, 0x66, 0x4f, 0xa5, 0xa4, 0xdb, 0x35, 0xad, 0x77, 0x74, 0x93, 0x2f, 0xf2, + 0xc2, 0x5b, 0x86, 0x8e, 0xfa, 0xc4, 0x6e, 0xce, 0xb1, 0xff, 0xe9, 0x5f, 0xfa, 0x27, 0x00, 0x00, + 0xff, 0xff, 0x4d, 0x8c, 0xec, 0xff, 0x96, 0x18, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -5991,7 +5991,7 @@ func (m *QueryGetCurrentAggregateReportRequest) Unmarshal(dAtA []byte) error { if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field QueryId", wireType) } - var byteLen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -6001,25 +6001,23 @@ func (m *QueryGetCurrentAggregateReportRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthQuery } - postIndex := iNdEx + byteLen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthQuery } if postIndex > l { return io.ErrUnexpectedEOF } - m.QueryId = append(m.QueryId[:0], dAtA[iNdEx:postIndex]...) - if m.QueryId == nil { - m.QueryId = []byte{} - } + m.QueryId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex diff --git a/x/bridge/types/query.pb.gw.go b/x/bridge/types/query.pb.gw.go index 44bcf53bc..79608a112 100644 --- a/x/bridge/types/query.pb.gw.go +++ b/x/bridge/types/query.pb.gw.go @@ -373,7 +373,7 @@ func request_Query_GetCurrentAggregateReport_0(ctx context.Context, marshaler ru return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "query_id") } - protoReq.QueryId, err = runtime.Bytes(val) + protoReq.QueryId, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "query_id", err) @@ -400,7 +400,7 @@ func local_request_Query_GetCurrentAggregateReport_0(ctx context.Context, marsha return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "query_id") } - protoReq.QueryId, err = runtime.Bytes(val) + protoReq.QueryId, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "query_id", err)