From 72dec6db9bddddcd2bceec245d7e20a15876b8cd Mon Sep 17 00:00:00 2001 From: carla Date: Thu, 9 Jul 2020 17:20:03 +0200 Subject: [PATCH] multi: allow specifying of granularity level for report generation --- accounting/config.go | 13 +- accounting/conversions.go | 7 +- accounting/off_chain.go | 1 + accounting/on_chain.go | 1 + frdrpc/node_report.go | 9 +- frdrpc/rpc.pb.go | 242 ++++++++++++++++++++------------------ frdrpc/rpc.proto | 3 + frdrpc/rpc.swagger.json | 19 +++ 8 files changed, 169 insertions(+), 126 deletions(-) diff --git a/accounting/config.go b/accounting/config.go index fd40418..7b467bd 100644 --- a/accounting/config.go +++ b/accounting/config.go @@ -4,6 +4,7 @@ import ( "context" "time" + "github.com/lightninglabs/faraday/fiat" "github.com/lightninglabs/faraday/lndwrap" "github.com/lightninglabs/lndclient" "github.com/lightningnetwork/lnd/routing/route" @@ -68,11 +69,16 @@ type CommonConfig struct { // conversions. This is useful for testing, and for cases where our fiat // data api may be down. DisableFiat bool + + // Granularity specifies the level of granularity with which we want to + // get fiat prices. + Granularity fiat.Granularity } // NewOnChainConfig returns an on chain config from the lnd services provided. func NewOnChainConfig(ctx context.Context, lnd lndclient.LndServices, startTime, - endTime time.Time, disableFiat bool) *OnChainConfig { + endTime time.Time, disableFiat bool, + granularity fiat.Granularity) *OnChainConfig { return &OnChainConfig{ OpenChannels: lndwrap.ListChannels( @@ -91,6 +97,7 @@ func NewOnChainConfig(ctx context.Context, lnd lndclient.LndServices, startTime, StartTime: startTime, EndTime: endTime, DisableFiat: disableFiat, + Granularity: granularity, }, } } @@ -100,7 +107,8 @@ func NewOnChainConfig(ctx context.Context, lnd lndclient.LndServices, startTime, // lnd. func NewOffChainConfig(ctx context.Context, lnd lndclient.LndServices, maxInvoices, maxPayments, maxForwards uint64, ownPubkey route.Vertex, - startTime, endTime time.Time, disableFiat bool) *OffChainConfig { + startTime, endTime time.Time, disableFiat bool, + granularity fiat.Granularity) *OffChainConfig { return &OffChainConfig{ ListInvoices: func() ([]lndclient.Invoice, error) { @@ -131,6 +139,7 @@ func NewOffChainConfig(ctx context.Context, lnd lndclient.LndServices, StartTime: startTime, EndTime: endTime, DisableFiat: disableFiat, + Granularity: granularity, }, } } diff --git a/accounting/conversions.go b/accounting/conversions.go index 6c94c72..79bc35e 100644 --- a/accounting/conversions.go +++ b/accounting/conversions.go @@ -32,7 +32,7 @@ func invertMsat(msat int64) int64 { // of price data and returns a convert function which can be used to get // individual price points from this data. func getConversion(ctx context.Context, startTime, endTime time.Time, - disableFiat bool) (usdPrice, error) { + disableFiat bool, granularity fiat.Granularity) (usdPrice, error) { // If we don't want fiat values, just return a price which will yield // a zero price and timestamp. @@ -47,11 +47,6 @@ func getConversion(ctx context.Context, startTime, endTime time.Time, return nil, err } - granularity, err := fiat.BestGranularity(endTime.Sub(startTime)) - if err != nil { - return nil, err - } - // Get price data for our relevant period. We get pricing for the whole // period rather than on a per-item level to limit the number of api // calls we need to make to our external data source. diff --git a/accounting/off_chain.go b/accounting/off_chain.go index 2b4f7ee..0749066 100644 --- a/accounting/off_chain.go +++ b/accounting/off_chain.go @@ -45,6 +45,7 @@ func OffChainReport(ctx context.Context, cfg *OffChainConfig) (Report, error) { // or a no-op function if we do not want prices. getPrice, err := getConversion( ctx, cfg.StartTime, cfg.EndTime, cfg.DisableFiat, + cfg.Granularity, ) if err != nil { return nil, err diff --git a/accounting/on_chain.go b/accounting/on_chain.go index ff5ea63..81b776b 100644 --- a/accounting/on_chain.go +++ b/accounting/on_chain.go @@ -16,6 +16,7 @@ func OnChainReport(ctx context.Context, cfg *OnChainConfig) (Report, error) { // or a no-op function if we do not want prices. getPrice, err := getConversion( ctx, cfg.StartTime, cfg.EndTime, cfg.DisableFiat, + cfg.Granularity, ) if err != nil { return nil, err diff --git a/frdrpc/node_report.go b/frdrpc/node_report.go index fe3d9e0..c0c64b8 100644 --- a/frdrpc/node_report.go +++ b/frdrpc/node_report.go @@ -26,6 +26,11 @@ func parseNodeReportRequest(ctx context.Context, cfg *Config, return nil, nil, err } + granularity, err := granularityFromRPC(req.Granularity, end.Sub(start)) + if err != nil { + return nil, nil, err + } + pubkey, err := route.NewVertexFromBytes(info.IdentityPubkey[:]) if err != nil { return nil, nil, err @@ -34,11 +39,11 @@ func parseNodeReportRequest(ctx context.Context, cfg *Config, offChain := accounting.NewOffChainConfig( ctx, cfg.Lnd, uint64(maxInvoiceQueries), uint64(maxPaymentQueries), uint64(maxForwardQueries), - pubkey, start, end, req.DisableFiat, + pubkey, start, end, req.DisableFiat, granularity, ) onChain := accounting.NewOnChainConfig( - ctx, cfg.Lnd, start, end, req.DisableFiat, + ctx, cfg.Lnd, start, end, req.DisableFiat, granularity, ) return onChain, offChain, nil diff --git a/frdrpc/rpc.pb.go b/frdrpc/rpc.pb.go index c342c12..48f9107 100644 --- a/frdrpc/rpc.pb.go +++ b/frdrpc/rpc.pb.go @@ -1125,10 +1125,12 @@ type NodeReportRequest struct { // //Set to generate a report without conversion to fiat. If set, fiat values //will display as 0. - DisableFiat bool `protobuf:"varint,4,opt,name=disable_fiat,json=disableFiat,proto3" json:"disable_fiat,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + DisableFiat bool `protobuf:"varint,4,opt,name=disable_fiat,json=disableFiat,proto3" json:"disable_fiat,omitempty"` + // The level of granularity at which we wish to produce fiat prices. + Granularity Granularity `protobuf:"varint,5,opt,name=granularity,proto3,enum=frdrpc.Granularity" json:"granularity,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *NodeReportRequest) Reset() { *m = NodeReportRequest{} } @@ -1177,6 +1179,13 @@ func (m *NodeReportRequest) GetDisableFiat() bool { return false } +func (m *NodeReportRequest) GetGranularity() Granularity { + if m != nil { + return m.Granularity + } + return Granularity_UNKNOWN_GRANULARITY +} + type ReportEntry struct { // The unix timestamp of the event. Timestamp uint64 `protobuf:"varint,1,opt,name=timestamp,proto3" json:"timestamp,omitempty"` @@ -1509,119 +1518,120 @@ func init() { func init() { proto.RegisterFile("rpc.proto", fileDescriptor_77a6da22d6a3feb1) } var fileDescriptor_77a6da22d6a3feb1 = []byte{ - // 1788 bytes of a gzipped FileDescriptorProto + // 1794 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0xcd, 0x73, 0x1b, 0x49, - 0x15, 0x67, 0x24, 0x59, 0x1f, 0x4f, 0x96, 0x3c, 0x6e, 0x3b, 0x8e, 0xe2, 0x38, 0x89, 0x19, 0x36, - 0xac, 0x37, 0xbb, 0x6b, 0x6f, 0x44, 0x51, 0x05, 0x9c, 0x10, 0xda, 0x51, 0xac, 0x60, 0x49, 0xae, - 0xb6, 0xec, 0x90, 0x2a, 0xaa, 0xa6, 0x26, 0xa3, 0xb6, 0xd2, 0xac, 0xe6, 0x63, 0x7b, 0x5a, 0xae, - 0xb8, 0x28, 0x2e, 0x5c, 0x39, 0x70, 0xd8, 0x0b, 0x17, 0x0e, 0xfc, 0x17, 0x1c, 0xf9, 0x03, 0xb8, - 0x50, 0x14, 0x47, 0x2e, 0x14, 0x7f, 0x04, 0x47, 0xaa, 0x3f, 0xe6, 0x4b, 0xab, 0x7c, 0x5c, 0xf6, - 0xd6, 0xfd, 0xfb, 0xbd, 0xee, 0xdf, 0xeb, 0xf7, 0x9e, 0xde, 0x74, 0x0b, 0x1a, 0x2c, 0xf2, 0x8e, - 0x23, 0x16, 0xf2, 0x10, 0x55, 0xaf, 0xd9, 0x8c, 0x45, 0xde, 0xfe, 0xc1, 0x3c, 0x0c, 0xe7, 0x0b, - 0x72, 0xe2, 0x46, 0xf4, 0xc4, 0x0d, 0x82, 0x90, 0xbb, 0x9c, 0x86, 0x41, 0xac, 0xac, 0xac, 0xff, - 0x19, 0xb0, 0xdf, 0x5f, 0x84, 0x31, 0xc1, 0xc4, 0x0b, 0x7d, 0x9f, 0x04, 0x33, 0x49, 0x63, 0xf2, - 0xf5, 0x92, 0xc4, 0x1c, 0x7d, 0x0a, 0xdb, 0x3e, 0x0d, 0xa8, 0xbf, 0xf4, 0x1d, 0x3f, 0x0c, 0x28, - 0x0f, 0x19, 0x99, 0x75, 0x8c, 0x43, 0xe3, 0xa8, 0x8c, 0x4d, 0x4d, 0x8c, 0x12, 0x1c, 0xf5, 0xa0, - 0xea, 0x13, 0xce, 0xa8, 0xd7, 0x29, 0x1d, 0x1a, 0x47, 0xed, 0xee, 0x27, 0xc7, 0xca, 0x85, 0xe3, - 0xb7, 0x0b, 0x1c, 0x8f, 0xe4, 0x02, 0xac, 0x17, 0x5a, 0xbf, 0x81, 0xaa, 0x42, 0x50, 0x13, 0x6a, - 0x97, 0xe3, 0x5f, 0x8e, 0x27, 0x2f, 0xc6, 0xe6, 0xf7, 0x10, 0x40, 0xf5, 0xf2, 0x7c, 0x3a, 0x1c, - 0xd9, 0xa6, 0x21, 0x08, 0x6c, 0x5f, 0xd9, 0xe3, 0x4b, 0xdb, 0x2c, 0xa1, 0x1d, 0xd8, 0x1a, 0x8e, - 0xfb, 0x93, 0xd1, 0x70, 0xfc, 0xcc, 0xb9, 0x9a, 0x9c, 0x5d, 0x8e, 0x6c, 0xb3, 0x2c, 0xc0, 0xc9, - 0xe5, 0xf4, 0xd9, 0x24, 0x07, 0x56, 0x90, 0x09, 0x9b, 0xd3, 0xc9, 0xb4, 0x77, 0x96, 0x20, 0x1b, - 0xd6, 0x37, 0x06, 0x3c, 0x98, 0x2c, 0xf9, 0x82, 0x12, 0x56, 0xf4, 0x2d, 0x4e, 0x4e, 0xdf, 0x87, - 0x26, 0x23, 0x9e, 0xc3, 0xd4, 0x54, 0x9e, 0xbb, 0xd9, 0xb5, 0xde, 0x7f, 0x2a, 0x0c, 0x8c, 0x78, - 0xc9, 0x26, 0x9f, 0x03, 0x0a, 0x95, 0x8a, 0xe3, 0x2f, 0x17, 0x9c, 0x46, 0x62, 0x28, 0x23, 0x54, - 0xc2, 0xdb, 0x9a, 0x19, 0xa5, 0x84, 0xf5, 0x47, 0x03, 0x1e, 0x4d, 0x5f, 0x33, 0x12, 0xbf, 0x0e, - 0x17, 0xb3, 0xef, 0xd2, 0xaf, 0x8f, 0x61, 0x8b, 0x27, 0x3a, 0xce, 0x8d, 0xbb, 0x58, 0x12, 0xed, - 0x54, 0x3b, 0x85, 0xaf, 0x04, 0x6a, 0xfd, 0xd5, 0x80, 0x83, 0x35, 0x7b, 0xc6, 0x98, 0xc4, 0x51, - 0x18, 0xc4, 0x04, 0x3d, 0x86, 0x36, 0x0f, 0xb9, 0xbb, 0x70, 0xbc, 0xd7, 0x6e, 0x10, 0x90, 0x45, - 0x2c, 0x3d, 0xda, 0xc0, 0x2d, 0x89, 0xf6, 0x35, 0x88, 0x4e, 0x60, 0xc7, 0x0b, 0x83, 0x98, 0xce, - 0x08, 0x23, 0xb3, 0xcc, 0xb6, 0x24, 0x6d, 0x51, 0x46, 0xa5, 0x0b, 0x7e, 0x0e, 0x5b, 0xac, 0x28, - 0xd9, 0x29, 0x1f, 0x96, 0x8f, 0x9a, 0xdd, 0xbd, 0xe4, 0xa8, 0x2b, 0xa7, 0x5c, 0x35, 0xb7, 0x02, - 0x68, 0x17, 0x4d, 0xd0, 0x03, 0x00, 0xa1, 0xec, 0x44, 0x21, 0x0d, 0x54, 0xe4, 0x1a, 0xb8, 0x21, - 0x90, 0x73, 0x01, 0xa0, 0x5d, 0xd8, 0xc8, 0x87, 0x42, 0x4d, 0x44, 0xa8, 0xd2, 0x9d, 0x1d, 0x4f, - 0x84, 0xa2, 0x53, 0x3e, 0x34, 0x8e, 0xea, 0xb8, 0x9d, 0xc2, 0x32, 0x40, 0xd6, 0xd7, 0xb0, 0x8b, - 0xc9, 0x0d, 0x09, 0x96, 0x04, 0x93, 0x28, 0x64, 0x3c, 0x89, 0xf5, 0x23, 0x68, 0x66, 0xaa, 0x22, - 0x3c, 0xe5, 0xa3, 0x06, 0x86, 0x54, 0x36, 0x16, 0x6e, 0xc5, 0xdc, 0x65, 0xdc, 0xe1, 0xd4, 0x57, - 0xe2, 0x15, 0xdc, 0x90, 0xc8, 0x94, 0xfa, 0x04, 0xdd, 0x83, 0xba, 0x90, 0x96, 0x64, 0x59, 0x92, - 0x35, 0x12, 0xcc, 0x04, 0x65, 0x9d, 0xc2, 0x9d, 0x15, 0x49, 0x9d, 0x95, 0x13, 0xa8, 0x31, 0x89, - 0x28, 0xbd, 0x66, 0xf7, 0x4e, 0x16, 0xb5, 0xbc, 0x7d, 0x62, 0x65, 0xfd, 0xcb, 0x80, 0x56, 0x81, - 0x92, 0x89, 0x75, 0xd9, 0x9c, 0xf0, 0x24, 0x5b, 0x3a, 0x60, 0x2d, 0x85, 0xea, 0x44, 0xa1, 0x21, - 0x6c, 0x46, 0x2e, 0x65, 0x4e, 0x22, 0x57, 0x92, 0x72, 0x3f, 0x5c, 0x2b, 0x77, 0x7c, 0xee, 0x52, - 0xa6, 0x86, 0xb1, 0x1d, 0x70, 0x76, 0x8b, 0x9b, 0x51, 0x86, 0xec, 0x63, 0x30, 0x57, 0x0d, 0x90, - 0x09, 0xe5, 0xaf, 0xc8, 0xad, 0x96, 0x16, 0x43, 0x74, 0x94, 0xcf, 0x52, 0xb3, 0x8b, 0x12, 0xa5, - 0x6c, 0xa9, 0xce, 0xdc, 0xcf, 0x4a, 0x3f, 0x31, 0xac, 0xbf, 0x1b, 0x00, 0x19, 0x83, 0xbe, 0x80, - 0x5d, 0xd7, 0x0f, 0x97, 0x01, 0x77, 0xc2, 0x25, 0x9f, 0x87, 0x34, 0x98, 0x3b, 0x7e, 0xec, 0x72, - 0xdd, 0xd5, 0x90, 0xe2, 0x26, 0x9a, 0x1a, 0xc5, 0x2e, 0x47, 0x9f, 0x01, 0xba, 0x26, 0x24, 0x5e, - 0xb1, 0x2f, 0xa9, 0x2e, 0x28, 0x98, 0x82, 0x75, 0xb6, 0x3f, 0x0d, 0xbc, 0xd0, 0x4f, 0xed, 0xcb, - 0xf9, 0xfd, 0x87, 0x9a, 0x2a, 0xec, 0x5f, 0xb4, 0xaf, 0x64, 0xfb, 0xe7, 0xad, 0xad, 0x0e, 0xec, - 0xe9, 0xc0, 0x0f, 0x83, 0x98, 0xce, 0x5f, 0xf3, 0xa4, 0x2d, 0x58, 0xbf, 0x86, 0xbb, 0xdf, 0x62, - 0x74, 0x31, 0xf4, 0xc0, 0xd4, 0x29, 0x74, 0xa8, 0xe6, 0x74, 0x55, 0xa4, 0xbf, 0xa5, 0xe2, 0x52, - 0xbc, 0xe5, 0x15, 0xb7, 0xb2, 0xfe, 0x51, 0x82, 0x76, 0xd1, 0xe6, 0x7d, 0x3f, 0x26, 0xf1, 0xf1, - 0x48, 0x3e, 0x0e, 0x4e, 0x4c, 0xbc, 0x30, 0x98, 0xc5, 0xba, 0xb6, 0xcd, 0x94, 0xb8, 0x50, 0xb8, - 0xa8, 0xb5, 0x65, 0x24, 0x0a, 0x3c, 0xb5, 0x54, 0x85, 0xde, 0x52, 0x68, 0x62, 0xf6, 0x05, 0xec, - 0xde, 0x84, 0x8b, 0xa5, 0x4f, 0xd6, 0x46, 0x0b, 0x29, 0xae, 0x10, 0xdd, 0x6c, 0x45, 0x31, 0x7f, - 0x1b, 0xf9, 0x15, 0x85, 0x0c, 0x1e, 0x81, 0x8c, 0xba, 0x43, 0x5c, 0x16, 0x90, 0x99, 0xb2, 0xae, - 0x4a, 0xeb, 0xb6, 0xc0, 0x6d, 0x09, 0x4b, 0xcb, 0x8f, 0xa0, 0xe5, 0x85, 0xc1, 0x35, 0x65, 0xbe, - 0xee, 0x4f, 0xb5, 0x43, 0xe3, 0xa8, 0x85, 0x8b, 0x20, 0xea, 0x40, 0x2d, 0x62, 0xf4, 0xc6, 0xe5, - 0xa4, 0x53, 0x97, 0x6d, 0x23, 0x99, 0x5a, 0x6f, 0x60, 0xc7, 0x7e, 0x23, 0x02, 0x36, 0x27, 0xd8, - 0xe5, 0x24, 0x69, 0x17, 0x0f, 0x01, 0xc4, 0x99, 0x63, 0xee, 0xfa, 0x91, 0xea, 0x79, 0x15, 0x9c, - 0x43, 0xd0, 0x8f, 0xa1, 0x39, 0x67, 0x6e, 0xb0, 0x5c, 0xb8, 0x8c, 0xf2, 0x5b, 0x79, 0xf6, 0x76, - 0x77, 0x27, 0x49, 0xe4, 0xb3, 0x8c, 0xc2, 0x79, 0xbb, 0xe7, 0x95, 0xba, 0x61, 0x96, 0x9e, 0x57, - 0xea, 0x25, 0xb3, 0x6c, 0x9d, 0xc2, 0x6e, 0x51, 0x59, 0x17, 0xca, 0x13, 0xd8, 0x60, 0x2e, 0x27, - 0xc9, 0x8f, 0x78, 0x37, 0xd9, 0xb4, 0x60, 0xac, 0x4c, 0xd4, 0x7e, 0xd6, 0x08, 0x36, 0x7f, 0x41, - 0xb9, 0x17, 0xd2, 0xe0, 0x9c, 0x51, 0x8f, 0x88, 0x16, 0x1a, 0x89, 0x81, 0xae, 0x07, 0x35, 0x11, - 0x2d, 0x54, 0x0e, 0x9c, 0xf4, 0x18, 0xba, 0x12, 0xda, 0x12, 0x9e, 0x26, 0xa8, 0xe5, 0xc0, 0x66, - 0x5e, 0x0b, 0x1d, 0x40, 0x23, 0x5b, 0x62, 0xa8, 0xc6, 0x98, 0x02, 0xe8, 0x29, 0x34, 0x5e, 0x71, - 0xcf, 0x51, 0x82, 0xaa, 0x1b, 0xa4, 0x2e, 0xe7, 0xbd, 0xc2, 0xf5, 0x57, 0xdc, 0x93, 0x23, 0xeb, - 0x06, 0xb6, 0xc7, 0xe1, 0x6c, 0xa5, 0x41, 0x17, 0xfb, 0xaf, 0xf1, 0xae, 0xfe, 0x5b, 0x2a, 0xf4, - 0x5f, 0xf4, 0x7d, 0xd8, 0x9c, 0xd1, 0xd8, 0x7d, 0xb5, 0x20, 0xce, 0x35, 0xd5, 0x85, 0x58, 0xc7, - 0x4d, 0x8d, 0x0d, 0xa8, 0xcb, 0x9f, 0x57, 0xea, 0x65, 0xb3, 0x62, 0xfd, 0xad, 0x04, 0x4d, 0x25, - 0xaa, 0xda, 0xda, 0xbb, 0x0f, 0x76, 0x0f, 0xea, 0x61, 0x20, 0xda, 0x2e, 0x0d, 0xa4, 0x62, 0x1d, - 0xd7, 0xc2, 0xa0, 0x2f, 0xa6, 0x68, 0x0f, 0xaa, 0xaa, 0x89, 0xe8, 0x5f, 0x88, 0x9e, 0x09, 0xdc, - 0x63, 0x64, 0x46, 0x13, 0x1f, 0xf4, 0x4c, 0x24, 0xc4, 0x8d, 0x63, 0xa2, 0x2a, 0xbe, 0x81, 0xd5, - 0x04, 0x3d, 0x86, 0x0a, 0xbf, 0x8d, 0x88, 0x2c, 0xec, 0x76, 0x77, 0x3b, 0xcd, 0xb3, 0xf0, 0x6d, - 0x7a, 0x1b, 0x11, 0x2c, 0x69, 0x84, 0xa0, 0xc2, 0xdf, 0xd0, 0x99, 0x2c, 0xec, 0x06, 0x96, 0x63, - 0x81, 0xc9, 0xa3, 0xd6, 0x15, 0x26, 0xc6, 0xe2, 0x34, 0x8c, 0x5c, 0x13, 0x46, 0x02, 0x8f, 0x74, - 0x1a, 0xaa, 0x13, 0xa4, 0x80, 0x58, 0x11, 0x84, 0x9c, 0x74, 0x40, 0xad, 0x10, 0xe3, 0x62, 0xea, - 0x9a, 0x1f, 0x94, 0xba, 0x3e, 0xa0, 0x7c, 0xea, 0x74, 0xc9, 0x7e, 0xbe, 0xfa, 0xa1, 0xdb, 0xc9, - 0xbe, 0x3c, 0x69, 0xb8, 0xb3, 0xcf, 0xdc, 0x4f, 0x01, 0xe9, 0xdb, 0x4c, 0xbe, 0x00, 0x7e, 0x00, - 0xad, 0xa4, 0x41, 0xe6, 0xbb, 0xd9, 0xa6, 0x06, 0x65, 0x43, 0xb3, 0xfe, 0x6d, 0xc0, 0x4e, 0x61, - 0xad, 0xf6, 0xe0, 0x43, 0x16, 0x8b, 0x6e, 0x98, 0xb5, 0x60, 0xca, 0xa9, 0xcb, 0x43, 0xa6, 0x53, - 0x6b, 0xa6, 0xbd, 0x56, 0xe3, 0xb2, 0xb3, 0x0a, 0x21, 0x47, 0xe6, 0xa8, 0xac, 0x3b, 0xab, 0x40, - 0x44, 0x6e, 0x72, 0xb4, 0xc8, 0x4d, 0x25, 0x4f, 0x8b, 0x04, 0x89, 0xe2, 0x89, 0x48, 0xe0, 0x5c, - 0x13, 0xa2, 0x93, 0x5e, 0x13, 0xf3, 0x01, 0x21, 0xe8, 0x3e, 0x28, 0x3b, 0xc9, 0x55, 0x25, 0x57, - 0x97, 0xc0, 0x80, 0x90, 0x27, 0x7f, 0x31, 0xa0, 0x99, 0xeb, 0x1e, 0xe8, 0x2e, 0xec, 0xe8, 0x3b, - 0xb8, 0xf3, 0x0c, 0xf7, 0xc6, 0x97, 0x67, 0x3d, 0x3c, 0x9c, 0xbe, 0x54, 0xf7, 0xf1, 0xd1, 0x70, - 0x7c, 0x39, 0x15, 0xf7, 0x71, 0x13, 0x36, 0x07, 0xc3, 0x2b, 0xdb, 0x51, 0xc0, 0x85, 0xba, 0x94, - 0x0f, 0x86, 0x83, 0xa9, 0x6d, 0x8f, 0x53, 0xb0, 0x8c, 0x10, 0xb4, 0xa7, 0xa7, 0x43, 0x3c, 0x7d, - 0x99, 0x62, 0x15, 0x54, 0x87, 0xca, 0xe9, 0xe4, 0x12, 0x9b, 0x1b, 0xa8, 0x05, 0x8d, 0x8b, 0xe1, - 0xaf, 0x1c, 0x31, 0xbb, 0x30, 0xab, 0xf2, 0xb2, 0xfe, 0xc2, 0x3e, 0xbb, 0xb2, 0x35, 0x52, 0x43, - 0x35, 0x28, 0x7f, 0xd9, 0x7b, 0x69, 0xd6, 0x9f, 0xfc, 0xa1, 0x04, 0x8d, 0xb4, 0x48, 0x8b, 0xaf, - 0x84, 0x3d, 0x40, 0x67, 0x93, 0x7e, 0xef, 0xcc, 0xe9, 0x9f, 0xf6, 0xc6, 0x63, 0xfb, 0xcc, 0x99, - 0x9c, 0xdb, 0x63, 0xd3, 0x10, 0xc7, 0xc0, 0xf6, 0x68, 0x32, 0xb5, 0x8b, 0x44, 0x09, 0xed, 0x82, - 0x99, 0x47, 0x9c, 0x81, 0x2d, 0x9e, 0x0f, 0xdb, 0xd0, 0x4a, 0xd0, 0xfe, 0xd9, 0xe4, 0x42, 0x3c, - 0x1e, 0xe4, 0x9b, 0xa3, 0x6f, 0x0f, 0xcf, 0xa7, 0xe6, 0x86, 0x98, 0x9c, 0xf7, 0x5e, 0x8e, 0xec, - 0xf1, 0xd4, 0xac, 0x0a, 0xbf, 0xc4, 0xaa, 0x9a, 0xdc, 0x6b, 0x88, 0xfb, 0x22, 0x46, 0x4e, 0x62, - 0x5b, 0x17, 0xb6, 0x83, 0x09, 0x7e, 0xd1, 0xc3, 0x5f, 0x9a, 0x0d, 0xb4, 0x05, 0x4d, 0x3d, 0x91, - 0x4a, 0x50, 0x58, 0x93, 0x6c, 0xd9, 0x14, 0x87, 0x4f, 0x51, 0x61, 0xb7, 0x89, 0x1a, 0xb0, 0x71, - 0xf1, 0xc2, 0xb6, 0xcf, 0xcd, 0x96, 0x0c, 0x94, 0x18, 0x4a, 0xa6, 0xdd, 0xfd, 0x4f, 0x15, 0x5a, - 0x03, 0x97, 0xb9, 0x33, 0xf7, 0xf6, 0x82, 0xb0, 0x1b, 0xc2, 0xd0, 0x9f, 0x0c, 0xd8, 0x5b, 0xff, - 0xaa, 0x41, 0x8f, 0x93, 0xdf, 0xc5, 0x3b, 0x5f, 0x3d, 0xfb, 0x1f, 0xbd, 0xe3, 0x21, 0x91, 0xde, - 0x28, 0xac, 0xa7, 0xbf, 0xff, 0xe7, 0x7f, 0xbf, 0x29, 0x7d, 0x8a, 0x3e, 0x39, 0xb9, 0x79, 0x7a, - 0x72, 0xad, 0x5c, 0x38, 0xd1, 0xcf, 0x99, 0xf8, 0xe4, 0xb7, 0xb9, 0xf7, 0xc9, 0xb1, 0x7a, 0xdb, - 0xfd, 0x0e, 0xfd, 0xd9, 0x80, 0xce, 0xdb, 0x9e, 0x36, 0xe8, 0xe3, 0x44, 0xf5, 0x3d, 0x8f, 0x9f, - 0x0f, 0x74, 0xaf, 0x2b, 0xdd, 0xfb, 0x0c, 0x3d, 0xc9, 0xbb, 0x97, 0x3e, 0x6c, 0xd6, 0xfb, 0x47, - 0x57, 0xef, 0xbf, 0x07, 0xeb, 0x6f, 0xcc, 0xda, 0x91, 0x07, 0x6f, 0x61, 0xb5, 0x07, 0xf7, 0xa5, - 0x07, 0x77, 0xd0, 0x4e, 0xde, 0x03, 0xa6, 0x4c, 0x51, 0x04, 0x5b, 0x2b, 0x57, 0x35, 0xf4, 0x70, - 0xfd, 0x45, 0x2c, 0x3d, 0xf7, 0xa3, 0xb7, 0xf2, 0x5a, 0xf0, 0x40, 0x0a, 0xee, 0xa1, 0xdd, 0xbc, - 0x60, 0x72, 0xdb, 0x43, 0x5f, 0xad, 0x7c, 0x57, 0xef, 0xaf, 0xfd, 0xb2, 0x6b, 0xad, 0x83, 0xf5, - 0xa4, 0x16, 0x3a, 0x94, 0x42, 0xfb, 0xa8, 0x93, 0x17, 0x22, 0xda, 0x52, 0x5c, 0x0d, 0x90, 0x07, - 0x90, 0x35, 0x6a, 0x74, 0x2f, 0xd9, 0xed, 0x5b, 0xdf, 0xdd, 0xfd, 0xfd, 0x75, 0x94, 0x96, 0x79, - 0x28, 0x65, 0x3a, 0x68, 0x2f, 0x2f, 0x13, 0x84, 0xe2, 0x8d, 0x28, 0xb7, 0x9d, 0x43, 0x33, 0xd7, - 0x8c, 0xd1, 0xfe, 0x4a, 0x5d, 0xe4, 0x65, 0xee, 0xaf, 0xe5, 0xb4, 0xce, 0x23, 0xa9, 0x73, 0x0f, - 0xdd, 0xcd, 0xeb, 0xc8, 0x9e, 0xa8, 0x84, 0x5e, 0x55, 0xe5, 0x5f, 0x25, 0x3f, 0xfa, 0x7f, 0x00, - 0x00, 0x00, 0xff, 0xff, 0x16, 0x6f, 0x58, 0x95, 0x5d, 0x11, 0x00, 0x00, + 0x15, 0x67, 0xf4, 0xad, 0x27, 0x4b, 0x1e, 0xb7, 0x1d, 0x47, 0x71, 0x9c, 0xc4, 0x0c, 0x1b, 0xd6, + 0x9b, 0xdd, 0xb5, 0x37, 0xa2, 0xa8, 0x02, 0x4e, 0x08, 0xed, 0x28, 0xd6, 0x62, 0x49, 0xae, 0xb6, + 0xe4, 0x90, 0x2a, 0xaa, 0xa6, 0x26, 0xa3, 0xb6, 0xd2, 0xac, 0x34, 0x33, 0xdb, 0xd3, 0x72, 0xc5, + 0x45, 0x71, 0xe1, 0xca, 0x81, 0xc3, 0x5e, 0xb8, 0x70, 0xe0, 0x0f, 0xe0, 0xce, 0x91, 0x3f, 0x80, + 0x0b, 0x45, 0x71, 0xe4, 0x42, 0xf1, 0x47, 0x70, 0xa4, 0xfa, 0x63, 0xbe, 0x14, 0xe5, 0xe3, 0xc2, + 0xad, 0xfb, 0xf7, 0x7b, 0xdd, 0xbf, 0xd7, 0xef, 0xbd, 0x79, 0xea, 0x16, 0xd4, 0x59, 0xe8, 0x9d, + 0x84, 0x2c, 0xe0, 0x01, 0xaa, 0x5c, 0xb3, 0x19, 0x0b, 0xbd, 0x83, 0xc3, 0x79, 0x10, 0xcc, 0x17, + 0xe4, 0xd4, 0x0d, 0xe9, 0xa9, 0xeb, 0xfb, 0x01, 0x77, 0x39, 0x0d, 0xfc, 0x48, 0x59, 0x59, 0xff, + 0x35, 0xe0, 0xa0, 0xb7, 0x08, 0x22, 0x82, 0x89, 0x17, 0x2c, 0x97, 0xc4, 0x9f, 0x49, 0x1a, 0x93, + 0x6f, 0x56, 0x24, 0xe2, 0xe8, 0x53, 0xd8, 0x59, 0x52, 0x9f, 0x2e, 0x57, 0x4b, 0x67, 0x19, 0xf8, + 0x94, 0x07, 0x8c, 0xcc, 0xda, 0xc6, 0x91, 0x71, 0x5c, 0xc4, 0xa6, 0x26, 0x86, 0x31, 0x8e, 0xba, + 0x50, 0x59, 0x12, 0xce, 0xa8, 0xd7, 0x2e, 0x1c, 0x19, 0xc7, 0xad, 0xce, 0x27, 0x27, 0xca, 0x85, + 0x93, 0xb7, 0x0b, 0x9c, 0x0c, 0xe5, 0x02, 0xac, 0x17, 0x5a, 0xbf, 0x82, 0x8a, 0x42, 0x50, 0x03, + 0xaa, 0xd3, 0xd1, 0xcf, 0x47, 0xe3, 0xe7, 0x23, 0xf3, 0x3b, 0x08, 0xa0, 0x32, 0xbd, 0x98, 0x0c, + 0x86, 0xb6, 0x69, 0x08, 0x02, 0xdb, 0x57, 0xf6, 0x68, 0x6a, 0x9b, 0x05, 0xb4, 0x0b, 0xdb, 0x83, + 0x51, 0x6f, 0x3c, 0x1c, 0x8c, 0x9e, 0x39, 0x57, 0xe3, 0xf3, 0xe9, 0xd0, 0x36, 0x8b, 0x02, 0x1c, + 0x4f, 0x27, 0xcf, 0xc6, 0x19, 0xb0, 0x84, 0x4c, 0xd8, 0x9a, 0x8c, 0x27, 0xdd, 0xf3, 0x18, 0x29, + 0x5b, 0xdf, 0x1a, 0xf0, 0x60, 0xbc, 0xe2, 0x0b, 0x4a, 0x58, 0xde, 0xb7, 0x28, 0x3e, 0x7d, 0x0f, + 0x1a, 0x8c, 0x78, 0x0e, 0x53, 0x53, 0x79, 0xee, 0x46, 0xc7, 0x7a, 0xff, 0xa9, 0x30, 0x30, 0xe2, + 0xc5, 0x9b, 0x7c, 0x0e, 0x28, 0x50, 0x2a, 0xce, 0x72, 0xb5, 0xe0, 0x34, 0x14, 0x43, 0x19, 0xa1, + 0x02, 0xde, 0xd1, 0xcc, 0x30, 0x21, 0xac, 0xdf, 0x1b, 0xf0, 0x68, 0xf2, 0x8a, 0x91, 0xe8, 0x55, + 0xb0, 0x98, 0xfd, 0x3f, 0xfd, 0xfa, 0x18, 0xb6, 0x79, 0xac, 0xe3, 0xdc, 0xb8, 0x8b, 0x15, 0xd1, + 0x4e, 0xb5, 0x12, 0xf8, 0x4a, 0xa0, 0xd6, 0x5f, 0x0c, 0x38, 0xdc, 0xb0, 0x67, 0x84, 0x49, 0x14, + 0x06, 0x7e, 0x44, 0xd0, 0x63, 0x68, 0xf1, 0x80, 0xbb, 0x0b, 0xc7, 0x7b, 0xe5, 0xfa, 0x3e, 0x59, + 0x44, 0xd2, 0xa3, 0x32, 0x6e, 0x4a, 0xb4, 0xa7, 0x41, 0x74, 0x0a, 0xbb, 0x5e, 0xe0, 0x47, 0x74, + 0x46, 0x18, 0x99, 0xa5, 0xb6, 0x05, 0x69, 0x8b, 0x52, 0x2a, 0x59, 0xf0, 0x53, 0xd8, 0x66, 0x79, + 0xc9, 0x76, 0xf1, 0xa8, 0x78, 0xdc, 0xe8, 0xec, 0xc7, 0x47, 0x5d, 0x3b, 0xe5, 0xba, 0xb9, 0xe5, + 0x43, 0x2b, 0x6f, 0x82, 0x1e, 0x00, 0x08, 0x65, 0x27, 0x0c, 0xa8, 0xaf, 0x22, 0x57, 0xc7, 0x75, + 0x81, 0x5c, 0x08, 0x00, 0xed, 0x41, 0x39, 0x1b, 0x0a, 0x35, 0x11, 0xa1, 0x4a, 0x76, 0x76, 0x3c, + 0x11, 0x8a, 0x76, 0xf1, 0xc8, 0x38, 0xae, 0xe1, 0x56, 0x02, 0xcb, 0x00, 0x59, 0xdf, 0xc0, 0x1e, + 0x26, 0x37, 0xc4, 0x5f, 0x11, 0x4c, 0xc2, 0x80, 0xf1, 0x38, 0xd6, 0x8f, 0xa0, 0x91, 0xaa, 0x8a, + 0xf0, 0x14, 0x8f, 0xeb, 0x18, 0x12, 0xd9, 0x48, 0xb8, 0x15, 0x71, 0x97, 0x71, 0x87, 0xd3, 0xa5, + 0x12, 0x2f, 0xe1, 0xba, 0x44, 0x26, 0x74, 0x49, 0xd0, 0x3d, 0xa8, 0x09, 0x69, 0x49, 0x16, 0x25, + 0x59, 0x25, 0xfe, 0x4c, 0x50, 0xd6, 0x19, 0xdc, 0x59, 0x93, 0xd4, 0x59, 0x39, 0x85, 0x2a, 0x93, + 0x88, 0xd2, 0x6b, 0x74, 0xee, 0xa4, 0x51, 0xcb, 0xda, 0xc7, 0x56, 0xd6, 0x3f, 0x0d, 0x68, 0xe6, + 0x28, 0x99, 0x58, 0x97, 0xcd, 0x09, 0x8f, 0xb3, 0xa5, 0x03, 0xd6, 0x54, 0xa8, 0x4e, 0x14, 0x1a, + 0xc0, 0x56, 0xe8, 0x52, 0xe6, 0xc4, 0x72, 0x05, 0x29, 0xf7, 0xfd, 0x8d, 0x72, 0x27, 0x17, 0x2e, + 0x65, 0x6a, 0x18, 0xd9, 0x3e, 0x67, 0xb7, 0xb8, 0x11, 0xa6, 0xc8, 0x01, 0x06, 0x73, 0xdd, 0x00, + 0x99, 0x50, 0xfc, 0x9a, 0xdc, 0x6a, 0x69, 0x31, 0x44, 0xc7, 0xd9, 0x2c, 0x35, 0x3a, 0x28, 0x56, + 0x4a, 0x97, 0xea, 0xcc, 0xfd, 0xa4, 0xf0, 0x23, 0xc3, 0xfa, 0x9b, 0x01, 0x90, 0x32, 0xe8, 0x0b, + 0xd8, 0x73, 0x97, 0xc1, 0xca, 0xe7, 0x4e, 0xb0, 0xe2, 0xf3, 0x80, 0xfa, 0x73, 0x67, 0x19, 0xb9, + 0x5c, 0x77, 0x35, 0xa4, 0xb8, 0xb1, 0xa6, 0x86, 0x91, 0xcb, 0xd1, 0x67, 0x80, 0xae, 0x09, 0x89, + 0xd6, 0xec, 0x0b, 0xaa, 0x0b, 0x0a, 0x26, 0x67, 0x9d, 0xee, 0x4f, 0x7d, 0x2f, 0x58, 0x26, 0xf6, + 0xc5, 0xec, 0xfe, 0x03, 0x4d, 0xe5, 0xf6, 0xcf, 0xdb, 0x97, 0xd2, 0xfd, 0xb3, 0xd6, 0x56, 0x1b, + 0xf6, 0x75, 0xe0, 0x07, 0x7e, 0x44, 0xe7, 0xaf, 0x78, 0xdc, 0x16, 0xac, 0x5f, 0xc2, 0xdd, 0x37, + 0x18, 0x5d, 0x0c, 0x5d, 0x30, 0x75, 0x0a, 0x1d, 0xaa, 0x39, 0x5d, 0x15, 0xc9, 0xb7, 0x94, 0x5f, + 0x8a, 0xb7, 0xbd, 0xfc, 0x56, 0xd6, 0xdf, 0x0b, 0xd0, 0xca, 0xdb, 0xbc, 0xef, 0x63, 0x12, 0x3f, + 0x1e, 0xf1, 0x8f, 0x83, 0x13, 0x11, 0x2f, 0xf0, 0x67, 0x91, 0xae, 0x6d, 0x33, 0x21, 0x2e, 0x15, + 0x2e, 0x6a, 0x6d, 0x15, 0x8a, 0x02, 0x4f, 0x2c, 0x55, 0xa1, 0x37, 0x15, 0x1a, 0x9b, 0x7d, 0x01, + 0x7b, 0x37, 0xc1, 0x62, 0xb5, 0x24, 0x1b, 0xa3, 0x85, 0x14, 0x97, 0x8b, 0x6e, 0xba, 0x22, 0x9f, + 0xbf, 0x72, 0x76, 0x45, 0x2e, 0x83, 0xc7, 0x20, 0xa3, 0xee, 0x10, 0x97, 0xf9, 0x64, 0xa6, 0xac, + 0x2b, 0xd2, 0xba, 0x25, 0x70, 0x5b, 0xc2, 0xd2, 0xf2, 0x23, 0x68, 0x7a, 0x81, 0x7f, 0x4d, 0xd9, + 0x52, 0xf7, 0xa7, 0xea, 0x91, 0x71, 0xdc, 0xc4, 0x79, 0x10, 0xb5, 0xa1, 0x1a, 0x32, 0x7a, 0xe3, + 0x72, 0xd2, 0xae, 0xc9, 0xb6, 0x11, 0x4f, 0xad, 0xd7, 0xb0, 0x6b, 0xbf, 0x16, 0x01, 0x9b, 0x13, + 0xec, 0x72, 0x12, 0xb7, 0x8b, 0x87, 0x00, 0xe2, 0xcc, 0x11, 0x77, 0x97, 0xa1, 0xea, 0x79, 0x25, + 0x9c, 0x41, 0xd0, 0x0f, 0xa1, 0x31, 0x67, 0xae, 0xbf, 0x5a, 0xb8, 0x8c, 0xf2, 0x5b, 0x79, 0xf6, + 0x56, 0x67, 0x37, 0x4e, 0xe4, 0xb3, 0x94, 0xc2, 0x59, 0xbb, 0xaf, 0x4a, 0x35, 0xc3, 0x2c, 0x7c, + 0x55, 0xaa, 0x15, 0xcc, 0xa2, 0x75, 0x06, 0x7b, 0x79, 0x65, 0x5d, 0x28, 0x4f, 0xa0, 0xcc, 0x5c, + 0x4e, 0xe2, 0x8f, 0x78, 0x2f, 0xde, 0x34, 0x67, 0xac, 0x4c, 0xd4, 0x7e, 0xd6, 0x10, 0xb6, 0x7e, + 0x46, 0xb9, 0x17, 0x50, 0xff, 0x82, 0x51, 0x8f, 0x88, 0x16, 0x1a, 0x8a, 0x81, 0xae, 0x07, 0x35, + 0x11, 0x2d, 0x54, 0x0e, 0x9c, 0xe4, 0x18, 0xba, 0x12, 0x5a, 0x12, 0x9e, 0xc4, 0xa8, 0xe5, 0xc0, + 0x56, 0x56, 0x0b, 0x1d, 0x42, 0x3d, 0x5d, 0x62, 0xa8, 0xc6, 0x98, 0x00, 0xe8, 0x29, 0xd4, 0x5f, + 0x72, 0xcf, 0x51, 0x82, 0xaa, 0x1b, 0x24, 0x2e, 0x67, 0xbd, 0xc2, 0xb5, 0x97, 0xdc, 0x93, 0x23, + 0xeb, 0xcf, 0x06, 0xec, 0x8c, 0x82, 0xd9, 0x5a, 0x87, 0xce, 0x37, 0x60, 0xe3, 0x5d, 0x0d, 0xb8, + 0x90, 0x6b, 0xc0, 0xe8, 0xbb, 0xb0, 0x35, 0xa3, 0x91, 0xfb, 0x72, 0x41, 0x9c, 0x6b, 0xaa, 0x2b, + 0xb1, 0x86, 0x1b, 0x1a, 0xeb, 0x53, 0x97, 0xaf, 0xe7, 0xab, 0xfc, 0xc1, 0xf9, 0x2a, 0x9a, 0x25, + 0xeb, 0xaf, 0x05, 0x68, 0x28, 0x5f, 0x55, 0x3b, 0x7c, 0x77, 0x40, 0xee, 0x41, 0x2d, 0xf0, 0x45, + 0xbb, 0xa6, 0xbe, 0x74, 0xb4, 0x86, 0xab, 0x81, 0xdf, 0x13, 0x53, 0xb4, 0x0f, 0x15, 0xd5, 0x7c, + 0xf4, 0x97, 0xa5, 0x67, 0x02, 0xf7, 0x18, 0x99, 0xd1, 0xd8, 0x75, 0x3d, 0x13, 0x89, 0x74, 0xa3, + 0x88, 0xa8, 0x2f, 0xa5, 0x8e, 0xd5, 0x04, 0x3d, 0x86, 0x12, 0xbf, 0x0d, 0x89, 0xfc, 0x20, 0x5a, + 0x9d, 0x9d, 0xa4, 0x3e, 0x84, 0x6f, 0x93, 0xdb, 0x90, 0x60, 0x49, 0x23, 0x04, 0x25, 0xfe, 0x9a, + 0xce, 0xe4, 0x07, 0x51, 0xc7, 0x72, 0x2c, 0x30, 0x19, 0xa1, 0x9a, 0xc2, 0xc4, 0x58, 0x9c, 0x86, + 0x91, 0x6b, 0xc2, 0x88, 0xef, 0x91, 0x76, 0x5d, 0x75, 0x90, 0x04, 0x10, 0x2b, 0xfc, 0x80, 0x93, + 0x36, 0xa8, 0x15, 0x62, 0x9c, 0x4f, 0x79, 0xe3, 0x83, 0x52, 0xde, 0x03, 0x94, 0xcd, 0xb8, 0x2e, + 0xf5, 0xcf, 0xd7, 0x7f, 0x20, 0x77, 0xd3, 0x5f, 0xac, 0x24, 0xdc, 0xe9, 0xcf, 0xe3, 0x8f, 0x01, + 0xe9, 0x5b, 0x50, 0xb6, 0x6e, 0xbe, 0x07, 0xcd, 0xb8, 0xb1, 0x66, 0xbb, 0xe0, 0x96, 0x06, 0x65, + 0x23, 0xb4, 0xfe, 0x65, 0xc0, 0x6e, 0x6e, 0xad, 0xf6, 0xe0, 0x43, 0x16, 0x8b, 0x2e, 0x9a, 0xb6, + 0x6e, 0xca, 0xa9, 0xcb, 0x03, 0xa6, 0x53, 0x6b, 0x26, 0x3d, 0x5a, 0xe3, 0xb2, 0x23, 0x0b, 0x21, + 0x47, 0xe6, 0xa8, 0xa8, 0x3b, 0xb2, 0x40, 0x44, 0x6e, 0x32, 0xb4, 0xc8, 0x4d, 0x29, 0x4b, 0x8b, + 0x04, 0x89, 0xe2, 0x09, 0x89, 0xef, 0x5c, 0x13, 0xa2, 0x93, 0x5e, 0x15, 0xf3, 0x3e, 0x21, 0xe8, + 0x3e, 0x28, 0x3b, 0xc9, 0x55, 0x24, 0x57, 0x93, 0x40, 0x9f, 0x90, 0x27, 0x7f, 0x32, 0xa0, 0x91, + 0xa9, 0x62, 0x74, 0x17, 0x76, 0xf5, 0xdd, 0xdd, 0x79, 0x86, 0xbb, 0xa3, 0xe9, 0x79, 0x17, 0x0f, + 0x26, 0x2f, 0xd4, 0x3d, 0x7e, 0x38, 0x18, 0x4d, 0x27, 0xe2, 0x1e, 0x6f, 0xc2, 0x56, 0x7f, 0x70, + 0x65, 0x3b, 0x0a, 0xb8, 0x54, 0x97, 0xf9, 0xfe, 0xa0, 0x3f, 0xb1, 0xed, 0x51, 0x02, 0x16, 0x11, + 0x82, 0xd6, 0xe4, 0x6c, 0x80, 0x27, 0x2f, 0x12, 0xac, 0x84, 0x6a, 0x50, 0x3a, 0x1b, 0x4f, 0xb1, + 0x59, 0x46, 0x4d, 0xa8, 0x5f, 0x0e, 0x7e, 0xe1, 0x88, 0xd9, 0xa5, 0x59, 0x91, 0x97, 0xfc, 0xe7, + 0xf6, 0xf9, 0x95, 0xad, 0x91, 0x2a, 0xaa, 0x42, 0xf1, 0xcb, 0xee, 0x0b, 0xb3, 0xf6, 0xe4, 0x77, + 0x05, 0xa8, 0x27, 0x45, 0x9a, 0x7f, 0x5d, 0xec, 0x03, 0x3a, 0x1f, 0xf7, 0xba, 0xe7, 0x4e, 0xef, + 0xac, 0x3b, 0x1a, 0xd9, 0xe7, 0xce, 0xf8, 0xc2, 0x1e, 0x99, 0x86, 0x38, 0x06, 0xb6, 0x87, 0xe3, + 0x89, 0x9d, 0x27, 0x0a, 0x68, 0x0f, 0xcc, 0x2c, 0xe2, 0xf4, 0x6d, 0xf1, 0xec, 0xd8, 0x81, 0x66, + 0x8c, 0xf6, 0xce, 0xc7, 0x97, 0xe2, 0xd1, 0x21, 0xdf, 0x2a, 0x3d, 0x7b, 0x70, 0x31, 0x31, 0xcb, + 0x62, 0x72, 0xd1, 0x7d, 0x31, 0xb4, 0x47, 0x13, 0xb3, 0x22, 0xfc, 0x12, 0xab, 0xaa, 0x72, 0xaf, + 0x01, 0xee, 0x89, 0x18, 0x39, 0xb1, 0x6d, 0x4d, 0xd8, 0xf6, 0xc7, 0xf8, 0x79, 0x17, 0x7f, 0x69, + 0xd6, 0xd1, 0x36, 0x34, 0xf4, 0x44, 0x2a, 0x41, 0x6e, 0x4d, 0xbc, 0x65, 0x43, 0x1c, 0x3e, 0x41, + 0x85, 0xdd, 0x16, 0xaa, 0x43, 0xf9, 0xf2, 0xb9, 0x6d, 0x5f, 0x98, 0x4d, 0x19, 0x28, 0x31, 0x94, + 0x4c, 0xab, 0xf3, 0xef, 0x0a, 0x34, 0xfb, 0x2e, 0x73, 0x67, 0xee, 0xed, 0x25, 0x61, 0x37, 0x84, + 0xa1, 0x3f, 0x18, 0xb0, 0xbf, 0xf9, 0x35, 0x84, 0x1e, 0xc7, 0xdf, 0xc5, 0x3b, 0x5f, 0x4b, 0x07, + 0x1f, 0xbd, 0xe3, 0x01, 0x92, 0xdc, 0x44, 0xac, 0xa7, 0xbf, 0xfd, 0xc7, 0x7f, 0xbe, 0x2d, 0x7c, + 0x8a, 0x3e, 0x39, 0xbd, 0x79, 0x7a, 0x7a, 0xad, 0x5c, 0x38, 0xd5, 0xcf, 0xa0, 0xe8, 0xf4, 0xd7, + 0x99, 0x77, 0xcd, 0x89, 0x7a, 0x13, 0xfe, 0x06, 0xfd, 0xd1, 0x80, 0xf6, 0xdb, 0x9e, 0x44, 0xe8, + 0xe3, 0x58, 0xf5, 0x3d, 0x8f, 0xa6, 0x0f, 0x74, 0xaf, 0x23, 0xdd, 0xfb, 0x0c, 0x3d, 0xc9, 0xba, + 0x97, 0x3c, 0x88, 0x36, 0xfb, 0x47, 0xd7, 0xef, 0xcd, 0x87, 0x9b, 0x6f, 0xda, 0xda, 0x91, 0x07, + 0x6f, 0x61, 0xb5, 0x07, 0xf7, 0xa5, 0x07, 0x77, 0xd0, 0x6e, 0xd6, 0x03, 0xa6, 0x4c, 0x51, 0x08, + 0xdb, 0x6b, 0x57, 0x3c, 0xf4, 0x70, 0xf3, 0x05, 0x2e, 0x39, 0xf7, 0xa3, 0xb7, 0xf2, 0x5a, 0xf0, + 0x50, 0x0a, 0xee, 0xa3, 0xbd, 0xac, 0x60, 0x7c, 0x4b, 0x44, 0x5f, 0xaf, 0xfd, 0x1e, 0xdf, 0xdf, + 0x78, 0x23, 0xd0, 0x5a, 0x87, 0x9b, 0x49, 0x2d, 0x74, 0x24, 0x85, 0x0e, 0x50, 0x3b, 0x2b, 0x44, + 0xb4, 0xa5, 0xb8, 0x52, 0x20, 0x0f, 0x20, 0x6d, 0xd4, 0xe8, 0x5e, 0xbc, 0xdb, 0x1b, 0x3f, 0xd7, + 0x07, 0x07, 0x9b, 0x28, 0x2d, 0xf3, 0x50, 0xca, 0xb4, 0xd1, 0x7e, 0x56, 0xc6, 0x0f, 0xc4, 0xdb, + 0x52, 0x6e, 0x3b, 0x87, 0x46, 0xa6, 0x19, 0xa3, 0x83, 0xb5, 0xba, 0xc8, 0xca, 0xdc, 0xdf, 0xc8, + 0x69, 0x9d, 0x47, 0x52, 0xe7, 0x1e, 0xba, 0x9b, 0xd5, 0x91, 0x3d, 0x51, 0x09, 0xbd, 0xac, 0xc8, + 0xbf, 0x58, 0x7e, 0xf0, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf0, 0x63, 0x27, 0xf9, 0x95, 0x11, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/frdrpc/rpc.proto b/frdrpc/rpc.proto index 345d2e8..20917d0 100644 --- a/frdrpc/rpc.proto +++ b/frdrpc/rpc.proto @@ -400,6 +400,9 @@ message NodeReportRequest { will display as 0. */ bool disable_fiat = 4; + + // The level of granularity at which we wish to produce fiat prices. + Granularity granularity = 5; } enum EntryType { diff --git a/frdrpc/rpc.swagger.json b/frdrpc/rpc.swagger.json index b0627d7..c14376f 100644 --- a/frdrpc/rpc.swagger.json +++ b/frdrpc/rpc.swagger.json @@ -168,6 +168,25 @@ "required": false, "type": "boolean", "format": "boolean" + }, + { + "name": "granularity", + "description": "The level of granularity at which we wish to produce fiat prices.", + "in": "query", + "required": false, + "type": "string", + "enum": [ + "UNKNOWN_GRANULARITY", + "MINUTE", + "FIVE_MINUTES", + "FIFTEEN_MINUTES", + "THIRTY_MINUTES", + "HOUR", + "SIX_HOURS", + "TWELVE_HOURS", + "DAY" + ], + "default": "UNKNOWN_GRANULARITY" } ], "tags": [