From 5cf2dbaa6be01656fa591d71ac3f93b5da4b989e Mon Sep 17 00:00:00 2001 From: Wisdom Arerosuoghene Date: Sun, 22 Sep 2019 20:25:22 +0100 Subject: [PATCH] rename OwnerRewardAddress to UserRewardAddress --- backend/stakepoold/rpc/api.proto | 2 +- backend/stakepoold/rpc/rpcserver/context.go | 12 +- backend/stakepoold/rpc/rpcserver/server.go | 6 +- backend/stakepoold/rpc/stakepoolrpc/api.pb.go | 196 +++++++++--------- system/api-auth.go | 4 +- 5 files changed, 110 insertions(+), 110 deletions(-) diff --git a/backend/stakepoold/rpc/api.proto b/backend/stakepoold/rpc/api.proto index a39a283a..a313397f 100644 --- a/backend/stakepoold/rpc/api.proto +++ b/backend/stakepoold/rpc/api.proto @@ -47,7 +47,7 @@ message GetTicketInfoRequest { message GetTicketInfoResponse { string MultiSigAddress = 1; string VspRewardAddress = 2; - string OwnerRewardAddress = 3; + string UserRewardAddress = 3; } message SetAddedLowFeeTicketsRequest { diff --git a/backend/stakepoold/rpc/rpcserver/context.go b/backend/stakepoold/rpc/rpcserver/context.go index 397c5527..8ca1bca3 100644 --- a/backend/stakepoold/rpc/rpcserver/context.go +++ b/backend/stakepoold/rpc/rpcserver/context.go @@ -101,9 +101,9 @@ type ticketMetadata struct { } type TicketInfo struct { - MultiSigAddress string - VspRewardAddress string - OwnerRewardAddress string + MultiSigAddress string + VspRewardAddress string + UserRewardAddress string } // EvaluateStakePoolTicket evaluates a voting service ticket to see if it's @@ -449,9 +449,9 @@ func (ctx *AppContext) GetTicketInfo(ticketHash string) (*TicketInfo, error) { } return &TicketInfo{ - MultiSigAddress: multiSigAddress.EncodeAddress(), - VspRewardAddress: vspCommitAddr.EncodeAddress(), - OwnerRewardAddress: ownerCommitAddr.EncodeAddress(), + MultiSigAddress: multiSigAddress.EncodeAddress(), + VspRewardAddress: vspCommitAddr.EncodeAddress(), + UserRewardAddress: ownerCommitAddr.EncodeAddress(), }, nil } diff --git a/backend/stakepoold/rpc/rpcserver/server.go b/backend/stakepoold/rpc/rpcserver/server.go index 0f454afc..7aff7ac7 100644 --- a/backend/stakepoold/rpc/rpcserver/server.go +++ b/backend/stakepoold/rpc/rpcserver/server.go @@ -209,9 +209,9 @@ func (s *stakepooldServer) GetTicketInfo(ctx context.Context, req *pb.GetTicketI } return &pb.GetTicketInfoResponse{ - MultiSigAddress: ticketInfo.MultiSigAddress, - OwnerRewardAddress: ticketInfo.OwnerRewardAddress, - VspRewardAddress: ticketInfo.VspRewardAddress, + MultiSigAddress: ticketInfo.MultiSigAddress, + VspRewardAddress: ticketInfo.VspRewardAddress, + UserRewardAddress: ticketInfo.UserRewardAddress, }, nil } diff --git a/backend/stakepoold/rpc/stakepoolrpc/api.pb.go b/backend/stakepoold/rpc/stakepoolrpc/api.pb.go index 88799d95..4f3c9b93 100644 --- a/backend/stakepoold/rpc/stakepoolrpc/api.pb.go +++ b/backend/stakepoold/rpc/stakepoolrpc/api.pb.go @@ -276,7 +276,7 @@ func (m *GetTicketInfoRequest) GetHash() string { type GetTicketInfoResponse struct { MultiSigAddress string `protobuf:"bytes,1,opt,name=MultiSigAddress,proto3" json:"MultiSigAddress,omitempty"` VspRewardAddress string `protobuf:"bytes,2,opt,name=VspRewardAddress,proto3" json:"VspRewardAddress,omitempty"` - OwnerRewardAddress string `protobuf:"bytes,3,opt,name=OwnerRewardAddress,proto3" json:"OwnerRewardAddress,omitempty"` + UserRewardAddress string `protobuf:"bytes,3,opt,name=UserRewardAddress,proto3" json:"UserRewardAddress,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -321,9 +321,9 @@ func (m *GetTicketInfoResponse) GetVspRewardAddress() string { return "" } -func (m *GetTicketInfoResponse) GetOwnerRewardAddress() string { +func (m *GetTicketInfoResponse) GetUserRewardAddress() string { if m != nil { - return m.OwnerRewardAddress + return m.UserRewardAddress } return "" } @@ -1807,102 +1807,102 @@ func init() { proto.RegisterFile("api.proto", fileDescriptor_00212fb1f9d3bf1c) } var fileDescriptor_00212fb1f9d3bf1c = []byte{ // 1531 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x58, 0x4b, 0x53, 0xdc, 0x46, - 0x10, 0xae, 0x65, 0x31, 0x8f, 0x86, 0x05, 0x3c, 0xbc, 0xd6, 0x0a, 0xe6, 0x21, 0xbf, 0x08, 0x89, - 0x49, 0x42, 0xaa, 0x72, 0x49, 0xe5, 0x00, 0x7e, 0xe0, 0xad, 0x18, 0x83, 0x25, 0x43, 0x5c, 0xe5, - 0xaa, 0x50, 0x42, 0x1a, 0x16, 0xc5, 0xda, 0x91, 0x22, 0xcd, 0x2e, 0x26, 0xa7, 0xfc, 0x80, 0x1c, - 0x73, 0x4d, 0xe5, 0xec, 0x9f, 0x91, 0x7f, 0x96, 0x9a, 0x99, 0xd6, 0xae, 0x34, 0x92, 0x16, 0xec, - 0xdb, 0xf6, 0x37, 0x3d, 0x3d, 0xfd, 0x56, 0xf7, 0xc2, 0xa4, 0x13, 0xf9, 0xdb, 0x51, 0x1c, 0xf2, - 0x90, 0x4c, 0x27, 0xdc, 0x79, 0x4f, 0xa3, 0x30, 0x0c, 0xe2, 0xc8, 0x35, 0x57, 0x61, 0x65, 0x9f, - 0xf2, 0x5d, 0xcf, 0xa3, 0xde, 0xcb, 0xf0, 0xf2, 0x39, 0xa5, 0x6f, 0x7c, 0xf7, 0x3d, 0xe5, 0x89, - 0x45, 0x7f, 0xef, 0xd2, 0x84, 0x9b, 0x87, 0x70, 0xb7, 0xe2, 0x3c, 0x89, 0x42, 0x96, 0x50, 0xb2, - 0x0d, 0xe3, 0x5c, 0x41, 0xcd, 0xda, 0x7a, 0x7d, 0x73, 0x6a, 0x67, 0x61, 0x3b, 0xfb, 0xc0, 0xb6, - 0xe2, 0xb7, 0x52, 0x26, 0x73, 0x1d, 0x56, 0xf7, 0x29, 0x6f, 0xb5, 0x59, 0x18, 0x57, 0x3c, 0xf9, - 0x1a, 0xd6, 0x2a, 0x39, 0x3e, 0xf3, 0xd1, 0x65, 0x58, 0xdc, 0xa7, 0xfc, 0xa5, 0xdf, 0xd3, 0xdf, - 0x7a, 0x01, 0x4b, 0xfa, 0xc1, 0x67, 0x3e, 0xb1, 0x05, 0x0b, 0xfb, 0x94, 0x2b, 0xb4, 0xc5, 0xce, - 0x43, 0x7c, 0x81, 0x10, 0x18, 0x7d, 0xe1, 0x24, 0x17, 0xcd, 0xda, 0x7a, 0x6d, 0x73, 0xd2, 0x92, - 0xbf, 0xcd, 0x7f, 0x6a, 0x52, 0x9f, 0x2c, 0x33, 0xbe, 0xba, 0x09, 0xb3, 0x07, 0xdd, 0x80, 0xfb, - 0xb6, 0xdf, 0xde, 0xf5, 0xbc, 0x98, 0x26, 0x09, 0x5e, 0xd4, 0x61, 0xb2, 0x05, 0x73, 0x27, 0x49, - 0x64, 0xd1, 0x4b, 0x27, 0xf6, 0x52, 0xd6, 0x11, 0xc9, 0x5a, 0xc0, 0xc9, 0x36, 0x90, 0xc3, 0x4b, - 0x46, 0xe3, 0x3c, 0x77, 0x5d, 0x72, 0x97, 0x9c, 0x98, 0xaf, 0x60, 0xc5, 0x1e, 0x92, 0x14, 0x9f, - 0xec, 0x9b, 0x35, 0xb8, 0x6b, 0x0f, 0x4b, 0x22, 0x73, 0x05, 0x0c, 0x9b, 0xf2, 0xe3, 0x84, 0xc6, - 0x27, 0x21, 0xf7, 0x59, 0xfb, 0x28, 0xa6, 0xe7, 0x83, 0x53, 0x06, 0x77, 0xca, 0x4e, 0x95, 0x2e, - 0xaf, 0x81, 0x74, 0x13, 0x1a, 0x9f, 0xf6, 0xe4, 0xd1, 0xa9, 0x1b, 0xb2, 0x73, 0xbf, 0x8d, 0x6a, - 0xdd, 0xcb, 0xab, 0x35, 0x90, 0xf0, 0x44, 0x72, 0x3d, 0x63, 0x3c, 0xbe, 0xb2, 0xe6, 0xba, 0x1a, - 0x6c, 0x3e, 0x86, 0xe5, 0x5d, 0xcf, 0x3b, 0xf0, 0x93, 0xc4, 0x67, 0x6d, 0xb4, 0xa5, 0x24, 0x9a, - 0xd3, 0x18, 0x4d, 0x03, 0x9a, 0x45, 0x76, 0x54, 0xfd, 0x27, 0xb8, 0xdd, 0x0f, 0x74, 0x5f, 0xe5, - 0x4d, 0x98, 0x6d, 0x31, 0x37, 0xe8, 0x7a, 0xb4, 0xd5, 0xe9, 0x38, 0xbc, 0x1b, 0x53, 0x29, 0x6f, - 0xc2, 0xd2, 0x61, 0x73, 0x1b, 0x48, 0xf6, 0x3a, 0x26, 0x49, 0x13, 0xc6, 0xdf, 0x64, 0xdc, 0x3f, - 0x6d, 0xa5, 0xa4, 0xb9, 0x00, 0xe4, 0xa5, 0x9f, 0x70, 0xdb, 0x8d, 0xfd, 0x68, 0x90, 0xe4, 0xdf, - 0xc0, 0x7c, 0x0e, 0x1d, 0x88, 0x41, 0x28, 0x15, 0x83, 0xa4, 0x79, 0x01, 0xab, 0xbb, 0xae, 0x1b, - 0x76, 0x19, 0xb7, 0xaf, 0x98, 0x8b, 0x59, 0xd1, 0x62, 0x1e, 0xfd, 0x90, 0x9a, 0xd0, 0x84, 0x71, - 0xe4, 0xc0, 0xfc, 0x4c, 0x49, 0xb2, 0x04, 0x63, 0x7b, 0xb1, 0xc3, 0xdc, 0x0b, 0x99, 0x8d, 0x0d, - 0x0b, 0x29, 0xb2, 0x00, 0xb7, 0xa4, 0x04, 0x99, 0x76, 0x75, 0x4b, 0x11, 0xe6, 0x06, 0xac, 0x55, - 0xbe, 0x84, 0x2e, 0x7c, 0x07, 0x5f, 0xb4, 0x3a, 0x51, 0x18, 0x73, 0xf4, 0x70, 0xde, 0xb8, 0x6a, - 0x2b, 0x88, 0x09, 0xd3, 0x16, 0x4d, 0x5c, 0x87, 0xbd, 0xa0, 0x7e, 0xfb, 0x82, 0x4b, 0x7d, 0xea, - 0x56, 0x0e, 0x13, 0xed, 0xaf, 0x5c, 0x38, 0x3e, 0xfe, 0x2d, 0x2c, 0xa9, 0xf3, 0x57, 0xf4, 0x52, - 0x9d, 0xa5, 0xef, 0x2e, 0xc1, 0x98, 0x02, 0x30, 0x17, 0x90, 0x32, 0x77, 0x61, 0xb9, 0x70, 0x03, - 0x1d, 0xfe, 0x10, 0x66, 0xd4, 0xb3, 0x8a, 0x81, 0x7a, 0xf2, 0x6a, 0xdd, 0xd2, 0x50, 0xf3, 0x29, - 0x34, 0x6d, 0x91, 0xb7, 0x47, 0x61, 0x18, 0x88, 0x9c, 0xcd, 0xb6, 0x93, 0x1b, 0x37, 0x08, 0xf3, - 0xcf, 0x1a, 0xdc, 0x29, 0x11, 0x83, 0xba, 0xfc, 0x98, 0xcf, 0xa1, 0xa9, 0x9d, 0x8d, 0x7c, 0xad, - 0xe4, 0x6e, 0xa6, 0xf5, 0x8c, 0x37, 0x84, 0x21, 0x2d, 0xd6, 0x73, 0x02, 0xdf, 0x4b, 0x65, 0x8c, - 0xac, 0xd7, 0x37, 0x27, 0x2d, 0x0d, 0x35, 0xe7, 0xe1, 0xf6, 0x2f, 0x4e, 0x10, 0xe4, 0x1a, 0xa2, - 0xf9, 0x77, 0x0d, 0x48, 0x16, 0x45, 0x85, 0xd6, 0x61, 0xea, 0x24, 0xe4, 0xf4, 0x84, 0xc6, 0x89, - 0x1f, 0x32, 0x69, 0x54, 0xc3, 0xca, 0x42, 0xc2, 0xf4, 0xa7, 0x0e, 0xed, 0x84, 0xec, 0x49, 0xc8, - 0x18, 0x75, 0x85, 0xff, 0x46, 0x54, 0xd9, 0x68, 0x30, 0x31, 0x60, 0xe2, 0x98, 0x05, 0xa1, 0xfb, - 0x9e, 0x7a, 0x32, 0xdd, 0x26, 0xac, 0x3e, 0x2d, 0xe2, 0xa6, 0x8a, 0xbd, 0x39, 0x2a, 0x4f, 0x90, - 0x32, 0x77, 0x60, 0xe9, 0x44, 0xe8, 0xee, 0x70, 0x8a, 0x1e, 0xcc, 0xe6, 0x7a, 0xce, 0xd5, 0x29, - 0x69, 0xbe, 0x86, 0xe5, 0xc2, 0x1d, 0x34, 0x67, 0x09, 0xc6, 0x5a, 0xc9, 0x81, 0xcf, 0xd2, 0xd2, - 0x46, 0x8a, 0xac, 0x02, 0x1c, 0x75, 0xcf, 0x7e, 0xa6, 0x57, 0xe2, 0x02, 0x36, 0xec, 0x0c, 0x62, - 0x7e, 0x07, 0x8b, 0x4f, 0x62, 0xea, 0x70, 0x2a, 0xc3, 0x99, 0xf8, 0xed, 0x52, 0x2d, 0xea, 0x59, - 0x2d, 0x4e, 0x60, 0x49, 0xbf, 0x82, 0x4a, 0xc8, 0x0a, 0xf0, 0x28, 0xed, 0x64, 0x32, 0x75, 0xd2, - 0xca, 0x61, 0x59, 0xb9, 0x23, 0x79, 0xeb, 0x3e, 0xd6, 0x60, 0xbe, 0x24, 0x0d, 0x64, 0xe6, 0x73, - 0x87, 0x77, 0x53, 0x77, 0x20, 0x25, 0x70, 0xc5, 0x81, 0x82, 0x90, 0x12, 0x5a, 0xa8, 0x5f, 0x58, - 0x87, 0x75, 0x19, 0xda, 0x1c, 0x26, 0xab, 0x38, 0xa2, 0x8c, 0xef, 0x5d, 0xc9, 0xb0, 0x4c, 0x5a, - 0x29, 0x49, 0xee, 0x43, 0x03, 0x7f, 0xe2, 0xf5, 0x5b, 0xf2, 0x7a, 0x1e, 0x34, 0x7f, 0x48, 0xdf, - 0xae, 0x8e, 0x56, 0xbf, 0x77, 0x8f, 0x64, 0x7a, 0xf7, 0xbf, 0x35, 0x58, 0x2c, 0xfd, 0x2c, 0x08, - 0x6b, 0x64, 0xd1, 0xa4, 0x45, 0x8a, 0x54, 0x59, 0x01, 0x8e, 0x94, 0x7f, 0xa1, 0x0d, 0x98, 0x10, - 0xe9, 0xbb, 0xe7, 0xf3, 0x04, 0x9b, 0x5e, 0x9f, 0x16, 0x52, 0xd2, 0xdf, 0x69, 0xc6, 0x8f, 0x4a, - 0x16, 0x1d, 0x36, 0xe7, 0x60, 0x06, 0x7f, 0xa6, 0x05, 0xf4, 0x5f, 0x0d, 0x66, 0xfb, 0x10, 0x46, - 0xfa, 0x01, 0xcc, 0xf4, 0x14, 0x74, 0x9a, 0xf0, 0x58, 0x64, 0xb7, 0x32, 0xbe, 0x81, 0xa8, 0x2d, - 0x41, 0xd1, 0x84, 0x3b, 0xce, 0x6f, 0x61, 0x8c, 0xbd, 0x59, 0x11, 0x12, 0xf5, 0x59, 0x18, 0x63, - 0x64, 0x14, 0x21, 0xd0, 0xc8, 0xe1, 0xee, 0x85, 0x54, 0xac, 0x61, 0x29, 0x42, 0xe4, 0x6f, 0x14, - 0xd3, 0x98, 0x06, 0xd4, 0x49, 0xa8, 0x8c, 0xc5, 0xa4, 0x95, 0x41, 0x84, 0x22, 0x67, 0x5d, 0x3f, - 0xf0, 0x4e, 0x3b, 0x94, 0x3b, 0x9e, 0xc3, 0x9d, 0xe6, 0x98, 0x52, 0x44, 0xa2, 0x07, 0x08, 0x9a, - 0x8b, 0x30, 0xbf, 0x4f, 0xb9, 0xcc, 0xae, 0x6c, 0x6f, 0xf8, 0x6b, 0x54, 0x4e, 0x51, 0x19, 0x7c, - 0xd0, 0x1d, 0xf6, 0x44, 0x01, 0x63, 0x0e, 0xa8, 0x90, 0x64, 0x21, 0xa1, 0xd8, 0x53, 0xff, 0xfc, - 0xdc, 0x77, 0xbb, 0x01, 0xbf, 0x92, 0xf6, 0xd5, 0xac, 0x0c, 0x22, 0xb3, 0x30, 0xe4, 0x4e, 0x60, - 0x77, 0xcf, 0x12, 0xdf, 0xbb, 0x92, 0xb6, 0xd6, 0xac, 0x1c, 0x26, 0x72, 0xed, 0xf0, 0x92, 0x1d, - 0xd0, 0x8e, 0xe8, 0x82, 0x6f, 0xfc, 0x0f, 0x68, 0x7a, 0x1e, 0x14, 0x71, 0xed, 0x7f, 0xb7, 0x55, - 0x32, 0xf6, 0x69, 0x91, 0x7d, 0xc7, 0x2c, 0x11, 0xa9, 0x29, 0xed, 0x6e, 0x58, 0x29, 0x29, 0xdc, - 0x29, 0x42, 0xeb, 0x35, 0xc7, 0x95, 0x3b, 0x25, 0x21, 0xf8, 0x2d, 0xda, 0x0b, 0x45, 0xa3, 0x9a, - 0x50, 0xfc, 0x48, 0x8a, 0x1e, 0x8b, 0x57, 0x9f, 0x7d, 0x88, 0xfc, 0x98, 0x7a, 0xcd, 0x49, 0xc9, - 0xa0, 0xa1, 0x42, 0x1b, 0x51, 0x9f, 0xb6, 0xff, 0x07, 0x6d, 0x82, 0xd2, 0x26, 0xa5, 0x85, 0x3d, - 0xbb, 0x41, 0x90, 0xb1, 0x67, 0x4a, 0xd9, 0x93, 0x03, 0x45, 0x5d, 0x88, 0x01, 0xb8, 0x39, 0x2d, - 0x0f, 0xe5, 0x6f, 0xf1, 0xfa, 0x51, 0x1c, 0x8a, 0xef, 0x91, 0x1f, 0x32, 0x79, 0xda, 0x90, 0xfe, - 0xd2, 0x50, 0x51, 0x25, 0xe2, 0xcb, 0x49, 0xbd, 0xe6, 0x8c, 0xfa, 0xda, 0x2b, 0x4a, 0x4c, 0xa7, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x58, 0x4b, 0x53, 0xdc, 0xc6, + 0x13, 0xaf, 0x65, 0x31, 0x8f, 0x86, 0xe5, 0x31, 0xbc, 0xd6, 0xfa, 0x63, 0x1e, 0xf2, 0x8b, 0x3f, + 0xb1, 0x49, 0x42, 0xaa, 0x72, 0x49, 0xe5, 0x00, 0x7e, 0xe0, 0xad, 0x18, 0x1b, 0x4b, 0x86, 0xb8, + 0xca, 0x55, 0xa1, 0x84, 0x34, 0x2c, 0x13, 0x6b, 0x25, 0x45, 0x9a, 0x5d, 0x4c, 0x4e, 0xf9, 0x00, + 0x39, 0xe6, 0x96, 0x43, 0xce, 0xfe, 0x18, 0xf9, 0x66, 0xa9, 0x99, 0x69, 0xed, 0x4a, 0x23, 0x69, + 0xc1, 0xbe, 0x6d, 0xff, 0xa6, 0xa7, 0xa7, 0xdf, 0xea, 0x5e, 0x98, 0x74, 0x22, 0xb6, 0x13, 0xc5, + 0x21, 0x0f, 0xc9, 0x74, 0xc2, 0x9d, 0x0f, 0x34, 0x0a, 0x43, 0x3f, 0x8e, 0x5c, 0x73, 0x0d, 0x56, + 0x0f, 0x28, 0xdf, 0xf3, 0x3c, 0xea, 0xbd, 0x0c, 0x2f, 0x9f, 0x53, 0xfa, 0x96, 0xb9, 0x1f, 0x28, + 0x4f, 0x2c, 0xfa, 0x5b, 0x97, 0x26, 0xdc, 0x7c, 0x0d, 0x77, 0x2a, 0xce, 0x93, 0x28, 0x0c, 0x12, + 0x4a, 0x76, 0x60, 0x9c, 0x2b, 0xa8, 0x59, 0xdb, 0xa8, 0x6f, 0x4d, 0xed, 0x2e, 0xee, 0x64, 0x1f, + 0xd8, 0x51, 0xfc, 0x56, 0xca, 0x64, 0x6e, 0xc0, 0xda, 0x01, 0xe5, 0xad, 0x76, 0x10, 0xc6, 0x15, + 0x4f, 0xbe, 0x81, 0xf5, 0x4a, 0x8e, 0x2f, 0x7c, 0x74, 0x05, 0x96, 0x0e, 0x28, 0x7f, 0xc9, 0x7a, + 0xfa, 0x5b, 0x2f, 0x60, 0x59, 0x3f, 0xf8, 0xc2, 0x27, 0xb6, 0x61, 0xf1, 0x80, 0x72, 0x85, 0xb6, + 0x82, 0xf3, 0x10, 0x5f, 0x20, 0x04, 0x46, 0x5f, 0x38, 0xc9, 0x45, 0xb3, 0xb6, 0x51, 0xdb, 0x9a, + 0xb4, 0xe4, 0x6f, 0xf3, 0xef, 0x9a, 0xd4, 0x27, 0xcb, 0x8c, 0xaf, 0x6e, 0xc1, 0xec, 0x61, 0xd7, + 0xe7, 0xcc, 0x66, 0xed, 0x3d, 0xcf, 0x8b, 0x69, 0x92, 0xe0, 0x45, 0x1d, 0x26, 0xdb, 0x30, 0x77, + 0x92, 0x44, 0x16, 0xbd, 0x74, 0x62, 0x2f, 0x65, 0x1d, 0x91, 0xac, 0x05, 0x9c, 0x3c, 0x82, 0xf9, + 0xe3, 0x84, 0xc6, 0x79, 0xe6, 0xba, 0x64, 0x2e, 0x1e, 0x98, 0xaf, 0x60, 0xd5, 0x1e, 0x92, 0x12, + 0x9f, 0xed, 0x99, 0x75, 0xb8, 0x63, 0x0f, 0x4b, 0x21, 0x73, 0x15, 0x0c, 0x9b, 0x72, 0xa1, 0xc8, + 0x49, 0xc8, 0x59, 0xd0, 0x3e, 0x8a, 0xe9, 0xf9, 0xe0, 0x34, 0x80, 0xdb, 0x65, 0xa7, 0x4a, 0x97, + 0x37, 0x40, 0xba, 0x09, 0x8d, 0x4f, 0x7b, 0xf2, 0xe8, 0xd4, 0x0d, 0x83, 0x73, 0xd6, 0x46, 0xb5, + 0xee, 0xe6, 0xd5, 0x1a, 0x48, 0x78, 0x22, 0xb9, 0x9e, 0x05, 0x3c, 0xbe, 0xb2, 0xe6, 0xba, 0x1a, + 0x6c, 0x3e, 0x86, 0x95, 0x3d, 0xcf, 0x3b, 0x64, 0x49, 0xc2, 0x82, 0x36, 0xda, 0x52, 0x12, 0xcb, + 0x69, 0x8c, 0xa5, 0x01, 0xcd, 0x22, 0x3b, 0xaa, 0xfe, 0x23, 0xcc, 0xf7, 0xc3, 0xdc, 0x57, 0x79, + 0x0b, 0x66, 0x5b, 0x81, 0xeb, 0x77, 0x3d, 0xda, 0xea, 0x74, 0x1c, 0xde, 0x8d, 0xa9, 0x94, 0x37, + 0x61, 0xe9, 0xb0, 0xb9, 0x03, 0x24, 0x7b, 0x1d, 0x53, 0xa4, 0x09, 0xe3, 0x6f, 0x33, 0xee, 0x9f, + 0xb6, 0x52, 0xd2, 0x5c, 0x04, 0xf2, 0x92, 0x25, 0xdc, 0x76, 0x63, 0x16, 0x0d, 0x52, 0xfc, 0x6b, + 0x58, 0xc8, 0xa1, 0x03, 0x31, 0x08, 0xa5, 0x62, 0x90, 0x34, 0x2f, 0x60, 0x6d, 0xcf, 0x75, 0xc3, + 0x6e, 0xc0, 0xed, 0xab, 0xc0, 0xc5, 0xac, 0x68, 0x05, 0x1e, 0xfd, 0x98, 0x9a, 0xd0, 0x84, 0x71, + 0xe4, 0xc0, 0xec, 0x4c, 0x49, 0xb2, 0x0c, 0x63, 0xfb, 0xb1, 0x13, 0xb8, 0x17, 0x32, 0x17, 0x1b, + 0x16, 0x52, 0x64, 0x11, 0x6e, 0x49, 0x09, 0x32, 0xeb, 0xea, 0x96, 0x22, 0xcc, 0x4d, 0x58, 0xaf, + 0x7c, 0x09, 0x5d, 0xf8, 0x1e, 0xfe, 0xd7, 0xea, 0x44, 0x61, 0xcc, 0xd1, 0xc3, 0x79, 0xe3, 0xaa, + 0xad, 0x20, 0x26, 0x4c, 0x5b, 0x34, 0x71, 0x9d, 0xe0, 0x05, 0x65, 0xed, 0x0b, 0x2e, 0xf5, 0xa9, + 0x5b, 0x39, 0x4c, 0x34, 0xbf, 0x72, 0xe1, 0xf8, 0xf8, 0x37, 0xb0, 0xac, 0xce, 0x5f, 0xd1, 0x4b, + 0x75, 0x96, 0xbe, 0xbb, 0x0c, 0x63, 0x0a, 0xc0, 0x5c, 0x40, 0xca, 0xdc, 0x83, 0x95, 0xc2, 0x0d, + 0x74, 0xf8, 0x03, 0x98, 0x51, 0xcf, 0x2a, 0x06, 0xea, 0xc9, 0xab, 0x75, 0x4b, 0x43, 0xcd, 0xa7, + 0xd0, 0xb4, 0x45, 0xde, 0x1e, 0x85, 0xa1, 0x2f, 0x72, 0x36, 0xdb, 0x4c, 0x6e, 0xdc, 0x1e, 0xcc, + 0x3f, 0x6a, 0x70, 0xbb, 0x44, 0x0c, 0xea, 0xf2, 0x43, 0x3e, 0x87, 0xa6, 0x76, 0x37, 0xf3, 0xb5, + 0x92, 0xbb, 0x99, 0xd6, 0x33, 0xde, 0x10, 0x86, 0xb4, 0x82, 0x9e, 0xe3, 0x33, 0x2f, 0x95, 0x31, + 0xb2, 0x51, 0xdf, 0x9a, 0xb4, 0x34, 0xd4, 0x5c, 0x80, 0xf9, 0x9f, 0x1d, 0xdf, 0xcf, 0xb5, 0x43, + 0xf3, 0xaf, 0x1a, 0x90, 0x2c, 0x8a, 0x0a, 0x6d, 0xc0, 0xd4, 0x49, 0xc8, 0xe9, 0x09, 0x8d, 0x13, + 0x16, 0x06, 0xd2, 0xa8, 0x86, 0x95, 0x85, 0x84, 0xe9, 0x4f, 0x1d, 0xda, 0x09, 0x83, 0x27, 0x61, + 0x10, 0x50, 0x57, 0xf8, 0x6f, 0x44, 0x95, 0x8d, 0x06, 0x13, 0x03, 0x26, 0x8e, 0x03, 0x3f, 0x74, + 0x3f, 0x50, 0x4f, 0xa6, 0xdb, 0x84, 0xd5, 0xa7, 0x45, 0xdc, 0x54, 0xb1, 0x37, 0x47, 0xe5, 0x09, + 0x52, 0xe6, 0x2e, 0x2c, 0x9f, 0x08, 0xdd, 0x1d, 0x4e, 0xd1, 0x83, 0xd9, 0x5c, 0xcf, 0xb9, 0x3a, + 0x25, 0xcd, 0x37, 0xb0, 0x52, 0xb8, 0x83, 0xe6, 0x2c, 0xc3, 0x58, 0x2b, 0x39, 0x64, 0x41, 0x5a, + 0xda, 0x48, 0x91, 0x35, 0x80, 0xa3, 0xee, 0xd9, 0x4f, 0xf4, 0x4a, 0x5c, 0xc0, 0x76, 0x9d, 0x41, + 0xcc, 0x6f, 0x61, 0xe9, 0x49, 0x4c, 0x1d, 0x4e, 0x65, 0x38, 0x13, 0xd6, 0x2e, 0xd5, 0xa2, 0x9e, + 0xd5, 0xe2, 0x04, 0x96, 0xf5, 0x2b, 0xa8, 0x84, 0xac, 0x00, 0x8f, 0xd2, 0x4e, 0x26, 0x53, 0x27, + 0xad, 0x1c, 0x96, 0x95, 0x3b, 0x92, 0xb7, 0xee, 0x53, 0x0d, 0x16, 0x4a, 0xd2, 0x40, 0x66, 0x3e, + 0x77, 0x78, 0x37, 0x75, 0x07, 0x52, 0x02, 0x57, 0x1c, 0x28, 0x08, 0x29, 0xa1, 0x85, 0xfa, 0x85, + 0x75, 0x58, 0x97, 0xa1, 0xcd, 0x61, 0xb2, 0x8a, 0x23, 0x1a, 0xf0, 0xfd, 0x2b, 0x19, 0x96, 0x49, + 0x2b, 0x25, 0xc9, 0x3d, 0x68, 0xe0, 0x4f, 0xbc, 0x7e, 0x4b, 0x5e, 0xcf, 0x83, 0xe6, 0xf7, 0xe9, + 0xdb, 0xd5, 0xd1, 0xea, 0xf7, 0xee, 0x91, 0x4c, 0xef, 0xfe, 0xa7, 0x06, 0x4b, 0xa5, 0x9f, 0x05, + 0x61, 0x8d, 0x2c, 0x9a, 0xb4, 0x48, 0x91, 0x2a, 0x2b, 0xc0, 0x91, 0xf2, 0xef, 0xb3, 0x01, 0x13, + 0x22, 0x7d, 0xf7, 0x19, 0x4f, 0xb0, 0xe9, 0xf5, 0x69, 0x21, 0x25, 0xfd, 0x9d, 0x66, 0xfc, 0xa8, + 0x64, 0xd1, 0x61, 0x73, 0x0e, 0x66, 0xf0, 0x67, 0x5a, 0x40, 0xff, 0xd6, 0x60, 0xb6, 0x0f, 0x61, + 0xa4, 0xef, 0xc3, 0x4c, 0x4f, 0x41, 0xa7, 0x09, 0x8f, 0x45, 0x76, 0x2b, 0xe3, 0x1b, 0x88, 0xda, + 0x12, 0x14, 0x4d, 0xb8, 0xe3, 0xfc, 0x1a, 0xc6, 0xd8, 0x9b, 0x15, 0x21, 0x51, 0x16, 0x84, 0x31, + 0x46, 0x46, 0x11, 0x02, 0x8d, 0x1c, 0xee, 0x5e, 0x48, 0xc5, 0x1a, 0x96, 0x22, 0x44, 0xfe, 0x46, + 0x31, 0x8d, 0xa9, 0x4f, 0x9d, 0x84, 0xca, 0x58, 0x4c, 0x5a, 0x19, 0x44, 0x28, 0x72, 0xd6, 0x65, + 0xbe, 0x77, 0xda, 0xa1, 0xdc, 0xf1, 0x1c, 0xee, 0x34, 0xc7, 0x94, 0x22, 0x12, 0x3d, 0x44, 0xd0, + 0x5c, 0x82, 0x85, 0x03, 0xca, 0x65, 0x76, 0x65, 0x7b, 0xc3, 0x9f, 0xa3, 0x72, 0x86, 0xca, 0xe0, + 0x83, 0xee, 0xb0, 0x2f, 0x0a, 0x18, 0x73, 0x40, 0x85, 0x24, 0x0b, 0x09, 0xc5, 0x9e, 0xb2, 0xf3, + 0x73, 0xe6, 0x76, 0x7d, 0x7e, 0x25, 0xed, 0xab, 0x59, 0x19, 0x44, 0x66, 0x61, 0xc8, 0x1d, 0xdf, + 0xee, 0x9e, 0x25, 0xcc, 0xbb, 0x92, 0xb6, 0xd6, 0xac, 0x1c, 0x26, 0x72, 0xed, 0xf5, 0x65, 0x70, + 0x48, 0x3b, 0xa2, 0x0b, 0xbe, 0x65, 0x1f, 0xd1, 0xf4, 0x3c, 0x28, 0xe2, 0xda, 0xff, 0x6e, 0xab, + 0x64, 0xec, 0xd3, 0x22, 0xfb, 0x8e, 0x83, 0x44, 0xa4, 0xa6, 0xb4, 0xbb, 0x61, 0xa5, 0xa4, 0x70, + 0xa7, 0x08, 0xad, 0xd7, 0x1c, 0x57, 0xee, 0x94, 0x84, 0xe0, 0xb7, 0x68, 0x2f, 0x14, 0x8d, 0x6a, + 0x42, 0xf1, 0x23, 0x29, 0x7a, 0x2c, 0x5e, 0x7d, 0xf6, 0x31, 0x62, 0x31, 0xf5, 0x9a, 0x93, 0x92, + 0x41, 0x43, 0x85, 0x36, 0xa2, 0x3e, 0x6d, 0xf6, 0x3b, 0x6d, 0x82, 0xd2, 0x26, 0xa5, 0x85, 0x3d, + 0x7b, 0xbe, 0x9f, 0xb1, 0x67, 0x4a, 0xd9, 0x93, 0x03, 0x45, 0x5d, 0x88, 0xf1, 0xb7, 0x39, 0x2d, + 0x0f, 0xe5, 0x6f, 0xf1, 0xfa, 0x51, 0x1c, 0x8a, 0xef, 0x11, 0x0b, 0x03, 0x79, 0xda, 0x90, 0xfe, + 0xd2, 0x50, 0x51, 0x25, 0xe2, 0xcb, 0x49, 0xbd, 0xe6, 0x8c, 0xfa, 0xda, 0x2b, 0x4a, 0xcc, 0xa6, 0x03, 0x4e, 0xe4, 0x98, 0x95, 0x12, 0x0a, 0xb8, 0xf0, 0x41, 0x6a, 0xe2, 0x9c, 0xf2, 0x01, 0x92, - 0x3b, 0x1f, 0x1b, 0x70, 0xdb, 0x4e, 0xbf, 0x4a, 0x9e, 0x4d, 0xe3, 0x9e, 0xef, 0x52, 0x12, 0xc9, - 0xe1, 0xb9, 0x38, 0x4d, 0x92, 0xad, 0xfc, 0x27, 0x6c, 0xd8, 0x5e, 0x63, 0x7c, 0x75, 0x23, 0x5e, - 0xcc, 0xbe, 0x1e, 0x2c, 0x57, 0x6c, 0x24, 0xe4, 0xeb, 0x82, 0x9c, 0x21, 0xab, 0x8d, 0xf1, 0xf8, - 0x86, 0xdc, 0xf8, 0xee, 0x3b, 0x98, 0xc9, 0x6f, 0x27, 0xe4, 0x5e, 0x41, 0x40, 0x71, 0xa9, 0x31, - 0xee, 0x0f, 0x67, 0x42, 0xe1, 0x11, 0x2c, 0xda, 0x37, 0x71, 0xa3, 0xfd, 0x09, 0x6e, 0x1c, 0x3a, - 0xe5, 0x93, 0x36, 0x90, 0xe2, 0x1c, 0x4f, 0x1e, 0x15, 0x44, 0x94, 0x4f, 0xfa, 0xc6, 0xe6, 0xf5, - 0x8c, 0xf8, 0xd0, 0xaf, 0x30, 0xab, 0xcd, 0x60, 0x44, 0xf3, 0x49, 0xf9, 0x50, 0x67, 0x3c, 0xb8, - 0x86, 0x0b, 0xe5, 0x77, 0x60, 0xa1, 0x6c, 0x6a, 0x24, 0x5f, 0x96, 0x5d, 0x2f, 0x1d, 0x5b, 0x8d, - 0xad, 0x9b, 0xb0, 0xe2, 0x73, 0x1e, 0x56, 0x41, 0x76, 0x90, 0x23, 0x0f, 0x87, 0xcc, 0x6b, 0x99, - 0x96, 0x6a, 0x3c, 0xba, 0x96, 0x0f, 0x5f, 0x39, 0x04, 0x18, 0x8c, 0x65, 0x64, 0x2d, 0x7f, 0xad, - 0x30, 0xc6, 0x19, 0xeb, 0xd5, 0x0c, 0x83, 0x28, 0x68, 0xd3, 0x91, 0x1e, 0x85, 0xf2, 0x81, 0x4b, - 0x8f, 0x42, 0xd5, 0x88, 0xe5, 0xc0, 0x9c, 0xbe, 0x77, 0x11, 0xed, 0x6a, 0xc5, 0x1a, 0x67, 0x3c, - 0xbc, 0x8e, 0x6d, 0xe0, 0x93, 0xc1, 0xfe, 0xa5, 0xfb, 0xa4, 0xb0, 0xd8, 0xe9, 0x3e, 0x29, 0x59, - 0xdd, 0xde, 0x42, 0x23, 0xb7, 0xf8, 0x13, 0xb3, 0xe2, 0x4a, 0xd6, 0xd5, 0xf7, 0x86, 0xf2, 0xa0, - 0x64, 0x0b, 0xa6, 0x32, 0x4b, 0x1e, 0xd1, 0x54, 0x29, 0x6e, 0x85, 0xc6, 0xc6, 0x10, 0x8e, 0x41, - 0xdf, 0xab, 0xd8, 0xce, 0xf4, 0xbe, 0x37, 0x7c, 0x5d, 0xd4, 0xfb, 0xde, 0x35, 0x2b, 0x9f, 0xe8, - 0x7b, 0xf9, 0x89, 0x56, 0xef, 0x7b, 0xa5, 0x23, 0xb2, 0xde, 0xf7, 0x2a, 0x86, 0xe2, 0x63, 0x98, - 0xce, 0x8e, 0x18, 0x64, 0xa3, 0xe0, 0x5d, 0x7d, 0x2c, 0x31, 0xcc, 0x61, 0x2c, 0x4a, 0xec, 0xce, - 0xdb, 0xfe, 0x9c, 0x96, 0x7e, 0xa7, 0x9e, 0xc3, 0x78, 0xba, 0xba, 0xac, 0x68, 0x19, 0x9d, 0x1b, - 0xe8, 0x8c, 0xbb, 0x15, 0xa7, 0x4a, 0xf2, 0xd9, 0x98, 0xfc, 0xdf, 0xee, 0xfb, 0xff, 0x03, 0x00, - 0x00, 0xff, 0xff, 0x41, 0xb3, 0xbb, 0xc8, 0xc4, 0x13, 0x00, 0x00, + 0xbb, 0x9f, 0x1a, 0x30, 0x6f, 0xa7, 0x5f, 0x25, 0xcf, 0xa6, 0x71, 0x8f, 0xb9, 0x94, 0x44, 0x72, + 0x74, 0x2e, 0x4e, 0x93, 0x64, 0x3b, 0xff, 0x09, 0x1b, 0xb6, 0xd5, 0x18, 0x5f, 0xdd, 0x88, 0x17, + 0xb3, 0xaf, 0x07, 0x2b, 0x15, 0xfb, 0x08, 0x79, 0x54, 0x90, 0x33, 0x64, 0xb1, 0x31, 0x1e, 0xdf, + 0x90, 0x1b, 0xdf, 0x7d, 0x0f, 0x33, 0xf9, 0xdd, 0x84, 0xdc, 0x2d, 0x08, 0x28, 0xae, 0x34, 0xc6, + 0xbd, 0xe1, 0x4c, 0x28, 0x3c, 0x82, 0x25, 0xfb, 0x26, 0x6e, 0xb4, 0x3f, 0xc3, 0x8d, 0x43, 0xa7, + 0x7c, 0xd2, 0x06, 0x52, 0x9c, 0xe3, 0xc9, 0xc3, 0x82, 0x88, 0xf2, 0x49, 0xdf, 0xd8, 0xba, 0x9e, + 0x11, 0x1f, 0xfa, 0x05, 0x66, 0xb5, 0x19, 0x8c, 0x68, 0x3e, 0x29, 0x1f, 0xea, 0x8c, 0xfb, 0xd7, + 0x70, 0xa1, 0xfc, 0x0e, 0x2c, 0x96, 0x4d, 0x8d, 0xe4, 0xff, 0x65, 0xd7, 0x4b, 0xc7, 0x56, 0x63, + 0xfb, 0x26, 0xac, 0xf8, 0x9c, 0x87, 0x55, 0x90, 0x1d, 0xe4, 0xc8, 0x83, 0x21, 0xf3, 0x5a, 0xa6, + 0xa5, 0x1a, 0x0f, 0xaf, 0xe5, 0xc3, 0x57, 0x5e, 0x03, 0x0c, 0xc6, 0x32, 0xb2, 0x9e, 0xbf, 0x56, + 0x18, 0xe3, 0x8c, 0x8d, 0x6a, 0x86, 0x41, 0x14, 0xb4, 0xe9, 0x48, 0x8f, 0x42, 0xf9, 0xc0, 0xa5, + 0x47, 0xa1, 0x6a, 0xc4, 0x72, 0x60, 0x4e, 0xdf, 0xbb, 0x88, 0x76, 0xb5, 0x62, 0x8d, 0x33, 0x1e, + 0x5c, 0xc7, 0x36, 0xf0, 0xc9, 0x60, 0xff, 0xd2, 0x7d, 0x52, 0x58, 0xec, 0x74, 0x9f, 0x94, 0xac, + 0x6e, 0xef, 0xa0, 0x91, 0x5b, 0xfb, 0x89, 0x59, 0x71, 0x25, 0xeb, 0xea, 0xbb, 0x43, 0x79, 0x50, + 0xb2, 0x05, 0x53, 0x99, 0x25, 0x8f, 0x68, 0xaa, 0x14, 0xb7, 0x42, 0x63, 0x73, 0x08, 0xc7, 0xa0, + 0xef, 0x55, 0x6c, 0x67, 0x7a, 0xdf, 0x1b, 0xbe, 0x2e, 0xea, 0x7d, 0xef, 0x9a, 0x95, 0x4f, 0xf4, + 0xbd, 0xfc, 0x44, 0xab, 0xf7, 0xbd, 0xd2, 0x11, 0x59, 0xef, 0x7b, 0x15, 0x43, 0xf1, 0x31, 0x4c, + 0x67, 0x47, 0x0c, 0xb2, 0x59, 0xf0, 0xae, 0x3e, 0x96, 0x18, 0xe6, 0x30, 0x16, 0x25, 0x76, 0xf7, + 0x5d, 0x7f, 0x4e, 0x4b, 0xbf, 0x53, 0xcf, 0x61, 0x3c, 0x5d, 0x5d, 0x56, 0xb5, 0x8c, 0xce, 0x0d, + 0x74, 0xc6, 0x9d, 0x8a, 0x53, 0x25, 0xf9, 0x6c, 0x4c, 0xfe, 0x6b, 0xf7, 0xdd, 0x7f, 0x01, 0x00, + 0x00, 0xff, 0xff, 0x73, 0xe6, 0x43, 0xcc, 0xc2, 0x13, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/system/api-auth.go b/system/api-auth.go index f67ad754..e92f0a55 100644 --- a/system/api-auth.go +++ b/system/api-auth.go @@ -78,8 +78,8 @@ func (application *Application) validateTicketOwnership(authHeader string) (stri return "", fmt.Errorf("ticket auth, get ticket info failed: %v", err) } - // check if timestamp signature checks out against address - addr, err := dcrutil.DecodeAddress(ticketInfo.OwnerRewardAddress) + // Check if timestamp signature checks out against user's reward address. + addr, err := dcrutil.DecodeAddress(ticketInfo.UserRewardAddress) if err != nil { return "", fmt.Errorf("ticket auth, unexpected decode address error: %v", err) }