diff --git a/proto/ojo/oracle/v1/query.proto b/proto/ojo/oracle/v1/query.proto index b8a862e1..421d137e 100644 --- a/proto/ojo/oracle/v1/query.proto +++ b/proto/ojo/oracle/v1/query.proto @@ -100,14 +100,14 @@ service Query { } // Queries a Price by asset. - rpc Price(QueryGetPriceRequest) - returns (QueryGetPriceResponse) { + rpc Price(QueryPriceRequest) + returns (QueryPriceResponse) { option (google.api.http).get = "/elys-network/elys/oracle/price/{asset}"; } // Queries a list of Price items. - rpc PriceAll(QueryAllPriceRequest) - returns (QueryAllPriceResponse) { + rpc PriceAll(QueryPriceAllRequest) + returns (QueryPriceAllResponse) { option (google.api.http).get = "/elys-network/elys/oracle/prices"; } } @@ -305,22 +305,22 @@ message QueryValidatorRewardSetResponse { ValidatorRewardSet validators = 1 [(gogoproto.nullable) = false]; } -// QueryGetPriceRequest is the request type for the Query/GetPriceRequest RPC method. -message QueryGetPriceRequest { +// QueryPriceRequest is the request type for the Query/PriceRequest RPC method. +message QueryPriceRequest { string asset = 1; string source = 2; uint64 timestamp = 3; } -// QueryGetPriceResponse is the response type for the Query/GetPriceRequest RPC method. -message QueryGetPriceResponse { +// QueryPriceResponse is the response type for the Query/PriceRequest RPC method. +message QueryPriceResponse { Price price = 1 [ (gogoproto.nullable) = false ]; } -// QueryAllPriceRequest is the request type for the Query/AllPriceRequest RPC method. -message QueryAllPriceRequest {} +// QueryPriceAllRequest is the request type for the Query/PriceAllRequest RPC method. +message QueryPriceAllRequest {} -// QueryAllPriceResponse is the response type for the Query/AllPriceRequest RPC method. -message QueryAllPriceResponse { +// QueryPriceAllResponse is the response type for the Query/AllPriceRequest RPC method. +message QueryPriceAllResponse { repeated Price price = 1 [ (gogoproto.nullable) = false ]; } diff --git a/x/oracle/client/cli/query.go b/x/oracle/client/cli/query.go index 0e5bfb94..0b71ab31 100644 --- a/x/oracle/client/cli/query.go +++ b/x/oracle/client/cli/query.go @@ -291,7 +291,7 @@ func GetCmdListPrice() *cobra.Command { } queryClient := types.NewQueryClient(clientCtx) - res, err := queryClient.PriceAll(cmd.Context(), &types.QueryAllPriceRequest{}) + res, err := queryClient.PriceAll(cmd.Context(), &types.QueryPriceAllRequest{}) return cli.PrintOrErr(res, err, clientCtx) }, } @@ -314,7 +314,7 @@ func CmdShowPrice() *cobra.Command { } queryClient := types.NewQueryClient(clientCtx) - params := &types.QueryGetPriceRequest{ + params := &types.QueryPriceRequest{ Asset: args[0], Source: args[1], Timestamp: timestamp, diff --git a/x/oracle/keeper/grpc_query.go b/x/oracle/keeper/grpc_query.go index 5c84f800..00d467ad 100644 --- a/x/oracle/keeper/grpc_query.go +++ b/x/oracle/keeper/grpc_query.go @@ -332,8 +332,8 @@ func (q querier) ValidatorRewardSet( func (q querier) PriceAll( goCtx context.Context, - req *types.QueryAllPriceRequest, -) (*types.QueryAllPriceResponse, error) { + req *types.QueryPriceAllRequest, +) (*types.QueryPriceAllResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } @@ -342,10 +342,10 @@ func (q querier) PriceAll( prices := q.GetAllPrice(ctx) - return &types.QueryAllPriceResponse{Price: prices}, nil + return &types.QueryPriceAllResponse{Price: prices}, nil } -func (q querier) Price(goCtx context.Context, req *types.QueryGetPriceRequest) (*types.QueryGetPriceResponse, error) { +func (q querier) Price(goCtx context.Context, req *types.QueryPriceRequest) (*types.QueryPriceResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "invalid request") } @@ -357,7 +357,7 @@ func (q querier) Price(goCtx context.Context, req *types.QueryGetPriceRequest) ( if !found { return nil, status.Error(codes.NotFound, "not found") } - return &types.QueryGetPriceResponse{Price: val}, nil + return &types.QueryPriceResponse{Price: val}, nil } // if source is specified use latest price from source @@ -366,7 +366,7 @@ func (q querier) Price(goCtx context.Context, req *types.QueryGetPriceRequest) ( if !found { return nil, status.Error(codes.NotFound, "not found") } - return &types.QueryGetPriceResponse{Price: val}, nil + return &types.QueryPriceResponse{Price: val}, nil } // find from any source if band source does not exist @@ -374,5 +374,5 @@ func (q querier) Price(goCtx context.Context, req *types.QueryGetPriceRequest) ( if !found { return nil, status.Error(codes.NotFound, "not found") } - return &types.QueryGetPriceResponse{Price: val}, nil + return &types.QueryPriceResponse{Price: val}, nil } diff --git a/x/oracle/types/query.pb.go b/x/oracle/types/query.pb.go index 8922668d..ed2f40ea 100644 --- a/x/oracle/types/query.pb.go +++ b/x/oracle/types/query.pb.go @@ -1063,25 +1063,25 @@ func (m *QueryValidatorRewardSetResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryValidatorRewardSetResponse proto.InternalMessageInfo -// QueryGetPriceRequest is the request type for the Query/GetPriceRequest RPC method. -type QueryGetPriceRequest struct { +// QueryPriceRequest is the request type for the Query/PriceRequest RPC method. +type QueryPriceRequest struct { Asset string `protobuf:"bytes,1,opt,name=asset,proto3" json:"asset,omitempty"` Source string `protobuf:"bytes,2,opt,name=source,proto3" json:"source,omitempty"` Timestamp uint64 `protobuf:"varint,3,opt,name=timestamp,proto3" json:"timestamp,omitempty"` } -func (m *QueryGetPriceRequest) Reset() { *m = QueryGetPriceRequest{} } -func (m *QueryGetPriceRequest) String() string { return proto.CompactTextString(m) } -func (*QueryGetPriceRequest) ProtoMessage() {} -func (*QueryGetPriceRequest) Descriptor() ([]byte, []int) { +func (m *QueryPriceRequest) Reset() { *m = QueryPriceRequest{} } +func (m *QueryPriceRequest) String() string { return proto.CompactTextString(m) } +func (*QueryPriceRequest) ProtoMessage() {} +func (*QueryPriceRequest) Descriptor() ([]byte, []int) { return fileDescriptor_ac3bb5b34dcda556, []int{26} } -func (m *QueryGetPriceRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryPriceRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryGetPriceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryPriceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryGetPriceRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryPriceRequest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1091,35 +1091,35 @@ func (m *QueryGetPriceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte return b[:n], nil } } -func (m *QueryGetPriceRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryGetPriceRequest.Merge(m, src) +func (m *QueryPriceRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryPriceRequest.Merge(m, src) } -func (m *QueryGetPriceRequest) XXX_Size() int { +func (m *QueryPriceRequest) XXX_Size() int { return m.Size() } -func (m *QueryGetPriceRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryGetPriceRequest.DiscardUnknown(m) +func (m *QueryPriceRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryPriceRequest.DiscardUnknown(m) } -var xxx_messageInfo_QueryGetPriceRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryPriceRequest proto.InternalMessageInfo -// QueryGetPriceResponse is the response type for the Query/GetPriceRequest RPC method. -type QueryGetPriceResponse struct { +// QueryPriceResponse is the response type for the Query/PriceRequest RPC method. +type QueryPriceResponse struct { Price Price `protobuf:"bytes,1,opt,name=price,proto3" json:"price"` } -func (m *QueryGetPriceResponse) Reset() { *m = QueryGetPriceResponse{} } -func (m *QueryGetPriceResponse) String() string { return proto.CompactTextString(m) } -func (*QueryGetPriceResponse) ProtoMessage() {} -func (*QueryGetPriceResponse) Descriptor() ([]byte, []int) { +func (m *QueryPriceResponse) Reset() { *m = QueryPriceResponse{} } +func (m *QueryPriceResponse) String() string { return proto.CompactTextString(m) } +func (*QueryPriceResponse) ProtoMessage() {} +func (*QueryPriceResponse) Descriptor() ([]byte, []int) { return fileDescriptor_ac3bb5b34dcda556, []int{27} } -func (m *QueryGetPriceResponse) XXX_Unmarshal(b []byte) error { +func (m *QueryPriceResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryGetPriceResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryPriceResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryGetPriceResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryPriceResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1129,34 +1129,34 @@ func (m *QueryGetPriceResponse) XXX_Marshal(b []byte, deterministic bool) ([]byt return b[:n], nil } } -func (m *QueryGetPriceResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryGetPriceResponse.Merge(m, src) +func (m *QueryPriceResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryPriceResponse.Merge(m, src) } -func (m *QueryGetPriceResponse) XXX_Size() int { +func (m *QueryPriceResponse) XXX_Size() int { return m.Size() } -func (m *QueryGetPriceResponse) XXX_DiscardUnknown() { - xxx_messageInfo_QueryGetPriceResponse.DiscardUnknown(m) +func (m *QueryPriceResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryPriceResponse.DiscardUnknown(m) } -var xxx_messageInfo_QueryGetPriceResponse proto.InternalMessageInfo +var xxx_messageInfo_QueryPriceResponse proto.InternalMessageInfo -// QueryAllPriceRequest is the request type for the Query/AllPriceRequest RPC method. -type QueryAllPriceRequest struct { +// QueryPriceAllRequest is the request type for the Query/PriceAllRequest RPC method. +type QueryPriceAllRequest struct { } -func (m *QueryAllPriceRequest) Reset() { *m = QueryAllPriceRequest{} } -func (m *QueryAllPriceRequest) String() string { return proto.CompactTextString(m) } -func (*QueryAllPriceRequest) ProtoMessage() {} -func (*QueryAllPriceRequest) Descriptor() ([]byte, []int) { +func (m *QueryPriceAllRequest) Reset() { *m = QueryPriceAllRequest{} } +func (m *QueryPriceAllRequest) String() string { return proto.CompactTextString(m) } +func (*QueryPriceAllRequest) ProtoMessage() {} +func (*QueryPriceAllRequest) Descriptor() ([]byte, []int) { return fileDescriptor_ac3bb5b34dcda556, []int{28} } -func (m *QueryAllPriceRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryPriceAllRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryAllPriceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryPriceAllRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryAllPriceRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryPriceAllRequest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1166,35 +1166,35 @@ func (m *QueryAllPriceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte return b[:n], nil } } -func (m *QueryAllPriceRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryAllPriceRequest.Merge(m, src) +func (m *QueryPriceAllRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryPriceAllRequest.Merge(m, src) } -func (m *QueryAllPriceRequest) XXX_Size() int { +func (m *QueryPriceAllRequest) XXX_Size() int { return m.Size() } -func (m *QueryAllPriceRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryAllPriceRequest.DiscardUnknown(m) +func (m *QueryPriceAllRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryPriceAllRequest.DiscardUnknown(m) } -var xxx_messageInfo_QueryAllPriceRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryPriceAllRequest proto.InternalMessageInfo -// QueryAllPriceResponse is the response type for the Query/AllPriceRequest RPC method. -type QueryAllPriceResponse struct { +// QueryPriceAllResponse is the response type for the Query/AllPriceRequest RPC method. +type QueryPriceAllResponse struct { Price []Price `protobuf:"bytes,1,rep,name=price,proto3" json:"price"` } -func (m *QueryAllPriceResponse) Reset() { *m = QueryAllPriceResponse{} } -func (m *QueryAllPriceResponse) String() string { return proto.CompactTextString(m) } -func (*QueryAllPriceResponse) ProtoMessage() {} -func (*QueryAllPriceResponse) Descriptor() ([]byte, []int) { +func (m *QueryPriceAllResponse) Reset() { *m = QueryPriceAllResponse{} } +func (m *QueryPriceAllResponse) String() string { return proto.CompactTextString(m) } +func (*QueryPriceAllResponse) ProtoMessage() {} +func (*QueryPriceAllResponse) Descriptor() ([]byte, []int) { return fileDescriptor_ac3bb5b34dcda556, []int{29} } -func (m *QueryAllPriceResponse) XXX_Unmarshal(b []byte) error { +func (m *QueryPriceAllResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryAllPriceResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryPriceAllResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryAllPriceResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryPriceAllResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1204,17 +1204,17 @@ func (m *QueryAllPriceResponse) XXX_Marshal(b []byte, deterministic bool) ([]byt return b[:n], nil } } -func (m *QueryAllPriceResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryAllPriceResponse.Merge(m, src) +func (m *QueryPriceAllResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryPriceAllResponse.Merge(m, src) } -func (m *QueryAllPriceResponse) XXX_Size() int { +func (m *QueryPriceAllResponse) XXX_Size() int { return m.Size() } -func (m *QueryAllPriceResponse) XXX_DiscardUnknown() { - xxx_messageInfo_QueryAllPriceResponse.DiscardUnknown(m) +func (m *QueryPriceAllResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryPriceAllResponse.DiscardUnknown(m) } -var xxx_messageInfo_QueryAllPriceResponse proto.InternalMessageInfo +var xxx_messageInfo_QueryPriceAllResponse proto.InternalMessageInfo func init() { proto.RegisterType((*QueryExchangeRates)(nil), "ojo.oracle.v1.QueryExchangeRates") @@ -1243,103 +1243,104 @@ func init() { proto.RegisterType((*QueryMedianDeviationsResponse)(nil), "ojo.oracle.v1.QueryMedianDeviationsResponse") proto.RegisterType((*QueryValidatorRewardSet)(nil), "ojo.oracle.v1.QueryValidatorRewardSet") proto.RegisterType((*QueryValidatorRewardSetResponse)(nil), "ojo.oracle.v1.QueryValidatorRewardSetResponse") - proto.RegisterType((*QueryGetPriceRequest)(nil), "ojo.oracle.v1.QueryGetPriceRequest") - proto.RegisterType((*QueryGetPriceResponse)(nil), "ojo.oracle.v1.QueryGetPriceResponse") - proto.RegisterType((*QueryAllPriceRequest)(nil), "ojo.oracle.v1.QueryAllPriceRequest") - proto.RegisterType((*QueryAllPriceResponse)(nil), "ojo.oracle.v1.QueryAllPriceResponse") + proto.RegisterType((*QueryPriceRequest)(nil), "ojo.oracle.v1.QueryPriceRequest") + proto.RegisterType((*QueryPriceResponse)(nil), "ojo.oracle.v1.QueryPriceResponse") + proto.RegisterType((*QueryPriceAllRequest)(nil), "ojo.oracle.v1.QueryPriceAllRequest") + proto.RegisterType((*QueryPriceAllResponse)(nil), "ojo.oracle.v1.QueryPriceAllResponse") } func init() { proto.RegisterFile("ojo/oracle/v1/query.proto", fileDescriptor_ac3bb5b34dcda556) } var fileDescriptor_ac3bb5b34dcda556 = []byte{ - // 1392 bytes of a gzipped FileDescriptorProto + // 1393 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x98, 0xcf, 0x6f, 0x13, 0x47, - 0x14, 0xc7, 0xb3, 0x40, 0x02, 0x79, 0xc6, 0x21, 0x19, 0x12, 0x30, 0x0b, 0xd8, 0xc9, 0x00, 0x4d, - 0xd2, 0x90, 0x5d, 0x42, 0x50, 0x11, 0xfd, 0xa5, 0x86, 0x84, 0xd2, 0x9f, 0x12, 0x18, 0x15, 0xa4, - 0x1e, 0xea, 0x6e, 0xbc, 0x53, 0x67, 0x83, 0xbd, 0x63, 0x76, 0x36, 0x0e, 0x88, 0x22, 0x24, 0x7a, - 0xe9, 0x11, 0x09, 0xa9, 0x97, 0x1e, 0x4a, 0x25, 0x4e, 0x55, 0x0f, 0xfd, 0x33, 0x38, 0x22, 0xf5, - 0xd2, 0x53, 0x7f, 0x40, 0x0f, 0xfd, 0x33, 0xaa, 0x9d, 0x99, 0x1d, 0xef, 0x8f, 0x71, 0xec, 0x70, - 0xb2, 0xf7, 0xbd, 0x37, 0xef, 0x7d, 0xe6, 0xcd, 0x8f, 0xfd, 0x6a, 0xe1, 0x18, 0xdd, 0xa4, 0x36, - 0x0d, 0x9c, 0x7a, 0x93, 0xd8, 0x9d, 0x25, 0xfb, 0xce, 0x16, 0x09, 0xee, 0x59, 0xed, 0x80, 0x86, - 0x14, 0x15, 0xe9, 0x26, 0xb5, 0x84, 0xcb, 0xea, 0x2c, 0x99, 0x93, 0x0d, 0xda, 0xa0, 0xdc, 0x63, - 0x47, 0xff, 0x44, 0x90, 0x79, 0xa2, 0x41, 0x69, 0xa3, 0x49, 0x6c, 0xa7, 0xed, 0xd9, 0x8e, 0xef, - 0xd3, 0xd0, 0x09, 0x3d, 0xea, 0x33, 0xe9, 0x35, 0xd3, 0xd9, 0x65, 0x32, 0xe1, 0x2b, 0xa5, 0x7d, - 0xa4, 0x79, 0x2f, 0x1e, 0x55, 0xae, 0x53, 0xd6, 0xa2, 0xcc, 0x5e, 0x77, 0x58, 0xe4, 0x5a, 0x27, - 0xa1, 0xb3, 0x64, 0xd7, 0xa9, 0xe7, 0x0b, 0x3f, 0xbe, 0x00, 0xe8, 0x7a, 0xc4, 0x79, 0xe5, 0x6e, - 0x7d, 0xc3, 0xf1, 0x1b, 0xa4, 0xea, 0x84, 0x84, 0xa1, 0x49, 0x18, 0x76, 0x89, 0x4f, 0x5b, 0x25, - 0x63, 0xda, 0x98, 0x1b, 0xad, 0x8a, 0x87, 0xb7, 0x0f, 0x7c, 0xff, 0xb4, 0x32, 0xf4, 0xdf, 0xd3, - 0xca, 0x10, 0xfe, 0xc1, 0x00, 0x33, 0x3f, 0xac, 0x4a, 0x58, 0x9b, 0xfa, 0x8c, 0xa0, 0xbb, 0x30, - 0x46, 0xa4, 0xa3, 0x16, 0x44, 0x9e, 0x92, 0x31, 0xbd, 0x77, 0xae, 0x70, 0xfe, 0x84, 0x25, 0x68, - 0xac, 0x88, 0xc6, 0x92, 0x34, 0xd6, 0x1a, 0xa9, 0xaf, 0x52, 0xcf, 0xbf, 0xbc, 0xfc, 0xfc, 0xcf, - 0xca, 0xd0, 0x2f, 0x7f, 0x55, 0x16, 0x1a, 0x5e, 0xb8, 0xb1, 0xb5, 0x6e, 0xd5, 0x69, 0xcb, 0x96, - 0xf4, 0xe2, 0x67, 0x91, 0xb9, 0xb7, 0xed, 0xf0, 0x5e, 0x9b, 0xb0, 0x78, 0x0c, 0xab, 0x16, 0x49, - 0x92, 0x00, 0x9b, 0x50, 0xe2, 0x5c, 0x2b, 0xf5, 0xd0, 0xeb, 0x90, 0x14, 0x1d, 0xbe, 0x02, 0xd3, - 0xbd, 0x7c, 0x8a, 0x7c, 0x06, 0x0e, 0x3a, 0xdc, 0x9d, 0xe0, 0x1e, 0xad, 0x16, 0x84, 0x4d, 0xa4, - 0xf9, 0x08, 0xa6, 0x78, 0x9a, 0x0f, 0x09, 0x71, 0x49, 0xb0, 0x46, 0x9a, 0xa4, 0xc1, 0xd7, 0x09, - 0x9d, 0x81, 0xb1, 0x8e, 0xd3, 0xf4, 0x5c, 0x27, 0xa4, 0x41, 0xcd, 0x71, 0xdd, 0x40, 0x76, 0xaf, - 0xa8, 0xac, 0x2b, 0xae, 0x1b, 0x24, 0xba, 0xf8, 0x01, 0x9c, 0xd4, 0x66, 0x52, 0x34, 0x15, 0x28, - 0x7c, 0xc3, 0x7d, 0xc9, 0x74, 0x20, 0x4c, 0x51, 0x2e, 0xbc, 0x0a, 0xe3, 0x3c, 0xc3, 0xe7, 0x1e, - 0x63, 0xab, 0x74, 0xcb, 0x0f, 0x49, 0xb0, 0x7b, 0x8c, 0xf7, 0x64, 0xcf, 0x12, 0x49, 0x92, 0xfd, - 0x68, 0x79, 0x8c, 0xd5, 0xea, 0xc2, 0xce, 0x53, 0xed, 0xab, 0x16, 0x5a, 0xdd, 0x50, 0x8c, 0x24, - 0xc3, 0x8d, 0xa6, 0xc3, 0x36, 0x6e, 0x79, 0xbe, 0x4b, 0xb7, 0xf1, 0xaa, 0x4c, 0x99, 0xb0, 0xa9, - 0x94, 0xb3, 0x70, 0x68, 0x9b, 0x5b, 0x6a, 0xed, 0x80, 0x36, 0x02, 0xc2, 0x98, 0xcc, 0x3a, 0x26, - 0xcc, 0xd7, 0xa4, 0x55, 0x35, 0x7a, 0xa5, 0xd1, 0x08, 0xa2, 0xce, 0x90, 0x6b, 0x01, 0xe9, 0xd0, - 0x90, 0xec, 0x7e, 0x86, 0x0f, 0x65, 0xa3, 0xb3, 0x99, 0x14, 0xd3, 0x57, 0x30, 0xe1, 0xc4, 0xbe, - 0x5a, 0x5b, 0x38, 0x79, 0xd2, 0xc2, 0xf9, 0x05, 0x2b, 0x75, 0x74, 0x2d, 0x95, 0x23, 0xb9, 0x81, - 0x64, 0xbe, 0xcb, 0xfb, 0xa2, 0x2d, 0x5c, 0x1d, 0x77, 0x32, 0x75, 0x70, 0x09, 0x8e, 0x68, 0x01, - 0x18, 0x7e, 0x64, 0x40, 0x59, 0xef, 0x52, 0x70, 0x5f, 0x03, 0xca, 0xc1, 0xc5, 0x27, 0xea, 0x35, - 0xe8, 0x26, 0x9c, 0x1c, 0xc4, 0x15, 0x79, 0x09, 0xa8, 0xd1, 0x37, 0x5f, 0xab, 0xcd, 0x4c, 0x5e, - 0x0a, 0xa9, 0x34, 0x6a, 0x1a, 0x5f, 0xc0, 0x58, 0x77, 0x1a, 0x89, 0x06, 0xcf, 0x0d, 0x32, 0x85, - 0x9b, 0x5d, 0xfe, 0xa2, 0x93, 0x4c, 0x8f, 0xa7, 0xe0, 0x70, 0xbe, 0x28, 0xc3, 0x1d, 0x38, 0xae, - 0x31, 0x2b, 0x98, 0x5b, 0x70, 0x28, 0x0d, 0x13, 0x37, 0x74, 0xb7, 0x34, 0x63, 0x4e, 0xba, 0x6e, - 0x11, 0x0a, 0xbc, 0xee, 0x35, 0x27, 0x70, 0x5a, 0x0c, 0x7f, 0x22, 0xe9, 0xc4, 0xa3, 0x2a, 0xbf, - 0x0c, 0x23, 0x6d, 0x6e, 0x91, 0x3d, 0x98, 0xca, 0x54, 0x15, 0xe1, 0xb2, 0x84, 0x0c, 0xc5, 0x9f, - 0xc1, 0x41, 0x71, 0x4e, 0x89, 0xeb, 0x39, 0x7e, 0x8f, 0x4b, 0x1a, 0x9d, 0x80, 0x51, 0x7f, 0xab, - 0x75, 0x23, 0x74, 0x5a, 0x6d, 0x56, 0xda, 0x33, 0x6d, 0xcc, 0x15, 0xab, 0x5d, 0x43, 0x62, 0xb1, - 0xae, 0xc3, 0x64, 0x32, 0x9b, 0x42, 0xbb, 0x04, 0xfb, 0x5b, 0xc2, 0x24, 0x3b, 0x72, 0x2c, 0xcb, - 0x16, 0x78, 0x75, 0xc2, 0xd3, 0x49, 0xbe, 0x38, 0x1e, 0x5f, 0x94, 0x07, 0x56, 0xa4, 0x5c, 0x23, - 0x1d, 0x4f, 0xbc, 0xc0, 0xfa, 0xbe, 0x4e, 0x9a, 0xf2, 0x7c, 0x66, 0x07, 0x2a, 0xa8, 0x4f, 0x61, - 0xbc, 0x95, 0xf1, 0x0d, 0x4a, 0x97, 0x1b, 0x88, 0x8f, 0xc1, 0x51, 0x5e, 0xed, 0x66, 0xbc, 0x8d, - 0xab, 0x64, 0xdb, 0x09, 0xdc, 0x1b, 0x24, 0xc4, 0x9b, 0x50, 0xe9, 0xe1, 0x52, 0x28, 0x57, 0x01, - 0xd4, 0xfe, 0x8f, 0x97, 0x6f, 0x26, 0x03, 0x91, 0x1f, 0x2e, 0x61, 0x12, 0x43, 0xf1, 0xba, 0x5c, - 0x80, 0xab, 0x24, 0xe4, 0xd0, 0x55, 0x72, 0x67, 0x8b, 0xb0, 0x30, 0x6a, 0x96, 0xc3, 0x18, 0x09, - 0xe3, 0x66, 0xf1, 0x07, 0x74, 0x04, 0x46, 0x18, 0xdd, 0x0a, 0xea, 0x84, 0xaf, 0xe9, 0x68, 0x55, - 0x3e, 0x45, 0xcb, 0x1d, 0x7a, 0x2d, 0xc2, 0xa2, 0x19, 0x97, 0xf6, 0xf2, 0x7b, 0xb4, 0x6b, 0xc0, - 0x1f, 0xcb, 0x15, 0xe9, 0xd6, 0x90, 0xb3, 0x38, 0x07, 0xc3, 0xed, 0xc8, 0x20, 0x27, 0x30, 0xa9, - 0xeb, 0xa2, 0x64, 0x16, 0x81, 0xf8, 0x88, 0xc4, 0x5d, 0x69, 0x36, 0x93, 0xb8, 0xaa, 0x44, 0xd7, - 0x9e, 0x2f, 0xb1, 0x77, 0xa0, 0x12, 0xe7, 0x7f, 0x9b, 0x80, 0x61, 0x9e, 0x0b, 0x3d, 0x31, 0xa0, - 0x98, 0x56, 0x24, 0xd9, 0x16, 0xe7, 0xd5, 0x87, 0x39, 0xdf, 0x37, 0x24, 0x66, 0xc3, 0x17, 0x1e, - 0xfd, 0xfe, 0xef, 0x93, 0x3d, 0x16, 0x3a, 0x6b, 0xa7, 0x85, 0x13, 0xdf, 0x98, 0xcc, 0x4e, 0x8b, - 0x17, 0xfb, 0x3e, 0x37, 0x3f, 0x40, 0xcf, 0x0c, 0x38, 0xac, 0x11, 0x0f, 0x68, 0x56, 0x57, 0x58, - 0x13, 0x68, 0xda, 0x03, 0x06, 0x2a, 0xce, 0x65, 0xce, 0xb9, 0x88, 0x16, 0xf4, 0x9c, 0x52, 0xaa, - 0xa4, 0x71, 0xd1, 0xcf, 0x06, 0x8c, 0xe7, 0xc4, 0xc9, 0x69, 0x5d, 0xe9, 0x6c, 0x94, 0x79, 0x76, - 0x90, 0x28, 0x45, 0x77, 0x89, 0xd3, 0x2d, 0xa3, 0xa5, 0x0c, 0x5d, 0x77, 0x93, 0xdb, 0xf7, 0xd3, - 0x6f, 0x90, 0x07, 0xb6, 0x10, 0x2f, 0xe8, 0xb1, 0x01, 0x85, 0xa4, 0x68, 0xa9, 0xe8, 0x0a, 0x27, - 0x02, 0xcc, 0xd9, 0x3e, 0x01, 0x0a, 0xea, 0x22, 0x87, 0x5a, 0x42, 0xf6, 0x2e, 0xa0, 0x22, 0x39, - 0x83, 0xbe, 0x85, 0x42, 0x42, 0xae, 0xe8, 0x89, 0x12, 0x01, 0x7a, 0x22, 0x8d, 0xe0, 0xc1, 0xa7, - 0x38, 0xd1, 0x49, 0x74, 0x3c, 0x43, 0xc4, 0xa2, 0xd8, 0x9a, 0x10, 0x3d, 0xe8, 0x57, 0x03, 0xc6, - 0x73, 0x42, 0x47, 0xbb, 0x68, 0xd9, 0x28, 0xfd, 0xa2, 0xf5, 0x92, 0x3a, 0x78, 0x8d, 0xd3, 0xbc, - 0x8f, 0xde, 0xdd, 0x45, 0x7f, 0x72, 0xf2, 0x03, 0xfd, 0x64, 0xc0, 0x44, 0x4e, 0xb1, 0xa0, 0x33, - 0x83, 0x90, 0x30, 0x73, 0x71, 0xa0, 0xb0, 0xbe, 0x87, 0x35, 0x41, 0x9c, 0xd7, 0x47, 0xe8, 0xa9, - 0x01, 0xc5, 0xb4, 0x9e, 0x99, 0xd9, 0xb1, 0x6c, 0x14, 0xa2, 0xbf, 0x42, 0xb4, 0x72, 0x06, 0xaf, - 0x70, 0xaa, 0x77, 0xd0, 0xa5, 0x3c, 0x95, 0xeb, 0xf5, 0xed, 0x23, 0x6f, 0xe2, 0x13, 0x03, 0xc6, - 0xd2, 0xfa, 0x04, 0xe1, 0xbe, 0x00, 0xcc, 0x7c, 0xb3, 0x7f, 0x8c, 0xa2, 0x5c, 0xe2, 0x94, 0x0b, - 0x68, 0x7e, 0x90, 0xde, 0x89, 0xc6, 0x35, 0x60, 0x44, 0xc8, 0x0f, 0x64, 0xea, 0x0a, 0x09, 0x9f, - 0x89, 0x7b, 0xfb, 0x54, 0xf1, 0x93, 0xbc, 0xf8, 0x51, 0x34, 0x95, 0x29, 0x2e, 0xf4, 0x0c, 0xea, - 0xc0, 0xfe, 0x58, 0xca, 0x1c, 0xd7, 0x9e, 0x6e, 0xe1, 0x34, 0x4f, 0xed, 0xe0, 0x54, 0xb5, 0xe6, - 0x79, 0xad, 0x53, 0x68, 0x86, 0xd7, 0xda, 0xf0, 0x58, 0x98, 0xbb, 0x2d, 0xa5, 0x4c, 0x41, 0x3f, - 0x1a, 0x30, 0x9e, 0x93, 0x28, 0xa7, 0x7b, 0x17, 0xe9, 0x46, 0xe9, 0x8f, 0x5a, 0x2f, 0xd5, 0x92, - 0xb9, 0xbd, 0x77, 0x60, 0xaa, 0xb9, 0x5d, 0x90, 0x67, 0x06, 0xa0, 0xbc, 0x7e, 0x40, 0x6f, 0xe8, - 0x2a, 0xe7, 0xe3, 0x4c, 0x6b, 0xb0, 0x38, 0xc5, 0xf8, 0x16, 0x67, 0x3c, 0x87, 0xac, 0xde, 0xdb, - 0xb8, 0xbb, 0x8b, 0x03, 0x3e, 0xbc, 0x16, 0xe9, 0x91, 0xef, 0x0c, 0x18, 0xe6, 0xaf, 0x70, 0xa4, - 0x5d, 0x9e, 0x8c, 0xa8, 0x31, 0x4f, 0xef, 0x1c, 0x24, 0x61, 0x6c, 0x0e, 0x33, 0x8f, 0x66, 0xf9, - 0x17, 0x8c, 0x45, 0x9f, 0x84, 0xdb, 0x34, 0xb8, 0xcd, 0x1f, 0x62, 0x34, 0xae, 0x14, 0xec, 0xfb, - 0x5c, 0x14, 0x3d, 0x40, 0x0f, 0xe1, 0x00, 0xcf, 0xb0, 0xd2, 0x6c, 0xea, 0x39, 0x32, 0x6a, 0x45, - 0xcf, 0x91, 0x95, 0x2e, 0x78, 0x8e, 0x73, 0x60, 0x34, 0xdd, 0x87, 0x83, 0x5d, 0xbe, 0xfa, 0xfc, - 0x9f, 0xf2, 0xd0, 0xf3, 0x97, 0x65, 0xe3, 0xc5, 0xcb, 0xb2, 0xf1, 0xf7, 0xcb, 0xb2, 0xf1, 0xf8, - 0x55, 0x79, 0xe8, 0xc5, 0xab, 0xf2, 0xd0, 0x1f, 0xaf, 0xca, 0x43, 0x5f, 0xce, 0x27, 0xbe, 0x64, - 0xd0, 0x4d, 0xaa, 0x12, 0x45, 0xad, 0xbe, 0x1b, 0x67, 0xe2, 0x1f, 0x34, 0xd6, 0x47, 0xf8, 0xe7, - 0x98, 0xe5, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, 0xf4, 0x1d, 0x2b, 0xb3, 0x44, 0x12, 0x00, 0x00, + 0x14, 0xc7, 0xbd, 0x40, 0x02, 0x79, 0xc6, 0x21, 0x19, 0x12, 0x30, 0x0b, 0xd8, 0xc9, 0x04, 0x9a, + 0xa4, 0x21, 0xbb, 0x98, 0xa0, 0x22, 0xfa, 0x4b, 0x0d, 0x09, 0xd0, 0x9f, 0x12, 0x18, 0x15, 0xa4, + 0x1e, 0xea, 0x6e, 0xbc, 0x53, 0x67, 0x83, 0xbd, 0x63, 0x76, 0xd6, 0x0e, 0x88, 0x46, 0x48, 0x9c, + 0x7a, 0x44, 0x42, 0xea, 0xa5, 0x87, 0x52, 0x89, 0x4b, 0xab, 0xfe, 0x21, 0x1c, 0x91, 0x7a, 0xe9, + 0xa9, 0x3f, 0xa0, 0x87, 0xfe, 0x19, 0xd5, 0xce, 0xcc, 0x8e, 0xf7, 0x97, 0x63, 0x87, 0x53, 0xb2, + 0xef, 0xbd, 0xf9, 0xbe, 0xcf, 0xbe, 0x9d, 0x59, 0x7f, 0xb5, 0x70, 0x82, 0x6e, 0x51, 0x93, 0x7a, + 0x56, 0xbd, 0x49, 0xcc, 0x6e, 0xc5, 0xbc, 0xd7, 0x21, 0xde, 0x03, 0xa3, 0xed, 0x51, 0x9f, 0xa2, + 0x02, 0xdd, 0xa2, 0x86, 0x48, 0x19, 0xdd, 0x8a, 0x3e, 0xd5, 0xa0, 0x0d, 0xca, 0x33, 0x66, 0xf0, + 0x9f, 0x28, 0xd2, 0x4f, 0x35, 0x28, 0x6d, 0x34, 0x89, 0x69, 0xb5, 0x1d, 0xd3, 0x72, 0x5d, 0xea, + 0x5b, 0xbe, 0x43, 0x5d, 0x26, 0xb3, 0x7a, 0x5c, 0x5d, 0x8a, 0x89, 0x5c, 0x31, 0x9e, 0x23, 0xcd, + 0x07, 0xe1, 0xaa, 0x52, 0x9d, 0xb2, 0x16, 0x65, 0xe6, 0x86, 0xc5, 0x82, 0xd4, 0x06, 0xf1, 0xad, + 0x8a, 0x59, 0xa7, 0x8e, 0x2b, 0xf2, 0xf8, 0x22, 0xa0, 0x9b, 0x01, 0xe7, 0xd5, 0xfb, 0xf5, 0x4d, + 0xcb, 0x6d, 0x90, 0xaa, 0xe5, 0x13, 0x86, 0xa6, 0x60, 0xc4, 0x26, 0x2e, 0x6d, 0x15, 0xb5, 0x19, + 0x6d, 0x61, 0xac, 0x2a, 0x2e, 0xde, 0x3d, 0xf4, 0xfd, 0xb3, 0x72, 0xee, 0xbf, 0x67, 0xe5, 0x1c, + 0xfe, 0x41, 0x03, 0x3d, 0xbd, 0xac, 0x4a, 0x58, 0x9b, 0xba, 0x8c, 0xa0, 0xfb, 0x30, 0x4e, 0x64, + 0xa2, 0xe6, 0x05, 0x99, 0xa2, 0x36, 0xb3, 0x7f, 0x21, 0x7f, 0xe1, 0x94, 0x21, 0x68, 0x8c, 0x80, + 0xc6, 0x90, 0x34, 0xc6, 0x3a, 0xa9, 0xaf, 0x51, 0xc7, 0xbd, 0xb2, 0xf2, 0xe2, 0xcf, 0x72, 0xee, + 0xd7, 0xbf, 0xca, 0x4b, 0x0d, 0xc7, 0xdf, 0xec, 0x6c, 0x18, 0x75, 0xda, 0x32, 0x25, 0xbd, 0xf8, + 0xb3, 0xcc, 0xec, 0xbb, 0xa6, 0xff, 0xa0, 0x4d, 0x58, 0xb8, 0x86, 0x55, 0x0b, 0x24, 0x4a, 0x80, + 0x75, 0x28, 0x72, 0xae, 0xd5, 0xba, 0xef, 0x74, 0x49, 0x8c, 0x0e, 0x5f, 0x85, 0x99, 0x7e, 0x39, + 0x45, 0x3e, 0x0b, 0x87, 0x2d, 0x9e, 0x8e, 0x70, 0x8f, 0x55, 0xf3, 0x22, 0x26, 0x64, 0x3e, 0x86, + 0x69, 0x2e, 0x73, 0x8d, 0x10, 0x9b, 0x78, 0xeb, 0xa4, 0x49, 0x1a, 0xfc, 0x39, 0xa1, 0xb3, 0x30, + 0xde, 0xb5, 0x9a, 0x8e, 0x6d, 0xf9, 0xd4, 0xab, 0x59, 0xb6, 0xed, 0xc9, 0xe9, 0x15, 0x54, 0x74, + 0xd5, 0xb6, 0xbd, 0xc8, 0x14, 0x3f, 0x82, 0xd3, 0x99, 0x4a, 0x8a, 0xa6, 0x0c, 0xf9, 0x6f, 0x79, + 0x2e, 0x2a, 0x07, 0x22, 0x14, 0x68, 0xe1, 0x35, 0x98, 0xe0, 0x0a, 0x5f, 0x38, 0x8c, 0xad, 0xd1, + 0x8e, 0xeb, 0x13, 0x6f, 0xef, 0x18, 0x1f, 0xc8, 0x99, 0x45, 0x44, 0xa2, 0xf3, 0x68, 0x39, 0x8c, + 0xd5, 0xea, 0x22, 0xce, 0xa5, 0x0e, 0x54, 0xf3, 0xad, 0x5e, 0x29, 0x46, 0x92, 0xe1, 0x56, 0xd3, + 0x62, 0x9b, 0x77, 0x1c, 0xd7, 0xa6, 0xdb, 0x78, 0x4d, 0x4a, 0x46, 0x62, 0x4a, 0x72, 0x1e, 0x8e, + 0x6c, 0xf3, 0x48, 0xad, 0xed, 0xd1, 0x86, 0x47, 0x18, 0x93, 0xaa, 0xe3, 0x22, 0x7c, 0x43, 0x46, + 0xd5, 0xa0, 0x57, 0x1b, 0x0d, 0x2f, 0x98, 0x0c, 0xb9, 0xe1, 0x91, 0x2e, 0xf5, 0xc9, 0xde, 0xef, + 0xf0, 0x91, 0x1c, 0x74, 0x52, 0x49, 0x31, 0x7d, 0x0d, 0x93, 0x56, 0x98, 0xab, 0xb5, 0x45, 0x92, + 0x8b, 0xe6, 0x2f, 0x2c, 0x19, 0xb1, 0xa3, 0x6b, 0x28, 0x8d, 0xe8, 0x06, 0x92, 0x7a, 0x57, 0x0e, + 0x04, 0x5b, 0xb8, 0x3a, 0x61, 0x25, 0xfa, 0xe0, 0x22, 0x1c, 0xcb, 0x04, 0x60, 0xf8, 0xb1, 0x06, + 0xa5, 0xec, 0x94, 0x82, 0xfb, 0x06, 0x50, 0x0a, 0x2e, 0x3c, 0x51, 0x6f, 0x40, 0x37, 0x69, 0xa5, + 0x20, 0xae, 0xca, 0x97, 0x80, 0x5a, 0x7d, 0xfb, 0x8d, 0xc6, 0xcc, 0xe4, 0x4b, 0x21, 0x26, 0xa3, + 0x6e, 0xe3, 0x4b, 0x18, 0xef, 0xdd, 0x46, 0x64, 0xc0, 0x0b, 0xc3, 0xdc, 0xc2, 0xed, 0x1e, 0x7f, + 0xc1, 0x8a, 0xca, 0xe3, 0x69, 0x38, 0x9a, 0x6e, 0xca, 0x70, 0x17, 0x4e, 0x66, 0x84, 0x15, 0xcc, + 0x1d, 0x38, 0x12, 0x87, 0x09, 0x07, 0xba, 0x57, 0x9a, 0x71, 0x2b, 0xde, 0xb7, 0x00, 0x79, 0xde, + 0xf7, 0x86, 0xe5, 0x59, 0x2d, 0x86, 0x3f, 0x95, 0x74, 0xe2, 0x52, 0xb5, 0x5f, 0x81, 0xd1, 0x36, + 0x8f, 0xc8, 0x19, 0x4c, 0x27, 0xba, 0x8a, 0x72, 0xd9, 0x42, 0x96, 0xe2, 0xcf, 0xe1, 0xb0, 0x38, + 0xa7, 0xc4, 0x76, 0x2c, 0xb7, 0xcf, 0x4b, 0x1a, 0x9d, 0x82, 0x31, 0xb7, 0xd3, 0xba, 0xe5, 0x5b, + 0xad, 0x36, 0x2b, 0xee, 0x9b, 0xd1, 0x16, 0x0a, 0xd5, 0x5e, 0x20, 0xf2, 0xb0, 0x6e, 0xc2, 0x54, + 0x54, 0x4d, 0xa1, 0x5d, 0x86, 0x83, 0x2d, 0x11, 0x92, 0x13, 0x39, 0x91, 0x64, 0xf3, 0x9c, 0x3a, + 0xe1, 0x72, 0x92, 0x2f, 0xac, 0xc7, 0x97, 0xe4, 0x81, 0x15, 0x92, 0xeb, 0xa4, 0xeb, 0x88, 0x1f, + 0xb0, 0x81, 0x3f, 0x27, 0x4d, 0x79, 0x3e, 0x93, 0x0b, 0x15, 0xd4, 0x67, 0x30, 0xd1, 0x4a, 0xe4, + 0x86, 0xa5, 0x4b, 0x2d, 0xc4, 0x27, 0xe0, 0x38, 0xef, 0x76, 0x3b, 0xdc, 0xc6, 0x55, 0xb2, 0x6d, + 0x79, 0xf6, 0x2d, 0xe2, 0xe3, 0x2d, 0x28, 0xf7, 0x49, 0x29, 0x94, 0xeb, 0x00, 0x6a, 0xff, 0x87, + 0x8f, 0x6f, 0x36, 0x01, 0x91, 0x5e, 0x2e, 0x61, 0x22, 0x4b, 0x71, 0x0d, 0x26, 0xc5, 0xd6, 0x08, + 0x88, 0xab, 0xe4, 0x5e, 0x87, 0x30, 0x3f, 0x98, 0x94, 0xc5, 0x18, 0xf1, 0xc3, 0x49, 0xf1, 0x0b, + 0x74, 0x0c, 0x46, 0x19, 0xed, 0x78, 0x75, 0xc2, 0x1f, 0xe8, 0x58, 0x55, 0x5e, 0x05, 0xcf, 0xda, + 0x77, 0x5a, 0x84, 0x05, 0xb7, 0x5b, 0xdc, 0xcf, 0x5f, 0xa2, 0xbd, 0x00, 0xbe, 0x26, 0x4f, 0xb5, + 0x6c, 0x20, 0xf9, 0xcf, 0xc3, 0x48, 0x3b, 0x08, 0x48, 0xf4, 0xa9, 0xac, 0xf9, 0x49, 0x5a, 0x51, + 0x88, 0x8f, 0xc9, 0x9d, 0xc2, 0x53, 0xab, 0xcd, 0xa6, 0x64, 0xc5, 0x9f, 0xc8, 0xc7, 0xdd, 0x8b, + 0xa7, 0x5b, 0xec, 0x1f, 0xaa, 0xc5, 0x85, 0x5f, 0x26, 0x61, 0x84, 0x6b, 0xa1, 0xa7, 0x1a, 0x14, + 0xe2, 0x5e, 0x24, 0x39, 0xdc, 0xb4, 0xef, 0xd0, 0x17, 0x07, 0x96, 0x84, 0x6c, 0xf8, 0xe2, 0xe3, + 0xdf, 0xff, 0x7d, 0xba, 0xcf, 0x40, 0xe7, 0xcc, 0xb8, 0x65, 0xe2, 0x5b, 0x92, 0x99, 0x71, 0xdb, + 0x62, 0x3e, 0xe4, 0xe1, 0x1d, 0xf4, 0x5c, 0x83, 0xa3, 0x19, 0xb6, 0x01, 0xcd, 0x67, 0x35, 0xce, + 0x28, 0xd4, 0xcd, 0x21, 0x0b, 0x15, 0xe7, 0x0a, 0xe7, 0x5c, 0x46, 0x4b, 0xd9, 0x9c, 0xd2, 0xa4, + 0xc4, 0x71, 0xd1, 0xcf, 0x1a, 0x4c, 0xa4, 0x6c, 0xc9, 0x99, 0xac, 0xd6, 0xc9, 0x2a, 0xfd, 0xdc, + 0x30, 0x55, 0x8a, 0xee, 0x32, 0xa7, 0x5b, 0x41, 0x95, 0x04, 0x5d, 0x6f, 0x7b, 0x9b, 0x0f, 0xe3, + 0xbf, 0x1d, 0x3b, 0xa6, 0xb0, 0x2d, 0xe8, 0x89, 0x06, 0xf9, 0xa8, 0x5d, 0x29, 0x67, 0x35, 0x8e, + 0x14, 0xe8, 0xf3, 0x03, 0x0a, 0x14, 0xd4, 0x25, 0x0e, 0x55, 0x41, 0xe6, 0x1e, 0xa0, 0x02, 0x23, + 0x83, 0xbe, 0x83, 0x7c, 0xc4, 0xa8, 0x64, 0x13, 0x45, 0x0a, 0xb2, 0x89, 0x32, 0xac, 0x0e, 0x9e, + 0xe3, 0x44, 0xa7, 0xd1, 0xc9, 0x04, 0x11, 0x0b, 0x6a, 0x6b, 0xc2, 0xee, 0xa0, 0xdf, 0x34, 0x98, + 0x48, 0x59, 0x9c, 0xcc, 0x87, 0x96, 0xac, 0xca, 0x7e, 0x68, 0xfd, 0x4c, 0x0e, 0x5e, 0xe7, 0x34, + 0x1f, 0xa2, 0xf7, 0xf7, 0x30, 0x9f, 0x94, 0xf1, 0x40, 0x3f, 0x69, 0x30, 0x99, 0xf2, 0x2a, 0xe8, + 0xec, 0x30, 0x24, 0x4c, 0x5f, 0x1e, 0xaa, 0x6c, 0xe0, 0x61, 0x8d, 0x10, 0xa7, 0x9d, 0x11, 0x7a, + 0xa6, 0x41, 0x21, 0xee, 0x64, 0x66, 0x77, 0x6d, 0x1b, 0x94, 0x64, 0xbf, 0x42, 0x32, 0x8d, 0x0c, + 0x5e, 0xe5, 0x54, 0xef, 0xa1, 0xcb, 0x69, 0x2a, 0xdb, 0x19, 0x38, 0x47, 0x3e, 0xc4, 0xa7, 0x1a, + 0x8c, 0xc7, 0x9d, 0x09, 0xc2, 0x03, 0x01, 0x98, 0xfe, 0xf6, 0xe0, 0x1a, 0x45, 0x59, 0xe1, 0x94, + 0x4b, 0x68, 0x71, 0x98, 0xd9, 0x89, 0xc1, 0x35, 0x60, 0x54, 0x18, 0x0f, 0xa4, 0x67, 0x35, 0x12, + 0x39, 0x1d, 0xf7, 0xcf, 0xa9, 0xe6, 0xa7, 0x79, 0xf3, 0xe3, 0x68, 0x3a, 0xd1, 0x5c, 0x38, 0x19, + 0xd4, 0x85, 0x83, 0xa1, 0x89, 0x39, 0x99, 0x79, 0xba, 0x45, 0x52, 0x9f, 0xdb, 0x25, 0xa9, 0x7a, + 0x2d, 0xf2, 0x5e, 0x73, 0x68, 0x96, 0xf7, 0xda, 0x74, 0x98, 0x9f, 0x7a, 0x5b, 0x4a, 0x83, 0x82, + 0x7e, 0xd4, 0x60, 0x22, 0x65, 0x4e, 0xce, 0xf4, 0x6f, 0xd2, 0xab, 0xca, 0x3e, 0x6a, 0xfd, 0xfc, + 0x4a, 0xe2, 0xed, 0xbd, 0x0b, 0x53, 0xcd, 0xee, 0x81, 0x3c, 0xd7, 0x00, 0xa5, 0x9d, 0x03, 0x7a, + 0x2b, 0xab, 0x73, 0xba, 0x4e, 0x37, 0x86, 0xab, 0x53, 0x8c, 0xef, 0x70, 0xc6, 0xf3, 0xc8, 0xe8, + 0xbf, 0x8d, 0x7b, 0xbb, 0xd8, 0xe3, 0xcb, 0x6b, 0x81, 0x19, 0xd9, 0x81, 0x11, 0xfe, 0x0b, 0x8e, + 0x66, 0x32, 0x37, 0x42, 0xc4, 0xcd, 0xe8, 0xb3, 0xbb, 0x54, 0x48, 0x0a, 0x93, 0x53, 0x2c, 0xa2, + 0x79, 0xfe, 0xd1, 0x62, 0xd9, 0x25, 0xfe, 0x36, 0xf5, 0xee, 0xf2, 0x8b, 0x90, 0x89, 0x5b, 0x04, + 0xf3, 0x21, 0xb7, 0x42, 0x3b, 0xe8, 0x11, 0x1c, 0x0a, 0x0d, 0x07, 0x9a, 0xeb, 0xab, 0xdf, 0xb3, + 0x29, 0xfa, 0x99, 0xdd, 0x8b, 0x24, 0xc7, 0x02, 0xe7, 0xc0, 0x68, 0x66, 0x00, 0x07, 0xbb, 0x72, + 0xfd, 0xc5, 0x3f, 0xa5, 0xdc, 0x8b, 0x57, 0x25, 0xed, 0xe5, 0xab, 0x92, 0xf6, 0xf7, 0xab, 0x92, + 0xf6, 0xe4, 0x75, 0x29, 0xf7, 0xf2, 0x75, 0x29, 0xf7, 0xc7, 0xeb, 0x52, 0xee, 0xab, 0xc5, 0xc8, + 0xc7, 0x0b, 0xba, 0x45, 0x95, 0x50, 0x30, 0xe3, 0xfb, 0xa1, 0x12, 0xff, 0x86, 0xb1, 0x31, 0xca, + 0xbf, 0xc0, 0xac, 0xfc, 0x1f, 0x00, 0x00, 0xff, 0xff, 0xd7, 0x37, 0x3d, 0x0f, 0x37, 0x12, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1386,9 +1387,9 @@ type QueryClient interface { // misscounter in a given Slash Window ValidatorRewardSet(ctx context.Context, in *QueryValidatorRewardSet, opts ...grpc.CallOption) (*QueryValidatorRewardSetResponse, error) // Queries a Price by asset. - Price(ctx context.Context, in *QueryGetPriceRequest, opts ...grpc.CallOption) (*QueryGetPriceResponse, error) + Price(ctx context.Context, in *QueryPriceRequest, opts ...grpc.CallOption) (*QueryPriceResponse, error) // Queries a list of Price items. - PriceAll(ctx context.Context, in *QueryAllPriceRequest, opts ...grpc.CallOption) (*QueryAllPriceResponse, error) + PriceAll(ctx context.Context, in *QueryPriceAllRequest, opts ...grpc.CallOption) (*QueryPriceAllResponse, error) } type queryClient struct { @@ -1516,8 +1517,8 @@ func (c *queryClient) ValidatorRewardSet(ctx context.Context, in *QueryValidator return out, nil } -func (c *queryClient) Price(ctx context.Context, in *QueryGetPriceRequest, opts ...grpc.CallOption) (*QueryGetPriceResponse, error) { - out := new(QueryGetPriceResponse) +func (c *queryClient) Price(ctx context.Context, in *QueryPriceRequest, opts ...grpc.CallOption) (*QueryPriceResponse, error) { + out := new(QueryPriceResponse) err := c.cc.Invoke(ctx, "/ojo.oracle.v1.Query/Price", in, out, opts...) if err != nil { return nil, err @@ -1525,8 +1526,8 @@ func (c *queryClient) Price(ctx context.Context, in *QueryGetPriceRequest, opts return out, nil } -func (c *queryClient) PriceAll(ctx context.Context, in *QueryAllPriceRequest, opts ...grpc.CallOption) (*QueryAllPriceResponse, error) { - out := new(QueryAllPriceResponse) +func (c *queryClient) PriceAll(ctx context.Context, in *QueryPriceAllRequest, opts ...grpc.CallOption) (*QueryPriceAllResponse, error) { + out := new(QueryPriceAllResponse) err := c.cc.Invoke(ctx, "/ojo.oracle.v1.Query/PriceAll", in, out, opts...) if err != nil { return nil, err @@ -1568,9 +1569,9 @@ type QueryServer interface { // misscounter in a given Slash Window ValidatorRewardSet(context.Context, *QueryValidatorRewardSet) (*QueryValidatorRewardSetResponse, error) // Queries a Price by asset. - Price(context.Context, *QueryGetPriceRequest) (*QueryGetPriceResponse, error) + Price(context.Context, *QueryPriceRequest) (*QueryPriceResponse, error) // Queries a list of Price items. - PriceAll(context.Context, *QueryAllPriceRequest) (*QueryAllPriceResponse, error) + PriceAll(context.Context, *QueryPriceAllRequest) (*QueryPriceAllResponse, error) } // UnimplementedQueryServer can be embedded to have forward compatible implementations. @@ -1616,10 +1617,10 @@ func (*UnimplementedQueryServer) MedianDeviations(ctx context.Context, req *Quer func (*UnimplementedQueryServer) ValidatorRewardSet(ctx context.Context, req *QueryValidatorRewardSet) (*QueryValidatorRewardSetResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ValidatorRewardSet not implemented") } -func (*UnimplementedQueryServer) Price(ctx context.Context, req *QueryGetPriceRequest) (*QueryGetPriceResponse, error) { +func (*UnimplementedQueryServer) Price(ctx context.Context, req *QueryPriceRequest) (*QueryPriceResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Price not implemented") } -func (*UnimplementedQueryServer) PriceAll(ctx context.Context, req *QueryAllPriceRequest) (*QueryAllPriceResponse, error) { +func (*UnimplementedQueryServer) PriceAll(ctx context.Context, req *QueryPriceAllRequest) (*QueryPriceAllResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method PriceAll not implemented") } @@ -1862,7 +1863,7 @@ func _Query_ValidatorRewardSet_Handler(srv interface{}, ctx context.Context, dec } func _Query_Price_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryGetPriceRequest) + in := new(QueryPriceRequest) if err := dec(in); err != nil { return nil, err } @@ -1874,13 +1875,13 @@ func _Query_Price_Handler(srv interface{}, ctx context.Context, dec func(interfa FullMethod: "/ojo.oracle.v1.Query/Price", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).Price(ctx, req.(*QueryGetPriceRequest)) + return srv.(QueryServer).Price(ctx, req.(*QueryPriceRequest)) } return interceptor(ctx, in, info, handler) } func _Query_PriceAll_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryAllPriceRequest) + in := new(QueryPriceAllRequest) if err := dec(in); err != nil { return nil, err } @@ -1892,7 +1893,7 @@ func _Query_PriceAll_Handler(srv interface{}, ctx context.Context, dec func(inte FullMethod: "/ojo.oracle.v1.Query/PriceAll", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).PriceAll(ctx, req.(*QueryAllPriceRequest)) + return srv.(QueryServer).PriceAll(ctx, req.(*QueryPriceAllRequest)) } return interceptor(ctx, in, info, handler) } @@ -2754,7 +2755,7 @@ func (m *QueryValidatorRewardSetResponse) MarshalToSizedBuffer(dAtA []byte) (int return len(dAtA) - i, nil } -func (m *QueryGetPriceRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryPriceRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2764,12 +2765,12 @@ func (m *QueryGetPriceRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryGetPriceRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryPriceRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryGetPriceRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryPriceRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -2796,7 +2797,7 @@ func (m *QueryGetPriceRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryGetPriceResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryPriceResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2806,12 +2807,12 @@ func (m *QueryGetPriceResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryGetPriceResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryPriceResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryGetPriceResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryPriceResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -2829,7 +2830,7 @@ func (m *QueryGetPriceResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryAllPriceRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryPriceAllRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2839,12 +2840,12 @@ func (m *QueryAllPriceRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAllPriceRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryPriceAllRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllPriceRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryPriceAllRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -2852,7 +2853,7 @@ func (m *QueryAllPriceRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryAllPriceResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryPriceAllResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2862,12 +2863,12 @@ func (m *QueryAllPriceResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAllPriceResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryPriceAllResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllPriceResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryPriceAllResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -3219,7 +3220,7 @@ func (m *QueryValidatorRewardSetResponse) Size() (n int) { return n } -func (m *QueryGetPriceRequest) Size() (n int) { +func (m *QueryPriceRequest) Size() (n int) { if m == nil { return 0 } @@ -3239,7 +3240,7 @@ func (m *QueryGetPriceRequest) Size() (n int) { return n } -func (m *QueryGetPriceResponse) Size() (n int) { +func (m *QueryPriceResponse) Size() (n int) { if m == nil { return 0 } @@ -3250,7 +3251,7 @@ func (m *QueryGetPriceResponse) Size() (n int) { return n } -func (m *QueryAllPriceRequest) Size() (n int) { +func (m *QueryPriceAllRequest) Size() (n int) { if m == nil { return 0 } @@ -3259,7 +3260,7 @@ func (m *QueryAllPriceRequest) Size() (n int) { return n } -func (m *QueryAllPriceResponse) Size() (n int) { +func (m *QueryPriceAllResponse) Size() (n int) { if m == nil { return 0 } @@ -5227,7 +5228,7 @@ func (m *QueryValidatorRewardSetResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryGetPriceRequest) Unmarshal(dAtA []byte) error { +func (m *QueryPriceRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5250,10 +5251,10 @@ func (m *QueryGetPriceRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryGetPriceRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryPriceRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryGetPriceRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryPriceRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -5360,7 +5361,7 @@ func (m *QueryGetPriceRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryGetPriceResponse) Unmarshal(dAtA []byte) error { +func (m *QueryPriceResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5383,10 +5384,10 @@ func (m *QueryGetPriceResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryGetPriceResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryPriceResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryGetPriceResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryPriceResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -5443,7 +5444,7 @@ func (m *QueryGetPriceResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllPriceRequest) Unmarshal(dAtA []byte) error { +func (m *QueryPriceAllRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5466,10 +5467,10 @@ func (m *QueryAllPriceRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllPriceRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryPriceAllRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllPriceRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryPriceAllRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: @@ -5493,7 +5494,7 @@ func (m *QueryAllPriceRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllPriceResponse) Unmarshal(dAtA []byte) error { +func (m *QueryPriceAllResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5516,10 +5517,10 @@ func (m *QueryAllPriceResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllPriceResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryPriceAllResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllPriceResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryPriceAllResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: diff --git a/x/oracle/types/query.pb.gw.go b/x/oracle/types/query.pb.gw.go index 5f38267c..e541aefc 100644 --- a/x/oracle/types/query.pb.gw.go +++ b/x/oracle/types/query.pb.gw.go @@ -488,7 +488,7 @@ var ( ) func request_Query_Price_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryGetPriceRequest + var protoReq QueryPriceRequest var metadata runtime.ServerMetadata var ( @@ -522,7 +522,7 @@ func request_Query_Price_0(ctx context.Context, marshaler runtime.Marshaler, cli } func local_request_Query_Price_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryGetPriceRequest + var protoReq QueryPriceRequest var metadata runtime.ServerMetadata var ( @@ -556,7 +556,7 @@ func local_request_Query_Price_0(ctx context.Context, marshaler runtime.Marshale } func request_Query_PriceAll_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryAllPriceRequest + var protoReq QueryPriceAllRequest var metadata runtime.ServerMetadata msg, err := client.PriceAll(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) @@ -565,7 +565,7 @@ func request_Query_PriceAll_0(ctx context.Context, marshaler runtime.Marshaler, } func local_request_Query_PriceAll_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryAllPriceRequest + var protoReq QueryPriceAllRequest var metadata runtime.ServerMetadata msg, err := server.PriceAll(ctx, &protoReq)