mnd/payouts: undistributed payouts added
Change-Id: Id61ac58fceca13b9a9e12a7e03c3d9624cce3fea
This commit is contained in:
Qweder93
parent
2896a2736c
commit
f0dd7f3739
@ -1355,6 +1355,82 @@ func (m *EarnedSatellite) GetTotal() int64 {
|
||||
return 0
|
||||
}
|
||||
|
||||
type UndistributedRequest struct {
|
||||
Header *RequestHeader `protobuf:"bytes,1,opt,name=header,proto3" json:"header,omitempty"`
|
||||
XXX_NoUnkeyedLiteral struct{} `json:"-"`
|
||||
XXX_unrecognized []byte `json:"-"`
|
||||
XXX_sizecache int32 `json:"-"`
|
||||
}
|
||||
|
||||
func (m *UndistributedRequest) Reset() { *m = UndistributedRequest{} }
|
||||
func (m *UndistributedRequest) String() string { return proto.CompactTextString(m) }
|
||||
func (*UndistributedRequest) ProtoMessage() {}
|
||||
func (*UndistributedRequest) Descriptor() ([]byte, []int) {
|
||||
return fileDescriptor_9a45fd79b06f3a1b, []int{30}
|
||||
}
|
||||
func (m *UndistributedRequest) XXX_Unmarshal(b []byte) error {
|
||||
return xxx_messageInfo_UndistributedRequest.Unmarshal(m, b)
|
||||
}
|
||||
func (m *UndistributedRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
|
||||
return xxx_messageInfo_UndistributedRequest.Marshal(b, m, deterministic)
|
||||
}
|
||||
func (m *UndistributedRequest) XXX_Merge(src proto.Message) {
|
||||
xxx_messageInfo_UndistributedRequest.Merge(m, src)
|
||||
}
|
||||
func (m *UndistributedRequest) XXX_Size() int {
|
||||
return xxx_messageInfo_UndistributedRequest.Size(m)
|
||||
}
|
||||
func (m *UndistributedRequest) XXX_DiscardUnknown() {
|
||||
xxx_messageInfo_UndistributedRequest.DiscardUnknown(m)
|
||||
}
|
||||
|
||||
var xxx_messageInfo_UndistributedRequest proto.InternalMessageInfo
|
||||
|
||||
func (m *UndistributedRequest) GetHeader() *RequestHeader {
|
||||
if m != nil {
|
||||
return m.Header
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
type UndistributedResponse struct {
|
||||
Total int64 `protobuf:"varint,1,opt,name=total,proto3" json:"total,omitempty"`
|
||||
XXX_NoUnkeyedLiteral struct{} `json:"-"`
|
||||
XXX_unrecognized []byte `json:"-"`
|
||||
XXX_sizecache int32 `json:"-"`
|
||||
}
|
||||
|
||||
func (m *UndistributedResponse) Reset() { *m = UndistributedResponse{} }
|
||||
func (m *UndistributedResponse) String() string { return proto.CompactTextString(m) }
|
||||
func (*UndistributedResponse) ProtoMessage() {}
|
||||
func (*UndistributedResponse) Descriptor() ([]byte, []int) {
|
||||
return fileDescriptor_9a45fd79b06f3a1b, []int{31}
|
||||
}
|
||||
func (m *UndistributedResponse) XXX_Unmarshal(b []byte) error {
|
||||
return xxx_messageInfo_UndistributedResponse.Unmarshal(m, b)
|
||||
}
|
||||
func (m *UndistributedResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
|
||||
return xxx_messageInfo_UndistributedResponse.Marshal(b, m, deterministic)
|
||||
}
|
||||
func (m *UndistributedResponse) XXX_Merge(src proto.Message) {
|
||||
xxx_messageInfo_UndistributedResponse.Merge(m, src)
|
||||
}
|
||||
func (m *UndistributedResponse) XXX_Size() int {
|
||||
return xxx_messageInfo_UndistributedResponse.Size(m)
|
||||
}
|
||||
func (m *UndistributedResponse) XXX_DiscardUnknown() {
|
||||
xxx_messageInfo_UndistributedResponse.DiscardUnknown(m)
|
||||
}
|
||||
|
||||
var xxx_messageInfo_UndistributedResponse proto.InternalMessageInfo
|
||||
|
||||
func (m *UndistributedResponse) GetTotal() int64 {
|
||||
if m != nil {
|
||||
return m.Total
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
type PayoutInfo struct {
|
||||
Held int64 `protobuf:"varint,1,opt,name=held,proto3" json:"held,omitempty"`
|
||||
Paid int64 `protobuf:"varint,2,opt,name=paid,proto3" json:"paid,omitempty"`
|
||||
@ -1367,7 +1443,7 @@ func (m *PayoutInfo) Reset() { *m = PayoutInfo{} }
|
||||
func (m *PayoutInfo) String() string { return proto.CompactTextString(m) }
|
||||
func (*PayoutInfo) ProtoMessage() {}
|
||||
func (*PayoutInfo) Descriptor() ([]byte, []int) {
|
||||
return fileDescriptor_9a45fd79b06f3a1b, []int{30}
|
||||
return fileDescriptor_9a45fd79b06f3a1b, []int{32}
|
||||
}
|
||||
func (m *PayoutInfo) XXX_Unmarshal(b []byte) error {
|
||||
return xxx_messageInfo_PayoutInfo.Unmarshal(m, b)
|
||||
@ -1435,86 +1511,91 @@ func init() {
|
||||
proto.RegisterType((*EarnedPerSatelliteRequest)(nil), "multinode.EarnedPerSatelliteRequest")
|
||||
proto.RegisterType((*EarnedPerSatelliteResponse)(nil), "multinode.EarnedPerSatelliteResponse")
|
||||
proto.RegisterType((*EarnedSatellite)(nil), "multinode.EarnedSatellite")
|
||||
proto.RegisterType((*UndistributedRequest)(nil), "multinode.UndistributedRequest")
|
||||
proto.RegisterType((*UndistributedResponse)(nil), "multinode.UndistributedResponse")
|
||||
proto.RegisterType((*PayoutInfo)(nil), "multinode.PayoutInfo")
|
||||
}
|
||||
|
||||
func init() { proto.RegisterFile("multinode.proto", fileDescriptor_9a45fd79b06f3a1b) }
|
||||
|
||||
var fileDescriptor_9a45fd79b06f3a1b = []byte{
|
||||
// 1199 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0xdd, 0x72, 0xdb, 0x44,
|
||||
0x14, 0x46, 0x4d, 0x22, 0xd7, 0xc7, 0x69, 0x7e, 0x96, 0xd0, 0x2a, 0xaa, 0x13, 0x07, 0x25, 0x34,
|
||||
0x29, 0x6d, 0x1d, 0x70, 0x19, 0x66, 0x98, 0x81, 0x19, 0x12, 0x92, 0xd2, 0x0c, 0x09, 0x4d, 0x95,
|
||||
0xd0, 0x61, 0x0a, 0x53, 0xcf, 0xc6, 0xda, 0x38, 0xa2, 0xb2, 0x56, 0x68, 0xd7, 0x81, 0xdc, 0x70,
|
||||
0xc9, 0x35, 0x0f, 0xc0, 0x83, 0x70, 0xc7, 0x70, 0xc3, 0xf0, 0x0c, 0x5c, 0x94, 0xc7, 0xe0, 0x96,
|
||||
0xd9, 0x1f, 0xcb, 0xb2, 0x2d, 0x2b, 0xc1, 0x66, 0xb8, 0xdb, 0x3d, 0x3f, 0xdf, 0x39, 0xbb, 0xe7,
|
||||
0xe8, 0xec, 0x27, 0x98, 0x6d, 0xb5, 0x03, 0xee, 0x87, 0xd4, 0x23, 0xd5, 0x28, 0xa6, 0x9c, 0xa2,
|
||||
0x62, 0x22, 0xb0, 0xa1, 0x49, 0x9b, 0x54, 0x89, 0xed, 0x4a, 0x93, 0xd2, 0x66, 0x40, 0x36, 0xe5,
|
||||
0xee, 0xa4, 0x7d, 0xba, 0xc9, 0xfd, 0x16, 0x61, 0x1c, 0xb7, 0x22, 0x65, 0xe0, 0x6c, 0xc0, 0x0d,
|
||||
0x97, 0x7c, 0xdb, 0x26, 0x8c, 0x3f, 0x26, 0xd8, 0x23, 0x31, 0xba, 0x05, 0x05, 0x1c, 0xf9, 0xf5,
|
||||
0x97, 0xe4, 0xc2, 0x32, 0x56, 0x8c, 0x8d, 0x69, 0xd7, 0xc4, 0x91, 0xff, 0x19, 0xb9, 0x70, 0x76,
|
||||
0x60, 0x6e, 0xc7, 0x67, 0x2f, 0x8f, 0x22, 0xdc, 0x20, 0xda, 0x05, 0xbd, 0x03, 0xe6, 0x99, 0x74,
|
||||
0x93, 0xb6, 0xa5, 0x9a, 0x55, 0xed, 0xe6, 0xd5, 0x03, 0xeb, 0x6a, 0x3b, 0xe7, 0x57, 0x03, 0xe6,
|
||||
0x53, 0x30, 0x2c, 0xa2, 0x21, 0x23, 0xa8, 0x0c, 0x45, 0x1c, 0x04, 0xb4, 0x81, 0x39, 0xf1, 0x24,
|
||||
0xd4, 0x84, 0xdb, 0x15, 0xa0, 0x0a, 0x94, 0xda, 0x8c, 0x78, 0xf5, 0xc8, 0x27, 0x0d, 0xc2, 0xac,
|
||||
0x6b, 0x52, 0x0f, 0x42, 0x74, 0x28, 0x25, 0x68, 0x09, 0xe4, 0xae, 0xce, 0x63, 0xcc, 0xce, 0xac,
|
||||
0x09, 0xe5, 0x2f, 0x24, 0xc7, 0x42, 0x80, 0x10, 0x4c, 0x9e, 0xc6, 0x84, 0x58, 0x93, 0x52, 0x21,
|
||||
0xd7, 0x32, 0xe2, 0x39, 0xf6, 0x03, 0x7c, 0x12, 0x10, 0x6b, 0x4a, 0x47, 0xec, 0x08, 0x90, 0x0d,
|
||||
0xd7, 0xe9, 0x39, 0x89, 0x05, 0x84, 0x65, 0x4a, 0x65, 0xb2, 0x77, 0x0e, 0xa1, 0xbc, 0x8d, 0x43,
|
||||
0xef, 0x3b, 0xdf, 0xe3, 0x67, 0x07, 0x34, 0xe4, 0x67, 0x47, 0xed, 0x56, 0x0b, 0xc7, 0x17, 0xa3,
|
||||
0xdf, 0xc9, 0x43, 0x58, 0x1a, 0x82, 0xa8, 0xaf, 0x07, 0xc1, 0xa4, 0x4c, 0x45, 0xdd, 0x8c, 0x5c,
|
||||
0x3b, 0xdb, 0x30, 0xf3, 0x8c, 0xc4, 0xcc, 0xa7, 0xe1, 0xe8, 0x81, 0xef, 0xc1, 0x6c, 0x82, 0xa1,
|
||||
0x43, 0x59, 0x50, 0x38, 0x57, 0x22, 0x89, 0x52, 0x74, 0x3b, 0x5b, 0xe7, 0x11, 0xa0, 0x7d, 0xcc,
|
||||
0xf8, 0x27, 0x34, 0xe4, 0xb8, 0xc1, 0x47, 0x0f, 0xfa, 0x02, 0x5e, 0xef, 0xc1, 0xd1, 0x81, 0x3f,
|
||||
0x85, 0xe9, 0x00, 0x33, 0x5e, 0x6f, 0x28, 0xb9, 0x86, 0xb3, 0xab, 0xaa, 0x81, 0xab, 0x9d, 0x06,
|
||||
0xae, 0x1e, 0x77, 0x1a, 0x78, 0xfb, 0xfa, 0x1f, 0xaf, 0x2a, 0xaf, 0xfd, 0xf4, 0x57, 0xc5, 0x70,
|
||||
0x4b, 0x41, 0x17, 0xd0, 0xf9, 0x1e, 0xe6, 0x5d, 0x12, 0xb5, 0x39, 0xe6, 0xe3, 0xdc, 0x0d, 0x7a,
|
||||
0x17, 0xa6, 0x19, 0xe6, 0x24, 0x08, 0x7c, 0x4e, 0xea, 0xbe, 0x27, 0xbb, 0x6e, 0x7a, 0x7b, 0x46,
|
||||
0xc4, 0xfc, 0xf3, 0x55, 0xc5, 0xfc, 0x9c, 0x7a, 0x64, 0x6f, 0xc7, 0x2d, 0x25, 0x36, 0x7b, 0x9e,
|
||||
0xf3, 0xb7, 0x01, 0x28, 0x1d, 0x5a, 0x9f, 0xec, 0x43, 0x30, 0x69, 0x18, 0xf8, 0x21, 0xd1, 0xb1,
|
||||
0xd7, 0x7a, 0x62, 0xf7, 0x9b, 0x57, 0x9f, 0x48, 0x5b, 0x57, 0xfb, 0xa0, 0x0f, 0x60, 0x0a, 0xb7,
|
||||
0x3d, 0x9f, 0xcb, 0x04, 0x4a, 0xb5, 0xd5, 0x7c, 0xe7, 0x2d, 0x61, 0xea, 0x2a, 0x0f, 0x7b, 0x19,
|
||||
0x4c, 0x05, 0x86, 0x16, 0x60, 0x8a, 0x35, 0x68, 0xac, 0x32, 0x30, 0x5c, 0xb5, 0xb1, 0x1f, 0xc3,
|
||||
0x94, 0xb4, 0xcf, 0x56, 0xa3, 0xbb, 0x30, 0xc7, 0xda, 0x2c, 0x22, 0xa1, 0x28, 0x7f, 0x5d, 0x19,
|
||||
0x5c, 0x93, 0x06, 0xb3, 0x5d, 0xf9, 0x91, 0x10, 0x3b, 0xfb, 0x60, 0x1d, 0xc7, 0x6d, 0xc6, 0x89,
|
||||
0x77, 0xd4, 0xb9, 0x0f, 0x36, 0x7a, 0x87, 0xfc, 0x6e, 0xc0, 0x62, 0x06, 0x9c, 0xbe, 0xce, 0xaf,
|
||||
0x00, 0x71, 0xa5, 0xac, 0x27, 0x97, 0xcf, 0x2c, 0x63, 0x65, 0x62, 0xa3, 0x54, 0xbb, 0x9f, 0xc2,
|
||||
0x1e, 0x8a, 0x50, 0x15, 0xb5, 0xfb, 0xc2, 0xdd, 0x77, 0xe7, 0x79, 0xbf, 0x89, 0xbd, 0x0f, 0x05,
|
||||
0xad, 0x45, 0xeb, 0x50, 0x10, 0x38, 0xa2, 0xf6, 0x46, 0x66, 0xed, 0x4d, 0xa1, 0xde, 0xf3, 0xc4,
|
||||
0x27, 0x83, 0x3d, 0x2f, 0x26, 0x4c, 0x8d, 0xa6, 0xa2, 0xdb, 0xd9, 0x3a, 0x3f, 0x1a, 0x50, 0xd9,
|
||||
0x65, 0xdc, 0x6f, 0x89, 0x31, 0x76, 0x88, 0x2f, 0x68, 0x9b, 0x27, 0xb1, 0xfe, 0xd7, 0xce, 0x7c,
|
||||
0x0a, 0x2b, 0xc3, 0xf3, 0xd0, 0xf7, 0xfa, 0x00, 0x10, 0xe9, 0xd8, 0xd4, 0x09, 0x8e, 0x43, 0x3f,
|
||||
0x6c, 0x32, 0x3d, 0x72, 0xe6, 0x13, 0xcd, 0xae, 0x56, 0x38, 0x4f, 0xe0, 0x76, 0x1f, 0xe4, 0x31,
|
||||
0xe5, 0x38, 0x18, 0xbd, 0xea, 0x07, 0x50, 0xce, 0x06, 0x1c, 0x39, 0xbf, 0xad, 0x20, 0xe8, 0x96,
|
||||
0x76, 0xec, 0x29, 0xfd, 0x0c, 0xca, 0xd9, 0x80, 0x3a, 0xbf, 0xf7, 0xa1, 0x14, 0xc9, 0xb4, 0xeb,
|
||||
0x7e, 0x78, 0x4a, 0x35, 0xec, 0x1b, 0x29, 0x58, 0x75, 0xa8, 0xbd, 0xf0, 0x94, 0xba, 0x10, 0x25,
|
||||
0x6b, 0xa7, 0x05, 0x6f, 0xf6, 0xe0, 0x1e, 0x92, 0xd8, 0xa7, 0xde, 0xb8, 0xe9, 0xa2, 0x9b, 0x60,
|
||||
0x46, 0x12, 0x49, 0x37, 0xa5, 0xde, 0x39, 0x5f, 0x83, 0x93, 0x17, 0x6e, 0xcc, 0xc3, 0xfc, 0x00,
|
||||
0xb7, 0x12, 0xe8, 0xb1, 0x8f, 0x30, 0x42, 0xa3, 0xbb, 0x60, 0x0d, 0xc6, 0x1f, 0xf3, 0x4c, 0x3f,
|
||||
0x1b, 0xb0, 0x94, 0x80, 0xfe, 0x47, 0xd5, 0xf9, 0xf7, 0x47, 0x4b, 0x15, 0x74, 0xa2, 0xa7, 0xa0,
|
||||
0x5f, 0xc2, 0xf2, 0xb0, 0xec, 0xc6, 0x3c, 0xf8, 0x16, 0xdc, 0x10, 0x9f, 0x13, 0xf1, 0x46, 0xff,
|
||||
0x68, 0xee, 0xc0, 0x4c, 0x07, 0x42, 0x27, 0xb3, 0x00, 0x53, 0x5c, 0x7c, 0xd7, 0xfa, 0xcb, 0x55,
|
||||
0x1b, 0xe7, 0x00, 0x16, 0x95, 0xdd, 0x21, 0x89, 0xc7, 0x1f, 0x91, 0x4e, 0x03, 0xec, 0x2c, 0x38,
|
||||
0x9d, 0xc2, 0x2e, 0xcc, 0x11, 0xa9, 0xed, 0x3e, 0x20, 0xfa, 0xfd, 0xb0, 0x53, 0xc8, 0x0a, 0xa0,
|
||||
0xeb, 0x3d, 0x4b, 0x7a, 0x05, 0xce, 0x73, 0x98, 0xed, 0xb3, 0xc9, 0x3e, 0xdc, 0x28, 0x7d, 0xfc,
|
||||
0x1e, 0x40, 0xb7, 0x28, 0x82, 0xff, 0x9d, 0x91, 0x20, 0xe1, 0x7f, 0x62, 0x2d, 0x64, 0x11, 0xd6,
|
||||
0x60, 0x13, 0xae, 0x5c, 0xd7, 0x9e, 0x42, 0xe1, 0x88, 0xd3, 0x18, 0x37, 0x09, 0x7a, 0x04, 0xc5,
|
||||
0x84, 0x66, 0xa3, 0xdb, 0xa9, 0x63, 0xf5, 0x73, 0x78, 0xbb, 0x9c, 0xad, 0x54, 0x77, 0x55, 0x0b,
|
||||
0xa1, 0x98, 0x70, 0x53, 0x84, 0x61, 0x3a, 0xcd, 0x4f, 0xd1, 0x7a, 0xca, 0x35, 0x8f, 0x13, 0xdb,
|
||||
0x1b, 0x97, 0x1b, 0xea, 0x78, 0xbf, 0x5d, 0x83, 0x49, 0x71, 0x21, 0xe8, 0x63, 0x28, 0x68, 0x6e,
|
||||
0x8a, 0x16, 0x53, 0xde, 0xbd, 0x9c, 0xd7, 0xb6, 0xb3, 0x54, 0xba, 0xcc, 0xfb, 0x50, 0x4a, 0x11,
|
||||
0x4d, 0xb4, 0x94, 0x32, 0x1d, 0x24, 0xb2, 0xf6, 0xf2, 0x30, 0xb5, 0x46, 0xdb, 0x03, 0xe8, 0xf2,
|
||||
0x2d, 0x54, 0x1e, 0x42, 0xc3, 0x14, 0xd6, 0x52, 0x2e, 0x49, 0x43, 0x2f, 0x60, 0x7e, 0x80, 0x9c,
|
||||
0xa0, 0xd5, 0x7c, 0xea, 0xa2, 0x80, 0xd7, 0xae, 0xc2, 0x6f, 0x6a, 0xbf, 0x98, 0x60, 0xaa, 0xee,
|
||||
0x41, 0x4d, 0x58, 0xc8, 0x7a, 0xb4, 0xd0, 0x9d, 0x14, 0x50, 0xce, 0x33, 0x69, 0xaf, 0x5f, 0x6a,
|
||||
0xa7, 0xcf, 0x74, 0x01, 0xf6, 0xf0, 0x67, 0x05, 0xdd, 0x1f, 0x06, 0x93, 0x35, 0x4e, 0xed, 0x07,
|
||||
0x57, 0xb4, 0x4e, 0x08, 0xe1, 0x5c, 0xff, 0xcc, 0x47, 0x4e, 0x0a, 0x62, 0xc8, 0x83, 0x64, 0xaf,
|
||||
0xe6, 0xda, 0x68, 0xf0, 0x16, 0xdc, 0xcc, 0x9e, 0xae, 0x68, 0x23, 0xcb, 0x3d, 0xf3, 0x3c, 0x77,
|
||||
0xaf, 0x60, 0xa9, 0xc3, 0x7d, 0x04, 0xa6, 0x9a, 0x29, 0xc8, 0x1a, 0x18, 0x45, 0x1d, 0xb8, 0xc5,
|
||||
0x0c, 0x8d, 0x76, 0xc7, 0x80, 0x06, 0xe7, 0x1e, 0x5a, 0x1b, 0x70, 0xc8, 0x98, 0xb2, 0xf6, 0x5b,
|
||||
0x97, 0x58, 0xe9, 0x10, 0x0c, 0xac, 0x61, 0x54, 0x12, 0xbd, 0x9d, 0x86, 0xc8, 0xe7, 0xbd, 0xf6,
|
||||
0xbd, 0x2b, 0xd9, 0xea, 0xa0, 0x4d, 0x58, 0xc8, 0xe2, 0x86, 0x3d, 0x6d, 0x9c, 0xc3, 0x46, 0x7b,
|
||||
0xda, 0x38, 0x8f, 0x64, 0x6e, 0xaf, 0x3d, 0x77, 0x18, 0xa7, 0xf1, 0x37, 0x55, 0x9f, 0x6e, 0xca,
|
||||
0xc5, 0x66, 0x14, 0xfb, 0xe7, 0x98, 0x93, 0xcd, 0x04, 0x20, 0x3a, 0x39, 0x31, 0xe5, 0xdf, 0xe8,
|
||||
0xc3, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x44, 0x72, 0xb4, 0x3b, 0x86, 0x11, 0x00, 0x00,
|
||||
// 1237 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x5f, 0x73, 0xdb, 0x44,
|
||||
0x10, 0xc7, 0x4d, 0x22, 0xd7, 0xeb, 0xfc, 0x3d, 0xd2, 0x56, 0x51, 0x9d, 0x38, 0x28, 0xa1, 0x49,
|
||||
0x69, 0xe3, 0x80, 0xcb, 0x30, 0xc3, 0x0c, 0xcc, 0x90, 0x90, 0x94, 0x64, 0x48, 0x68, 0xaa, 0xa4,
|
||||
0x1d, 0xa6, 0x30, 0xf5, 0x5c, 0xac, 0x8b, 0x23, 0x2a, 0xeb, 0x84, 0xee, 0x14, 0xc8, 0x0b, 0x8f,
|
||||
0x3c, 0xf1, 0xc0, 0x07, 0xe0, 0xbb, 0x30, 0xbc, 0x30, 0x7c, 0x06, 0x1e, 0xca, 0xc7, 0xe0, 0x95,
|
||||
0xd1, 0xdd, 0x59, 0x96, 0x6d, 0x49, 0x09, 0x36, 0xc3, 0xdb, 0xdd, 0xee, 0x6f, 0x7f, 0xbb, 0x77,
|
||||
0xbb, 0xda, 0x5b, 0xc1, 0x4c, 0x3b, 0x74, 0xb9, 0xe3, 0x51, 0x9b, 0xd4, 0xfc, 0x80, 0x72, 0x8a,
|
||||
0x4a, 0xb1, 0xc0, 0x80, 0x16, 0x6d, 0x51, 0x29, 0x36, 0xaa, 0x2d, 0x4a, 0x5b, 0x2e, 0xd9, 0x14,
|
||||
0xbb, 0xd3, 0xf0, 0x6c, 0x93, 0x3b, 0x6d, 0xc2, 0x38, 0x6e, 0xfb, 0x12, 0x60, 0xae, 0xc3, 0x94,
|
||||
0x45, 0xbe, 0x0d, 0x09, 0xe3, 0x7b, 0x04, 0xdb, 0x24, 0x40, 0x77, 0xa0, 0x88, 0x7d, 0xa7, 0xf1,
|
||||
0x8a, 0x5c, 0xea, 0x85, 0xe5, 0xc2, 0xfa, 0xa4, 0xa5, 0x61, 0xdf, 0xf9, 0x9c, 0x5c, 0x9a, 0x3b,
|
||||
0x30, 0xbb, 0xe3, 0xb0, 0x57, 0xc7, 0x3e, 0x6e, 0x12, 0x65, 0x82, 0xde, 0x05, 0xed, 0x5c, 0x98,
|
||||
0x09, 0x6c, 0xb9, 0xae, 0xd7, 0xba, 0x71, 0xf5, 0xd0, 0x5a, 0x0a, 0x67, 0xfe, 0x5a, 0x80, 0xb9,
|
||||
0x04, 0x0d, 0xf3, 0xa9, 0xc7, 0x08, 0xaa, 0x40, 0x09, 0xbb, 0x2e, 0x6d, 0x62, 0x4e, 0x6c, 0x41,
|
||||
0x35, 0x66, 0x75, 0x05, 0xa8, 0x0a, 0xe5, 0x90, 0x11, 0xbb, 0xe1, 0x3b, 0xa4, 0x49, 0x98, 0x7e,
|
||||
0x43, 0xe8, 0x21, 0x12, 0x1d, 0x09, 0x09, 0x5a, 0x04, 0xb1, 0x6b, 0xf0, 0x00, 0xb3, 0x73, 0x7d,
|
||||
0x4c, 0xda, 0x47, 0x92, 0x93, 0x48, 0x80, 0x10, 0x8c, 0x9f, 0x05, 0x84, 0xe8, 0xe3, 0x42, 0x21,
|
||||
0xd6, 0xc2, 0xe3, 0x05, 0x76, 0x5c, 0x7c, 0xea, 0x12, 0x7d, 0x42, 0x79, 0xec, 0x08, 0x90, 0x01,
|
||||
0x37, 0xe9, 0x05, 0x09, 0x22, 0x0a, 0x5d, 0x13, 0xca, 0x78, 0x6f, 0x1e, 0x41, 0x65, 0x1b, 0x7b,
|
||||
0xf6, 0x77, 0x8e, 0xcd, 0xcf, 0x0f, 0xa9, 0xc7, 0xcf, 0x8f, 0xc3, 0x76, 0x1b, 0x07, 0x97, 0xc3,
|
||||
0xdf, 0xc9, 0x23, 0x58, 0xcc, 0x60, 0x54, 0xd7, 0x83, 0x60, 0x5c, 0x84, 0x22, 0x6f, 0x46, 0xac,
|
||||
0xcd, 0x6d, 0x98, 0x7e, 0x4e, 0x02, 0xe6, 0x50, 0x6f, 0x78, 0xc7, 0x0f, 0x60, 0x26, 0xe6, 0x50,
|
||||
0xae, 0x74, 0x28, 0x5e, 0x48, 0x91, 0x60, 0x29, 0x59, 0x9d, 0xad, 0xf9, 0x18, 0xd0, 0x01, 0x66,
|
||||
0xfc, 0x53, 0xea, 0x71, 0xdc, 0xe4, 0xc3, 0x3b, 0x7d, 0x09, 0x6f, 0xf6, 0xf0, 0x28, 0xc7, 0x9f,
|
||||
0xc1, 0xa4, 0x8b, 0x19, 0x6f, 0x34, 0xa5, 0x5c, 0xd1, 0x19, 0x35, 0x59, 0xc0, 0xb5, 0x4e, 0x01,
|
||||
0xd7, 0x4e, 0x3a, 0x05, 0xbc, 0x7d, 0xf3, 0x8f, 0xd7, 0xd5, 0x37, 0x7e, 0xfe, 0xab, 0x5a, 0xb0,
|
||||
0xca, 0x6e, 0x97, 0xd0, 0xfc, 0x1e, 0xe6, 0x2c, 0xe2, 0x87, 0x1c, 0xf3, 0x51, 0xee, 0x06, 0xbd,
|
||||
0x07, 0x93, 0x0c, 0x73, 0xe2, 0xba, 0x0e, 0x27, 0x0d, 0xc7, 0x16, 0x55, 0x37, 0xb9, 0x3d, 0x1d,
|
||||
0xf9, 0xfc, 0xf3, 0x75, 0x55, 0xfb, 0x82, 0xda, 0x64, 0x7f, 0xc7, 0x2a, 0xc7, 0x98, 0x7d, 0xdb,
|
||||
0xfc, 0xbb, 0x00, 0x28, 0xe9, 0x5a, 0x9d, 0xec, 0x23, 0xd0, 0xa8, 0xe7, 0x3a, 0x1e, 0x51, 0xbe,
|
||||
0x57, 0x7b, 0x7c, 0xf7, 0xc3, 0x6b, 0x4f, 0x04, 0xd6, 0x52, 0x36, 0xe8, 0x43, 0x98, 0xc0, 0xa1,
|
||||
0xed, 0x70, 0x11, 0x40, 0xb9, 0xbe, 0x92, 0x6f, 0xbc, 0x15, 0x41, 0x2d, 0x69, 0x61, 0x2c, 0x81,
|
||||
0x26, 0xc9, 0xd0, 0x3c, 0x4c, 0xb0, 0x26, 0x0d, 0x64, 0x04, 0x05, 0x4b, 0x6e, 0x8c, 0x3d, 0x98,
|
||||
0x10, 0xf8, 0x74, 0x35, 0xba, 0x0f, 0xb3, 0x2c, 0x64, 0x3e, 0xf1, 0xa2, 0xf4, 0x37, 0x24, 0xe0,
|
||||
0x86, 0x00, 0xcc, 0x74, 0xe5, 0xc7, 0x91, 0xd8, 0x3c, 0x00, 0xfd, 0x24, 0x08, 0x19, 0x27, 0xf6,
|
||||
0x71, 0xe7, 0x3e, 0xd8, 0xf0, 0x15, 0xf2, 0x7b, 0x01, 0x16, 0x52, 0xe8, 0xd4, 0x75, 0x7e, 0x05,
|
||||
0x88, 0x4b, 0x65, 0x23, 0xbe, 0x7c, 0xa6, 0x17, 0x96, 0xc7, 0xd6, 0xcb, 0xf5, 0x87, 0x09, 0xee,
|
||||
0x4c, 0x86, 0x5a, 0x94, 0xbb, 0x67, 0xd6, 0x81, 0x35, 0xc7, 0xfb, 0x21, 0xc6, 0x01, 0x14, 0x95,
|
||||
0x16, 0xad, 0x41, 0x31, 0xe2, 0x89, 0x72, 0x5f, 0x48, 0xcd, 0xbd, 0x16, 0xa9, 0xf7, 0xed, 0xe8,
|
||||
0x93, 0xc1, 0xb6, 0x1d, 0x10, 0x26, 0x5b, 0x53, 0xc9, 0xea, 0x6c, 0xcd, 0x1f, 0x0b, 0x50, 0xdd,
|
||||
0x65, 0xdc, 0x69, 0x47, 0x6d, 0xec, 0x08, 0x5f, 0xd2, 0x90, 0xc7, 0xbe, 0xfe, 0xd7, 0xca, 0x7c,
|
||||
0x0a, 0xcb, 0xd9, 0x71, 0xa8, 0x7b, 0xdd, 0x00, 0x44, 0x3a, 0x98, 0x06, 0xc1, 0x81, 0xe7, 0x78,
|
||||
0x2d, 0xa6, 0x5a, 0xce, 0x5c, 0xac, 0xd9, 0x55, 0x0a, 0xf3, 0x09, 0xdc, 0xed, 0xa3, 0x3c, 0xa1,
|
||||
0x1c, 0xbb, 0xc3, 0x67, 0xfd, 0x10, 0x2a, 0xe9, 0x84, 0x43, 0xc7, 0xb7, 0xe5, 0xba, 0xdd, 0xd4,
|
||||
0x8e, 0xdc, 0xa5, 0x9f, 0x43, 0x25, 0x9d, 0x50, 0xc5, 0xf7, 0x01, 0x94, 0x7d, 0x11, 0x76, 0xc3,
|
||||
0xf1, 0xce, 0xa8, 0xa2, 0xbd, 0x95, 0xa0, 0x95, 0x87, 0xda, 0xf7, 0xce, 0xa8, 0x05, 0x7e, 0xbc,
|
||||
0x36, 0xdb, 0xf0, 0x56, 0x0f, 0xef, 0x11, 0x09, 0x1c, 0x6a, 0x8f, 0x1a, 0x2e, 0xba, 0x0d, 0x9a,
|
||||
0x2f, 0x98, 0x54, 0x51, 0xaa, 0x9d, 0xf9, 0x35, 0x98, 0x79, 0xee, 0x46, 0x3c, 0xcc, 0x0f, 0x70,
|
||||
0x27, 0xa6, 0x1e, 0xf9, 0x08, 0x43, 0x14, 0xba, 0x05, 0xfa, 0xa0, 0xff, 0x11, 0xcf, 0xf4, 0x4b,
|
||||
0x01, 0x16, 0x63, 0xd2, 0xff, 0x28, 0x3b, 0xff, 0xfe, 0x68, 0x89, 0x84, 0x8e, 0xf5, 0x24, 0xf4,
|
||||
0x4b, 0x58, 0xca, 0x8a, 0x6e, 0xc4, 0x83, 0x6f, 0xc1, 0x54, 0xf4, 0x39, 0x11, 0x7b, 0xf8, 0x8f,
|
||||
0xe6, 0x1e, 0x4c, 0x77, 0x28, 0x54, 0x30, 0xf3, 0x30, 0xc1, 0xa3, 0xef, 0x5a, 0x7d, 0xb9, 0x72,
|
||||
0x63, 0x1e, 0xc2, 0x82, 0xc4, 0x1d, 0x91, 0x60, 0xf4, 0x16, 0x69, 0x36, 0xc1, 0x48, 0xa3, 0x53,
|
||||
0x21, 0xec, 0xc2, 0x2c, 0x11, 0xda, 0xee, 0x03, 0xa2, 0xde, 0x0f, 0x23, 0xc1, 0x2c, 0x09, 0xba,
|
||||
0xd6, 0x33, 0xa4, 0x57, 0x60, 0xbe, 0x80, 0x99, 0x3e, 0x4c, 0xfa, 0xe1, 0x86, 0xa9, 0xe3, 0x3d,
|
||||
0x98, 0x7f, 0xe6, 0xd9, 0x0e, 0xe3, 0x81, 0x73, 0x1a, 0xf2, 0x51, 0x32, 0xb0, 0x01, 0xb7, 0xfa,
|
||||
0x98, 0x72, 0x13, 0xf1, 0x3e, 0x40, 0xb7, 0x1a, 0xa2, 0xc1, 0xf3, 0x9c, 0xb8, 0xf1, 0xe0, 0x19,
|
||||
0xad, 0x23, 0x99, 0x8f, 0xd5, 0x29, 0xc6, 0x2c, 0xb1, 0xae, 0x3f, 0x85, 0xe2, 0x31, 0xa7, 0x01,
|
||||
0x6e, 0x11, 0xf4, 0x18, 0x4a, 0xf1, 0x7c, 0x8f, 0xee, 0x26, 0xc2, 0xeb, 0xff, 0x79, 0x30, 0x2a,
|
||||
0xe9, 0x4a, 0x19, 0x5e, 0xdd, 0x83, 0x52, 0x3c, 0x14, 0x23, 0x0c, 0x93, 0xc9, 0xc1, 0x18, 0xad,
|
||||
0x25, 0x4c, 0xf3, 0x86, 0x71, 0x63, 0xfd, 0x6a, 0xa0, 0xf2, 0xf7, 0xdb, 0x0d, 0x18, 0x8f, 0x32,
|
||||
0x81, 0x3e, 0x81, 0xa2, 0x1a, 0x8a, 0xd1, 0x42, 0xc2, 0xba, 0x77, 0xd8, 0x36, 0x8c, 0x34, 0x95,
|
||||
0xba, 0xd9, 0x03, 0x28, 0x27, 0x26, 0x5c, 0xb4, 0x98, 0x80, 0x0e, 0x4e, 0xd0, 0xc6, 0x52, 0x96,
|
||||
0x5a, 0xb1, 0xed, 0x03, 0x74, 0x07, 0x3d, 0x54, 0xc9, 0x98, 0xff, 0x24, 0xd7, 0x62, 0xee, 0x74,
|
||||
0x88, 0x5e, 0xc2, 0xdc, 0xc0, 0x54, 0x84, 0x56, 0xf2, 0x67, 0x26, 0x49, 0xbc, 0x7a, 0x9d, 0xc1,
|
||||
0xaa, 0xfe, 0x53, 0x11, 0x34, 0x59, 0x3d, 0xa8, 0x05, 0xf3, 0x69, 0xaf, 0x25, 0xba, 0x97, 0x20,
|
||||
0xca, 0x79, 0x9f, 0x8d, 0xb5, 0x2b, 0x71, 0xea, 0x4c, 0x97, 0x60, 0x64, 0xbf, 0x67, 0xe8, 0x61,
|
||||
0x16, 0x4d, 0x5a, 0x1f, 0x37, 0x36, 0xae, 0x89, 0x8e, 0x27, 0xd1, 0xd9, 0xfe, 0xc7, 0x06, 0x99,
|
||||
0x09, 0x8a, 0x8c, 0x97, 0xd0, 0x58, 0xc9, 0xc5, 0x28, 0xf2, 0x36, 0xdc, 0x4e, 0x6f, 0xeb, 0x68,
|
||||
0x3d, 0xcd, 0x3c, 0xf5, 0x3c, 0xf7, 0xaf, 0x81, 0x54, 0xee, 0x3e, 0x06, 0x4d, 0x36, 0x33, 0xa4,
|
||||
0x0f, 0xf4, 0xc0, 0x0e, 0xdd, 0x42, 0x8a, 0x46, 0x99, 0x63, 0x40, 0x83, 0x0d, 0x17, 0xad, 0x0e,
|
||||
0x18, 0xa4, 0xb4, 0x77, 0xe3, 0xed, 0x2b, 0x50, 0xca, 0x05, 0x03, 0x3d, 0x6b, 0x86, 0x45, 0xef,
|
||||
0x24, 0x29, 0xf2, 0x07, 0x6e, 0xe3, 0xc1, 0xb5, 0xb0, 0xca, 0x69, 0x0b, 0xe6, 0xd3, 0x86, 0xd2,
|
||||
0x9e, 0x32, 0xce, 0x19, 0x83, 0x7b, 0xca, 0x38, 0x77, 0xba, 0xb5, 0x60, 0xaa, 0xa7, 0x4d, 0xa3,
|
||||
0x6a, 0xc2, 0x32, 0xed, 0x29, 0x30, 0x96, 0xb3, 0x01, 0x92, 0x73, 0x7b, 0xf5, 0x85, 0xc9, 0x38,
|
||||
0x0d, 0xbe, 0xa9, 0x39, 0x74, 0x53, 0x2c, 0x36, 0xfd, 0xc0, 0xb9, 0xc0, 0x9c, 0x6c, 0xc6, 0x96,
|
||||
0xfe, 0xe9, 0xa9, 0x26, 0x7e, 0xad, 0x1f, 0xfd, 0x13, 0x00, 0x00, 0xff, 0xff, 0x98, 0x02, 0x92,
|
||||
0x23, 0x53, 0x12, 0x00, 0x00,
|
||||
}
|
||||
|
||||
@ -105,6 +105,7 @@ service Payout {
|
||||
rpc EarnedPerSatellite(EarnedPerSatelliteRequest) returns (EarnedPerSatelliteResponse);
|
||||
rpc EstimatedPayoutSatellite(EstimatedPayoutSatelliteRequest) returns (EstimatedPayoutSatelliteResponse);
|
||||
rpc EstimatedPayoutTotal(EstimatedPayoutTotalRequest) returns (EstimatedPayoutTotalResponse);
|
||||
rpc Undistributed(UndistributedRequest) returns (UndistributedResponse);
|
||||
}
|
||||
|
||||
message EstimatedPayoutSatelliteRequest {
|
||||
@ -181,6 +182,14 @@ message EarnedSatellite {
|
||||
bytes satellite_id = 2 [(gogoproto.customtype) = "NodeID", (gogoproto.nullable) = false];
|
||||
}
|
||||
|
||||
message UndistributedRequest {
|
||||
RequestHeader header = 1;
|
||||
}
|
||||
|
||||
message UndistributedResponse {
|
||||
int64 total = 1;
|
||||
}
|
||||
|
||||
message PayoutInfo {
|
||||
int64 held = 1;
|
||||
int64 paid = 2;
|
||||
|
||||
@ -395,6 +395,7 @@ type DRPCPayoutClient interface {
|
||||
EarnedPerSatellite(ctx context.Context, in *EarnedPerSatelliteRequest) (*EarnedPerSatelliteResponse, error)
|
||||
EstimatedPayoutSatellite(ctx context.Context, in *EstimatedPayoutSatelliteRequest) (*EstimatedPayoutSatelliteResponse, error)
|
||||
EstimatedPayoutTotal(ctx context.Context, in *EstimatedPayoutTotalRequest) (*EstimatedPayoutTotalResponse, error)
|
||||
Undistributed(ctx context.Context, in *UndistributedRequest) (*UndistributedResponse, error)
|
||||
}
|
||||
|
||||
type drpcPayoutClient struct {
|
||||
@ -479,6 +480,15 @@ func (c *drpcPayoutClient) EstimatedPayoutTotal(ctx context.Context, in *Estimat
|
||||
return out, nil
|
||||
}
|
||||
|
||||
func (c *drpcPayoutClient) Undistributed(ctx context.Context, in *UndistributedRequest) (*UndistributedResponse, error) {
|
||||
out := new(UndistributedResponse)
|
||||
err := c.cc.Invoke(ctx, "/multinode.Payout/Undistributed", drpcEncoding_File_multinode_proto{}, in, out)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
|
||||
type DRPCPayoutServer interface {
|
||||
AllSatellitesSummary(context.Context, *AllSatellitesSummaryRequest) (*AllSatellitesSummaryResponse, error)
|
||||
AllSatellitesPeriodSummary(context.Context, *AllSatellitesPeriodSummaryRequest) (*AllSatellitesPeriodSummaryResponse, error)
|
||||
@ -488,6 +498,7 @@ type DRPCPayoutServer interface {
|
||||
EarnedPerSatellite(context.Context, *EarnedPerSatelliteRequest) (*EarnedPerSatelliteResponse, error)
|
||||
EstimatedPayoutSatellite(context.Context, *EstimatedPayoutSatelliteRequest) (*EstimatedPayoutSatelliteResponse, error)
|
||||
EstimatedPayoutTotal(context.Context, *EstimatedPayoutTotalRequest) (*EstimatedPayoutTotalResponse, error)
|
||||
Undistributed(context.Context, *UndistributedRequest) (*UndistributedResponse, error)
|
||||
}
|
||||
|
||||
type DRPCPayoutUnimplementedServer struct{}
|
||||
@ -524,9 +535,13 @@ func (s *DRPCPayoutUnimplementedServer) EstimatedPayoutTotal(context.Context, *E
|
||||
return nil, drpcerr.WithCode(errors.New("Unimplemented"), 12)
|
||||
}
|
||||
|
||||
func (s *DRPCPayoutUnimplementedServer) Undistributed(context.Context, *UndistributedRequest) (*UndistributedResponse, error) {
|
||||
return nil, drpcerr.WithCode(errors.New("Unimplemented"), 12)
|
||||
}
|
||||
|
||||
type DRPCPayoutDescription struct{}
|
||||
|
||||
func (DRPCPayoutDescription) NumMethods() int { return 8 }
|
||||
func (DRPCPayoutDescription) NumMethods() int { return 9 }
|
||||
|
||||
func (DRPCPayoutDescription) Method(n int) (string, drpc.Encoding, drpc.Receiver, interface{}, bool) {
|
||||
switch n {
|
||||
@ -602,6 +617,15 @@ func (DRPCPayoutDescription) Method(n int) (string, drpc.Encoding, drpc.Receiver
|
||||
in1.(*EstimatedPayoutTotalRequest),
|
||||
)
|
||||
}, DRPCPayoutServer.EstimatedPayoutTotal, true
|
||||
case 8:
|
||||
return "/multinode.Payout/Undistributed", drpcEncoding_File_multinode_proto{},
|
||||
func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) {
|
||||
return srv.(DRPCPayoutServer).
|
||||
Undistributed(
|
||||
ctx,
|
||||
in1.(*UndistributedRequest),
|
||||
)
|
||||
}, DRPCPayoutServer.Undistributed, true
|
||||
default:
|
||||
return "", nil, nil, nil, false
|
||||
}
|
||||
@ -738,3 +762,19 @@ func (x *drpcPayout_EstimatedPayoutTotalStream) SendAndClose(m *EstimatedPayoutT
|
||||
}
|
||||
return x.CloseSend()
|
||||
}
|
||||
|
||||
type DRPCPayout_UndistributedStream interface {
|
||||
drpc.Stream
|
||||
SendAndClose(*UndistributedResponse) error
|
||||
}
|
||||
|
||||
type drpcPayout_UndistributedStream struct {
|
||||
drpc.Stream
|
||||
}
|
||||
|
||||
func (x *drpcPayout_UndistributedStream) SendAndClose(m *UndistributedResponse) error {
|
||||
if err := x.MsgSend(m, drpcEncoding_File_multinode_proto{}); err != nil {
|
||||
return err
|
||||
}
|
||||
return x.CloseSend()
|
||||
}
|
||||
|
||||
@ -72,15 +72,15 @@ func (payout *PayoutEndpoint) EarnedPerSatellite(ctx context.Context, req *multi
|
||||
return nil, rpcstatus.Wrap(rpcstatus.Internal, err)
|
||||
}
|
||||
|
||||
for i := 0; i < len(satelliteIDs); i++ {
|
||||
earned, err := payout.db.GetEarnedAtSatellite(ctx, satelliteIDs[i])
|
||||
for _, id := range satelliteIDs {
|
||||
earned, err := payout.db.GetEarnedAtSatellite(ctx, id)
|
||||
if err != nil {
|
||||
return nil, rpcstatus.Wrap(rpcstatus.Internal, err)
|
||||
}
|
||||
|
||||
resp.EarnedSatellite = append(resp.EarnedSatellite, &multinodepb.EarnedSatellite{
|
||||
Total: earned,
|
||||
SatelliteId: satelliteIDs[i],
|
||||
SatelliteId: id,
|
||||
})
|
||||
}
|
||||
|
||||
@ -208,3 +208,19 @@ func (payout *PayoutEndpoint) SatellitePeriodSummary(ctx context.Context, req *m
|
||||
|
||||
return &multinodepb.SatellitePeriodSummaryResponse{PayoutInfo: &multinodepb.PayoutInfo{Held: totalHeld, Paid: totalPaid}}, nil
|
||||
}
|
||||
|
||||
// Undistributed returns total undistributed amount.
|
||||
func (payout *PayoutEndpoint) Undistributed(ctx context.Context, req *multinodepb.UndistributedRequest) (_ *multinodepb.UndistributedResponse, err error) {
|
||||
defer mon.Task()(&ctx)(&err)
|
||||
|
||||
if err = authenticate(ctx, payout.apiKeys, req.GetHeader()); err != nil {
|
||||
return nil, rpcstatus.Wrap(rpcstatus.Unauthenticated, err)
|
||||
}
|
||||
|
||||
earned, err := payout.db.GetUndistributed(ctx)
|
||||
if err != nil {
|
||||
return nil, rpcstatus.Wrap(rpcstatus.Internal, err)
|
||||
}
|
||||
|
||||
return &multinodepb.UndistributedResponse{Total: earned}, nil
|
||||
}
|
||||
|
||||
@ -79,6 +79,7 @@ func TestPayoutsEndpointSummary(t *testing.T) {
|
||||
SatelliteID: id,
|
||||
Held: amount,
|
||||
Paid: amount,
|
||||
CompAtRest: amount,
|
||||
Period: "2020-10",
|
||||
})
|
||||
require.NoError(t, err)
|
||||
@ -204,6 +205,73 @@ func TestPayoutsEndpointEstimations(t *testing.T) {
|
||||
})
|
||||
}
|
||||
|
||||
func TestPayoutsUndistributedEndpoint(t *testing.T) {
|
||||
storagenodedbtest.Run(t, func(ctx *testcontext.Context, t *testing.T, db storagenode.DB) {
|
||||
payoutdb := db.Payout()
|
||||
satelliteID := testrand.NodeID()
|
||||
|
||||
log := zaptest.NewLogger(t)
|
||||
service := apikeys.NewService(db.APIKeys())
|
||||
|
||||
key, err := service.Issue(ctx)
|
||||
require.NoError(t, err)
|
||||
|
||||
// Initialize a trust pool
|
||||
poolConfig := trust.Config{
|
||||
CachePath: ctx.File("trust-cache.json"),
|
||||
}
|
||||
poolConfig.Sources = append(poolConfig.Sources, &trust.StaticURLSource{URL: trust.SatelliteURL{ID: satelliteID}})
|
||||
|
||||
trustPool, err := trust.NewPool(zaptest.NewLogger(t), trust.Dialer(rpc.Dialer{}), poolConfig)
|
||||
require.NoError(t, err)
|
||||
require.NoError(t, trustPool.Refresh(ctx))
|
||||
|
||||
estimatedPayoutsService := estimatedpayouts.NewService(db.Bandwidth(), db.Reputation(), db.StorageUsage(), db.Pricing(), db.Satellites(), trustPool)
|
||||
endpoint := multinode.NewPayoutEndpoint(log, service, estimatedPayoutsService, db.Payout())
|
||||
satelliteID1 := testrand.NodeID()
|
||||
satelliteID2 := testrand.NodeID()
|
||||
|
||||
err = payoutdb.StorePayStub(ctx, payouts.PayStub{
|
||||
SatelliteID: satelliteID2,
|
||||
Period: "2020-01",
|
||||
Distributed: 150,
|
||||
Paid: 250,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
|
||||
err = payoutdb.StorePayStub(ctx, payouts.PayStub{
|
||||
SatelliteID: satelliteID2,
|
||||
Period: "2020-02",
|
||||
Distributed: 250,
|
||||
Paid: 350,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
|
||||
err = payoutdb.StorePayStub(ctx, payouts.PayStub{
|
||||
SatelliteID: satelliteID1,
|
||||
Period: "2020-01",
|
||||
Distributed: 100,
|
||||
Paid: 300,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
|
||||
err = payoutdb.StorePayStub(ctx, payouts.PayStub{
|
||||
SatelliteID: satelliteID1,
|
||||
Period: "2020-02",
|
||||
Distributed: 400,
|
||||
Paid: 500,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
|
||||
resp, err := endpoint.Undistributed(ctx, &multinodepb.UndistributedRequest{Header: &multinodepb.RequestHeader{
|
||||
ApiKey: key.Secret[:],
|
||||
}})
|
||||
require.NoError(t, err)
|
||||
|
||||
require.EqualValues(t, 500, resp.Total)
|
||||
})
|
||||
}
|
||||
|
||||
// makeStorageUsageStamps creates storage usage stamps and expected summaries for provided satellites.
|
||||
// Creates one entry per day for 30 days with last date as beginning of provided endDate.
|
||||
func makeStorageUsageStamps(satellites []storj.NodeID) ([]storageusage.Stamp, map[storj.NodeID]float64) {
|
||||
|
||||
@ -11,8 +11,8 @@ import (
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"storj.io/common/storj"
|
||||
"storj.io/common/testcontext"
|
||||
"storj.io/common/testrand"
|
||||
"storj.io/storj/storagenode"
|
||||
"storj.io/storj/storagenode/payouts"
|
||||
"storj.io/storj/storagenode/storagenodedb/storagenodedbtest"
|
||||
@ -21,7 +21,7 @@ import (
|
||||
func TestHeldAmountDB(t *testing.T) {
|
||||
storagenodedbtest.Run(t, func(ctx *testcontext.Context, t *testing.T, db storagenode.DB) {
|
||||
payout := db.Payout()
|
||||
satelliteID := storj.NodeID{}
|
||||
satelliteID := testrand.NodeID()
|
||||
period := "2020-01"
|
||||
paystub := payouts.PayStub{
|
||||
SatelliteID: satelliteID,
|
||||
@ -100,7 +100,7 @@ func TestHeldAmountDB(t *testing.T) {
|
||||
assert.Error(t, err)
|
||||
assert.Equal(t, true, payouts.ErrNoPayStubForPeriod.Has(err))
|
||||
|
||||
stub, err = payout.GetPayStub(ctx, storj.NodeID{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, period)
|
||||
stub, err = payout.GetPayStub(ctx, testrand.NodeID(), period)
|
||||
assert.Error(t, err)
|
||||
assert.Equal(t, true, payouts.ErrNoPayStubForPeriod.Has(err))
|
||||
assert.Nil(t, stub)
|
||||
@ -188,7 +188,7 @@ func TestHeldAmountDB(t *testing.T) {
|
||||
assert.Equal(t, paystub2.Period, periods[1])
|
||||
|
||||
paystub3 := paystub2
|
||||
paystub3.SatelliteID = storj.NodeID{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}
|
||||
paystub3.SatelliteID = testrand.NodeID()
|
||||
paystub3.Period = "2020-03"
|
||||
paystub3.Created = paystub2.Created.Add(time.Hour * 24 * 30)
|
||||
|
||||
@ -215,7 +215,7 @@ func TestSatellitePayStubPeriodCached(t *testing.T) {
|
||||
require.NoError(t, err)
|
||||
|
||||
payStub := payouts.PayStub{
|
||||
SatelliteID: storj.NodeID{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1},
|
||||
SatelliteID: testrand.NodeID(),
|
||||
Created: time.Now().UTC(),
|
||||
Codes: "code",
|
||||
UsageAtRest: 1,
|
||||
@ -266,7 +266,7 @@ func TestAllPayStubPeriodCached(t *testing.T) {
|
||||
require.NoError(t, err)
|
||||
|
||||
payStub := payouts.PayStub{
|
||||
SatelliteID: storj.NodeID{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1},
|
||||
SatelliteID: testrand.NodeID(),
|
||||
Created: time.Now().UTC(),
|
||||
Codes: "code",
|
||||
UsageAtRest: 1,
|
||||
@ -319,9 +319,9 @@ func TestPayouts(t *testing.T) {
|
||||
storagenodedbtest.Run(t, func(ctx *testcontext.Context, t *testing.T, db storagenode.DB) {
|
||||
payout := db.Payout()
|
||||
t.Run("Test SatelliteIDs", func(t *testing.T) {
|
||||
id1 := storj.NodeID{1, 2, 3}
|
||||
id2 := storj.NodeID{2, 3, 4}
|
||||
id3 := storj.NodeID{3, 3, 3}
|
||||
id1 := testrand.NodeID()
|
||||
id2 := testrand.NodeID()
|
||||
id3 := testrand.NodeID()
|
||||
err := payout.StorePayStub(ctx, payouts.PayStub{
|
||||
SatelliteID: id1,
|
||||
})
|
||||
@ -351,9 +351,9 @@ func TestPayouts(t *testing.T) {
|
||||
require.NoError(t, err)
|
||||
})
|
||||
t.Run("Test GetSatelliteEarned", func(t *testing.T) {
|
||||
id1 := storj.NodeID{1, 2, 3}
|
||||
id2 := storj.NodeID{2, 3, 4}
|
||||
id3 := storj.NodeID{3, 3, 3}
|
||||
id1 := testrand.NodeID()
|
||||
id2 := testrand.NodeID()
|
||||
id3 := testrand.NodeID()
|
||||
err := payout.StorePayStub(ctx, payouts.PayStub{
|
||||
Period: "2020-11",
|
||||
SatelliteID: id1,
|
||||
@ -408,8 +408,8 @@ func TestPayouts(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("Test GetSatelliteSummary", func(t *testing.T) {
|
||||
id1 := storj.NodeID{1, 2, 3}
|
||||
id2 := storj.NodeID{2, 3, 4}
|
||||
id1 := testrand.NodeID()
|
||||
id2 := testrand.NodeID()
|
||||
|
||||
err := payout.StorePayStub(ctx, payouts.PayStub{
|
||||
Period: "2020-11",
|
||||
@ -455,3 +455,47 @@ func TestPayouts(t *testing.T) {
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
func TestPayoutsUndistributedEndpoint(t *testing.T) {
|
||||
storagenodedbtest.Run(t, func(ctx *testcontext.Context, t *testing.T, db storagenode.DB) {
|
||||
payoutdb := db.Payout()
|
||||
satelliteID1 := testrand.NodeID()
|
||||
satelliteID2 := testrand.NodeID()
|
||||
|
||||
err := payoutdb.StorePayStub(ctx, payouts.PayStub{
|
||||
SatelliteID: satelliteID2,
|
||||
Period: "2020-01",
|
||||
Distributed: 150,
|
||||
Paid: 250,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
|
||||
err = payoutdb.StorePayStub(ctx, payouts.PayStub{
|
||||
SatelliteID: satelliteID2,
|
||||
Period: "2020-02",
|
||||
Distributed: 250,
|
||||
Paid: 350,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
|
||||
err = payoutdb.StorePayStub(ctx, payouts.PayStub{
|
||||
SatelliteID: satelliteID1,
|
||||
Period: "2020-01",
|
||||
Distributed: 100,
|
||||
Paid: 300,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
|
||||
err = payoutdb.StorePayStub(ctx, payouts.PayStub{
|
||||
SatelliteID: satelliteID1,
|
||||
Period: "2020-02",
|
||||
Distributed: 400,
|
||||
Paid: 500,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
|
||||
undistributed, err := payoutdb.GetUndistributed(ctx)
|
||||
require.NoError(t, err)
|
||||
require.EqualValues(t, undistributed, 500)
|
||||
})
|
||||
}
|
||||
|
||||
@ -44,6 +44,8 @@ type DB interface {
|
||||
GetSatelliteSummary(ctx context.Context, satelliteID storj.NodeID) (paid, held int64, err error)
|
||||
// GetSatellitePeriodSummary returns satellite paid and held amounts for specific period.
|
||||
GetSatellitePeriodSummary(ctx context.Context, satelliteID storj.NodeID, period string) (paid, held int64, err error)
|
||||
// GetUndistributed returns total undistributed amount.
|
||||
GetUndistributed(ctx context.Context) (int64, error)
|
||||
}
|
||||
|
||||
// ErrNoPayStubForPeriod represents errors from the payouts database.
|
||||
|
||||
@ -564,3 +564,23 @@ func (db *payoutDB) GetSatellitePeriodSummary(ctx context.Context, satelliteID s
|
||||
|
||||
return paid, held, nil
|
||||
}
|
||||
|
||||
// GetUndistributed returns total undistributed amount.
|
||||
func (db *payoutDB) GetUndistributed(ctx context.Context) (_ int64, err error) {
|
||||
defer mon.Task()(&ctx)(&err)
|
||||
|
||||
var distributed, paid int64
|
||||
|
||||
rowPayment := db.QueryRowContext(ctx,
|
||||
`SELECT SUM(distributed), SUM(paid) FROM paystubs`)
|
||||
|
||||
err = rowPayment.Scan(&distributed, &paid)
|
||||
if err != nil {
|
||||
if errors.Is(err, sql.ErrNoRows) {
|
||||
return 0, payouts.ErrNoPayStubForPeriod.Wrap(err)
|
||||
}
|
||||
return 0, ErrPayout.Wrap(err)
|
||||
}
|
||||
|
||||
return paid - distributed, nil
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user