akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

channeldb+lnrpc: store the payment pre-image not rhash

Browse Source 
Fixes #481.

Prior to this commit, payments stored in the channel DB only kept a
record of the payment hash. This is a problem as the preimage is what
serves as proof of payment and a user should be able to look up this
value in the future (not just immediately after payment).

Instead of storing both the payment hash and the preimage, we store the
preimage only since the hash can be derrived from this using a SHA256.

In the RPC listpayments command, we now give the preimage in addition to
the payment hash.
This commit is contained in:
Andrew Naoum 2017-12-14 12:04:18 +11:00 committed by Olaoluwa Osuntokun
parent fc18db0130
commit 0f161c5033
6 changed files with 150 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
channeldb/payments.go
View File

@ -37,11 +37,9 @@ type OutgoingPayment struct {
// compressed public key of each of the nodes involved in the payment.
Path [][33]byte
// PaymentHash is the payment hash (r-hash) used to send the payment.
//
// TODO(roasbeef): weave through preimage on payment success to can
// store only supplemental info the embedded Invoice
PaymentHash [32]byte
// PaymentPreimage is the preImage of a successful payment. This is used
// to calculate the PaymentHash as well as serve as a proof of payment.
PaymentPreimage [32]byte
}
// AddPayment saves a successful payment to the database. It is assumed that
@ -163,7 +161,7 @@ func serializeOutgoingPayment(w io.Writer, p *OutgoingPayment) error {
return err
}
if _, err := w.Write(p.PaymentHash[:]); err != nil {
if _, err := w.Write(p.PaymentPreimage[:]); err != nil {
return err
}
@ -204,7 +202,7 @@ func deserializeOutgoingPayment(r io.Reader) (*OutgoingPayment, error) {
}
p.TimeLockLength = byteOrder.Uint32(scratch[:4])
if _, err := r.Read(p.PaymentHash[:]); err != nil {
if _, err := r.Read(p.PaymentPreimage[:]); err != nil {
return nil, err
}

9
channeldb/payments_test.go
View File

@ -2,7 +2,6 @@ package channeldb
import (
"bytes"
"crypto/sha256"
"fmt"
"math/rand"
"reflect"
@ -31,13 +30,14 @@ func makeFakePayment() *OutgoingPayment {
copy(fakePath[i][:], bytes.Repeat([]byte{byte(i)}, 33))
}
return &OutgoingPayment{
fakePayment := &OutgoingPayment{
Invoice: *fakeInvoice,
Fee: 101,
Path: fakePath,
TimeLockLength: 1000,
PaymentHash: sha256.Sum256(rev[:]),
}
copy(fakePayment.PaymentPreimage[:], rev[:])
return fakePayment
}
// randomBytes creates random []byte with length in range [minLen, maxLen)
@ -90,14 +90,13 @@ func makeRandomFakePayment() (*OutgoingPayment, error) {
copy(fakePath[i][:], b)
}
rHash := sha256.Sum256(fakeInvoice.Terms.PaymentPreimage[:])
fakePayment := &OutgoingPayment{
Invoice: *fakeInvoice,
Fee: lnwire.MilliSatoshi(rand.Intn(1001)),
Path: fakePath,
TimeLockLength: uint32(rand.Intn(10000)),
PaymentHash: rHash,
}
copy(fakePayment.PaymentPreimage[:], fakeInvoice.Terms.PaymentPreimage[:])
return fakePayment, nil
}

237
lnrpc/rpc.pb.go
View File

@ -3206,6 +3206,8 @@ type Payment struct {
Path []string `protobuf:"bytes,4,rep,name=path" json:"path,omitempty"`
// / The fee paid for this payment in satoshis
Fee int64 `protobuf:"varint,5,opt,name=fee" json:"fee,omitempty"`
// / The payment preimage
PaymentPreimage string `protobuf:"bytes,6,opt,name=payment_preimage" json:"payment_preimage,omitempty"`
}
func (m *Payment) Reset() { *m = Payment{} }
@ -3248,6 +3250,13 @@ func (m *Payment) GetFee() int64 {
return 0
}
func (m *Payment) GetPaymentPreimage() string {
if m != nil {
return m.PaymentPreimage
}
return ""
}
type ListPaymentsRequest struct {
}
@ -5635,13 +5644,13 @@ var _Lightning_serviceDesc = grpc.ServiceDesc{
func init() { proto.RegisterFile("rpc.proto", fileDescriptor0) }
var fileDescriptor0 = []byte{
// 4898 bytes of a gzipped FileDescriptorProto
// 4904 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x3b, 0x4d, 0x8f, 0x1c, 0x49,
0x56, 0xce, 0xea, 0xaa, 0xee, 0xae, 0x57, 0x55, 0xfd, 0x11, 0xdd, 0xee, 0x2e, 0xd7, 0x78, 0xbd,
0x9e, 0x60, 0x34, 0xd3, 0x98, 0xc1, 0x6d, 0xf7, 0xb2, 0xc3, 0xec, 0x18, 0x18, 0xf9, 0xbb, 0x87,
0xf5, 0x78, 0x7a, 0xb3, 0xed, 0x1d, 0xd8, 0x11, 0x2a, 0xb2, 0xab, 0xa2, 0xab, 0x73, 0x9d, 0x95,
0x99, 0x93, 0x19, 0xd5, 0xed, 0xda, 0xc1, 0x12, 0x2c, 0x08, 0x09, 0x09, 0xb4, 0x07, 0x10, 0x68,
0x0f, 0xcb, 0x85, 0x0b, 0x1c, 0xf8, 0x05, 0x48, 0xfc, 0x80, 0x95, 0x10, 0x87, 0x3d, 0x21, 0xb8,
0x99, 0x93, 0x19, 0xd5, 0xed, 0xda, 0xc1, 0x12, 0x2c, 0x08, 0x09, 0x09, 0xc4, 0x01, 0x04, 0xda,
0xc3, 0x72, 0xe1, 0x02, 0x07, 0x7e, 0xc1, 0x4a, 0xfc, 0x80, 0x95, 0x10, 0x87, 0x3d, 0x21, 0xb8,
0x20, 0x38, 0xc1, 0x81, 0x13, 0x17, 0x4e, 0x28, 0x5e, 0x7c, 0x64, 0x44, 0x66, 0xb6, 0xed, 0x65,
0x97, 0xbd, 0x55, 0xbc, 0x78, 0xf9, 0x22, 0xe2, 0xc5, 0x8b, 0xf7, 0x5d, 0xd0, 0xce, 0xd2, 0xd1,
0xf5, 0x34, 0x4b, 0x78, 0x42, 0x5a, 0x51, 0x9c, 0xa5, 0xa3, 0xc1, 0xe5, 0x49, 0x92, 0x4c, 0x22,
@ -5649,7 +5658,7 @@ var fileDescriptor0 = []byte{
0x61, 0xe3, 0x6e, 0xc6, 0x02, 0xce, 0x3e, 0x0d, 0xa2, 0x88, 0x71, 0x9f, 0x7d, 0x3e, 0x63, 0x39,
0x27, 0x03, 0x58, 0x4e, 0x83, 0x3c, 0x3f, 0x4b, 0xb2, 0x71, 0xdf, 0xbb, 0xea, 0xed, 0x74, 0x7d,
0x33, 0xa6, 0x5b, 0xb0, 0xe9, 0x7e, 0x92, 0xa7, 0x49, 0x9c, 0x33, 0x41, 0xea, 0x69, 0x1c, 0x25,
0xa3, 0x67, 0x3f, 0x16, 0x29, 0xf7, 0x13, 0x45, 0xea, 0xfb, 0x0d, 0xe8, 0x3c, 0xc9, 0x82, 0x38,
0xa3, 0x67, 0x3f, 0x16, 0x29, 0xf7, 0x13, 0x45, 0xea, 0x7b, 0x0d, 0xe8, 0x3c, 0xc9, 0x82, 0x38,
0x0f, 0x46, 0x62, 0xb3, 0xa4, 0x0f, 0x4b, 0xfc, 0xf9, 0xf0, 0x24, 0xc8, 0x4f, 0x90, 0x44, 0xdb,
0xd7, 0x43, 0xb2, 0x05, 0x8b, 0xc1, 0x34, 0x99, 0xc5, 0xbc, 0xdf, 0xb8, 0xea, 0xed, 0x2c, 0xf8,
0x6a, 0x44, 0xde, 0x85, 0xf5, 0x78, 0x36, 0x1d, 0x8e, 0x92, 0xf8, 0x38, 0xcc, 0xa6, 0xf2, 0xc8,
@ -5668,7 +5677,7 @@ var fileDescriptor0 = []byte{
0x14, 0x4d, 0xbd, 0x85, 0xd4, 0xd7, 0x2d, 0x4c, 0xb5, 0xc8, 0x3b, 0xb0, 0xaa, 0xf1, 0x33, 0xb9,
0x59, 0x64, 0x7f, 0xdb, 0x5f, 0x51, 0x60, 0x7d, 0x84, 0x1d, 0x58, 0x3b, 0x0e, 0xe3, 0x20, 0x1a,
0x8e, 0x22, 0x7e, 0x3a, 0x1c, 0xb3, 0x88, 0x07, 0x78, 0x11, 0x2d, 0x7f, 0x05, 0xe1, 0x77, 0x23,
0x7e, 0x7a, 0x4f, 0x40, 0xe9, 0x9f, 0x79, 0xd0, 0x95, 0x87, 0x97, 0x12, 0x49, 0xde, 0x82, 0x9e,
0x7e, 0x7a, 0x4f, 0x40, 0xe9, 0x9f, 0x7b, 0xd0, 0x95, 0x87, 0x97, 0x12, 0x49, 0xde, 0x82, 0x9e,
0x5e, 0x83, 0x65, 0x59, 0x92, 0x29, 0x39, 0x74, 0x81, 0xe4, 0x1a, 0xac, 0x69, 0x40, 0x9a, 0xb1,
0x70, 0x1a, 0x4c, 0x18, 0x32, 0xa5, 0xeb, 0x57, 0xe0, 0x64, 0xaf, 0xa0, 0x98, 0x25, 0x33, 0xce,
0x90, 0x49, 0x9d, 0xbd, 0xae, 0xba, 0x18, 0x5f, 0xc0, 0x7c, 0x17, 0x85, 0x7e, 0xd7, 0x83, 0xee,
@ -5686,7 +5695,7 @@ var fileDescriptor0 = []byte{
0x68, 0x9d, 0x06, 0xd1, 0x8c, 0x29, 0xed, 0x23, 0x07, 0x1f, 0x34, 0xde, 0xf7, 0xe8, 0xdb, 0xb0,
0x56, 0x6c, 0x5b, 0x09, 0x11, 0x81, 0xa6, 0xb9, 0xa5, 0xb6, 0x8f, 0xbf, 0xe9, 0xef, 0x79, 0x12,
0xf1, 0x6e, 0x12, 0x9a, 0x97, 0x2c, 0x10, 0xc5, 0x83, 0xd7, 0x88, 0xe2, 0xf7, 0xb9, 0x9a, 0xee,
0x27, 0x3f, 0x2c, 0x7d, 0x07, 0xd6, 0xad, 0x2d, 0xbc, 0x64, 0xb3, 0x7f, 0xe9, 0xc1, 0xfa, 0x63,
0x27, 0x3f, 0x2c, 0x7d, 0x07, 0xd6, 0xad, 0x2d, 0xbc, 0x64, 0xb3, 0x7f, 0xe5, 0xc1, 0xfa, 0x63,
0x76, 0xa6, 0x6e, 0x5d, 0xef, 0xf6, 0x7d, 0x68, 0xf2, 0x79, 0xca, 0x10, 0x73, 0x65, 0xef, 0x2d,
0x75, 0x69, 0x15, 0xbc, 0xeb, 0x6a, 0xf8, 0x64, 0x9e, 0x32, 0x1f, 0xbf, 0xa0, 0x9f, 0x40, 0xc7,
0x02, 0x92, 0x6d, 0xd8, 0xf8, 0xf4, 0xa3, 0x27, 0x8f, 0xef, 0x1f, 0x1e, 0x0e, 0x0f, 0x9e, 0xde,
@ -5746,7 +5755,7 @@ var fileDescriptor0 = []byte{
0x49, 0x99, 0x5e, 0xfa, 0x6b, 0x65, 0xfd, 0x2f, 0x0d, 0xf4, 0x86, 0x92, 0x2c, 0x3b, 0x42, 0x28,
0x19, 0x05, 0xea, 0x03, 0x51, 0xd3, 0x77, 0xa3, 0x24, 0x67, 0x8a, 0x20, 0x85, 0xee, 0x28, 0x4a,
0xf2, 0x72, 0x18, 0x61, 0xc3, 0x04, 0x2f, 0xf3, 0xd9, 0x68, 0x24, 0x5e, 0xae, 0x34, 0xf1, 0x7a,
0x48, 0xff, 0xda, 0x83, 0x0d, 0xa4, 0xa6, 0x75, 0x85, 0xf1, 0x0b, 0x5f, 0x7f, 0x9b, 0xdd, 0x91,
0x48, 0xff, 0xc6, 0x83, 0x0d, 0xa4, 0xa6, 0x75, 0x85, 0xf1, 0x0b, 0x5f, 0x7f, 0x9b, 0xdd, 0x91,
0x1d, 0xd6, 0x6c, 0x42, 0xeb, 0x38, 0xc9, 0x46, 0x4c, 0xad, 0x24, 0x07, 0x3f, 0x0d, 0x4f, 0xf7,
0x9f, 0x3c, 0x58, 0xc7, 0xad, 0x1e, 0xf2, 0x80, 0xcf, 0x72, 0x75, 0xfc, 0x5f, 0x81, 0x9e, 0x38,
0x2a, 0xd3, 0xe2, 0xaf, 0x36, 0xba, 0x69, 0x5e, 0x2a, 0x42, 0x25, 0xf2, 0xfe, 0x05, 0xdf, 0x45,
@ -5783,32 +5792,32 @@ var fileDescriptor0 = []byte{
0x7a, 0xc6, 0x46, 0xc9, 0x29, 0xcb, 0xac, 0xc8, 0x5a, 0x5e, 0x55, 0x75, 0x42, 0x38, 0x7c, 0x6e,
0x2c, 0xbb, 0xec, 0xd4, 0x1a, 0x2c, 0xcb, 0x50, 0x0a, 0x69, 0xe9, 0xd7, 0x60, 0x53, 0x96, 0x80,
0xee, 0x48, 0x52, 0xda, 0xe7, 0x78, 0x13, 0xba, 0x67, 0x32, 0x99, 0x37, 0x4c, 0xe2, 0x68, 0xae,
0x8c, 0x48, 0x47, 0xc1, 0x3e, 0x89, 0xa3, 0x39, 0xfd, 0x81, 0x07, 0x17, 0x4b, 0xdf, 0x16, 0x39,
0x8c, 0x48, 0x47, 0xc1, 0x3e, 0x89, 0xa3, 0x39, 0xfd, 0xbe, 0x07, 0x17, 0x4b, 0xdf, 0x16, 0x39,
0x7b, 0xa9, 0x6a, 0x5d, 0xfd, 0xeb, 0x02, 0xc5, 0x11, 0x95, 0x8c, 0x5b, 0x47, 0x94, 0x26, 0xa9,
0x3a, 0x21, 0x58, 0x38, 0x8b, 0xab, 0xf8, 0xf2, 0x62, 0xea, 0xa6, 0xe8, 0x36, 0x5c, 0x54, 0x97,
0xef, 0x9e, 0x8d, 0xee, 0xc1, 0x56, 0x79, 0xa2, 0xc8, 0x8f, 0xb9, 0x5b, 0xd6, 0x43, 0xfa, 0x21,
0x90, 0x6f, 0xcc, 0x58, 0x36, 0xc7, 0xea, 0x80, 0x49, 0xc0, 0x6e, 0x97, 0x03, 0xf1, 0xc5, 0x74,
0x76, 0xf4, 0x75, 0x36, 0xd7, 0xe5, 0x97, 0x86, 0x29, 0xbf, 0xd0, 0x5b, 0xb0, 0xe1, 0x10, 0x30,
0xac, 0x5a, 0xc4, 0x0a, 0x83, 0x0e, 0x52, 0xdd, 0x2a, 0x84, 0x9a, 0xa3, 0x7f, 0xe1, 0xc1, 0xc2,
0xac, 0x5a, 0xc4, 0x0a, 0x83, 0x0e, 0x52, 0xdd, 0x2a, 0x84, 0x9a, 0xa3, 0x7f, 0xe9, 0xc1, 0xc2,
0x7e, 0x92, 0xda, 0x99, 0x25, 0xcf, 0xcd, 0x2c, 0x29, 0xdd, 0x39, 0x34, 0xaa, 0xb1, 0xa1, 0x5e,
0xbe, 0x0d, 0x14, 0x9a, 0x2f, 0x98, 0x72, 0x11, 0xa6, 0x1d, 0x27, 0xd9, 0x59, 0x90, 0x8d, 0x15,
0xff, 0x4a, 0x50, 0xb1, 0xfd, 0x42, 0xc1, 0x88, 0x9f, 0xc2, 0x69, 0xc0, 0xf4, 0xda, 0x5c, 0x45,
0x96, 0x6a, 0x44, 0xbf, 0xe7, 0x41, 0x0b, 0xf7, 0x2a, 0x5e, 0x83, 0xbc, 0x5f, 0x2c, 0xbd, 0x61,
0xf6, 0xce, 0x93, 0xaf, 0xa1, 0x04, 0x2e, 0x15, 0xe4, 0x1a, 0x95, 0x82, 0xdc, 0x65, 0x68, 0xcb,
0x51, 0x51, 0xc1, 0x2a, 0x00, 0xe4, 0x0a, 0x34, 0x4f, 0x92, 0x54, 0xdb, 0x30, 0xd0, 0xe9, 0x9a,
0x24, 0xf5, 0x11, 0x4e, 0xaf, 0xc1, 0xea, 0xe3, 0x64, 0xcc, 0xac, 0x98, 0xfe, 0xdc, 0x6b, 0xa2,
0xbf, 0xeb, 0xc1, 0xb2, 0x46, 0x26, 0x3b, 0xd0, 0x14, 0xa6, 0xa8, 0xe4, 0xfc, 0x99, 0xa4, 0xab,
0xc0, 0xf3, 0x11, 0x43, 0xa8, 0x10, 0x8c, 0x20, 0x0b, 0x57, 0x41, 0xc7, 0x8f, 0x85, 0x11, 0x16,
0x4e, 0x3b, 0xee, 0xb9, 0x64, 0xac, 0x4a, 0x50, 0xfa, 0x37, 0x1e, 0xf4, 0x9c, 0x35, 0x84, 0x1b,
0x1f, 0x05, 0x39, 0x57, 0x89, 0x2a, 0xc5, 0x44, 0x1b, 0x64, 0xe7, 0x7f, 0x1a, 0x6e, 0xfe, 0xc7,
0xe4, 0x1f, 0x16, 0xec, 0xfc, 0xc3, 0x0d, 0x68, 0x17, 0xc5, 0xcd, 0xa6, 0xa3, 0x1a, 0xc4, 0x8a,
0x3a, 0x9d, 0x5c, 0x20, 0x09, 0x3a, 0xa3, 0x24, 0x4a, 0x32, 0x55, 0xfb, 0x93, 0x03, 0x7a, 0x0b,
0x3a, 0x16, 0xbe, 0xd8, 0x46, 0xcc, 0xf8, 0x59, 0x92, 0x3d, 0xd3, 0x69, 0x28, 0x35, 0x34, 0x65,
0x94, 0x46, 0x51, 0x46, 0xa1, 0x7f, 0xeb, 0x41, 0x4f, 0x48, 0x4a, 0x18, 0x4f, 0x0e, 0x92, 0x28,
0x1c, 0xcd, 0x51, 0x62, 0xb4, 0x50, 0xa8, 0xa2, 0xa0, 0x96, 0x18, 0x17, 0x2c, 0x6c, 0xbe, 0xf6,
0xe2, 0x95, 0xbc, 0x98, 0xb1, 0x90, 0x7c, 0x61, 0xbb, 0x8e, 0x82, 0x9c, 0x49, 0xb7, 0x5f, 0xe9,
0x6a, 0x07, 0x28, 0xd4, 0x87, 0x00, 0x64, 0x01, 0x67, 0xc3, 0x69, 0x18, 0x45, 0xa1, 0xc4, 0x95,
0x12, 0x5e, 0x37, 0x45, 0xff, 0xae, 0x01, 0x1d, 0xa5, 0x26, 0xee, 0x8f, 0x27, 0x32, 0xa3, 0xaa,
0x96, 0x6a, 0x44, 0xff, 0xd4, 0x83, 0x16, 0xee, 0x55, 0xbc, 0x06, 0x79, 0xbf, 0x58, 0x7a, 0xc3,
0xec, 0x9d, 0x27, 0x5f, 0x43, 0x09, 0x5c, 0x2a, 0xc8, 0x35, 0x2a, 0x05, 0xb9, 0xcb, 0xd0, 0x96,
0xa3, 0xa2, 0x82, 0x55, 0x00, 0xc8, 0x15, 0x68, 0x9e, 0x24, 0xa9, 0xb6, 0x61, 0xa0, 0xd3, 0x35,
0x49, 0xea, 0x23, 0x9c, 0x5e, 0x83, 0xd5, 0xc7, 0xc9, 0x98, 0x59, 0x31, 0xfd, 0xb9, 0xd7, 0x44,
0x7f, 0xd7, 0x83, 0x65, 0x8d, 0x4c, 0x76, 0xa0, 0x29, 0x4c, 0x51, 0xc9, 0xf9, 0x33, 0x49, 0x57,
0x81, 0xe7, 0x23, 0x86, 0x50, 0x21, 0x18, 0x41, 0x16, 0xae, 0x82, 0x8e, 0x1f, 0x0b, 0x23, 0x2c,
0x9c, 0x76, 0xdc, 0x73, 0xc9, 0x58, 0x95, 0xa0, 0xf4, 0x6f, 0x3d, 0xe8, 0x39, 0x6b, 0x08, 0x37,
0x3e, 0x0a, 0x72, 0xae, 0x12, 0x55, 0x8a, 0x89, 0x36, 0xc8, 0xce, 0xff, 0x34, 0xdc, 0xfc, 0x8f,
0xc9, 0x3f, 0x2c, 0xd8, 0xf9, 0x87, 0x1b, 0xd0, 0x2e, 0x8a, 0x9b, 0x4d, 0x47, 0x35, 0x88, 0x15,
0x75, 0x3a, 0xb9, 0x40, 0x12, 0x74, 0x46, 0x49, 0x94, 0x64, 0xaa, 0xf6, 0x27, 0x07, 0xf4, 0x16,
0x74, 0x2c, 0x7c, 0xb1, 0x8d, 0x98, 0xf1, 0xb3, 0x24, 0x7b, 0xa6, 0xd3, 0x50, 0x6a, 0x68, 0xca,
0x28, 0x8d, 0xa2, 0x8c, 0x42, 0xff, 0xce, 0x83, 0x9e, 0x90, 0x94, 0x30, 0x9e, 0x1c, 0x24, 0x51,
0x38, 0x9a, 0xa3, 0xc4, 0x68, 0xa1, 0x50, 0x45, 0x41, 0x2d, 0x31, 0x2e, 0x58, 0xd8, 0x7c, 0xed,
0xc5, 0x2b, 0x79, 0x31, 0x63, 0x21, 0xf9, 0xc2, 0x76, 0x1d, 0x05, 0x39, 0x93, 0x6e, 0xbf, 0xd2,
0xd5, 0x0e, 0x50, 0xa8, 0x0f, 0x01, 0xc8, 0x02, 0xce, 0x86, 0xd3, 0x30, 0x8a, 0x42, 0x89, 0x2b,
0x25, 0xbc, 0x6e, 0x8a, 0xfe, 0xa0, 0x01, 0x1d, 0xa5, 0x26, 0xee, 0x8f, 0x27, 0x32, 0xa3, 0xaa,
0x1c, 0x11, 0xf3, 0xfc, 0x2c, 0x88, 0x9e, 0x77, 0x5c, 0x17, 0x0b, 0x52, 0xbe, 0xd6, 0x85, 0xea,
0xb5, 0x5e, 0x86, 0xb6, 0x10, 0xaf, 0x9b, 0xe8, 0x23, 0xc9, 0x5a, 0x78, 0x01, 0xd0, 0xb3, 0x7b,
0x38, 0xdb, 0x2a, 0x66, 0x11, 0xe0, 0x78, 0x45, 0x8b, 0x25, 0xaf, 0xe8, 0x7d, 0xe8, 0x2a, 0x32,
@ -5838,9 +5847,9 @@ var fileDescriptor0 = []byte{
0x3c, 0x27, 0x1d, 0x89, 0xd9, 0x8d, 0x83, 0x57, 0x06, 0x7a, 0xb7, 0x60, 0x25, 0x93, 0xda, 0x47,
0xab, 0xa6, 0xe6, 0x4b, 0x54, 0x53, 0x2f, 0x73, 0xec, 0xce, 0xcf, 0xc3, 0x5a, 0x30, 0x3e, 0x65,
0x19, 0x0f, 0xd1, 0xe3, 0x47, 0xa3, 0x2f, 0x15, 0xea, 0xaa, 0x05, 0x47, 0x5b, 0xfc, 0x0e, 0xac,
0xaa, 0x02, 0xa7, 0xc1, 0x54, 0x1d, 0x2e, 0x05, 0x58, 0x20, 0xd2, 0xbf, 0xd2, 0xa9, 0x58, 0xf7,
0xaa, 0x02, 0xa7, 0xc1, 0x54, 0x1d, 0x2e, 0x05, 0x58, 0x20, 0xd2, 0xbf, 0xd6, 0xa9, 0x58, 0xf7,
0x0e, 0xcf, 0xe7, 0x88, 0x7d, 0xba, 0x46, 0xe9, 0x74, 0x3f, 0xa7, 0xd2, 0xa2, 0x63, 0x1d, 0x56,
0xa8, 0x04, 0xb5, 0x04, 0xaa, 0x34, 0xb6, 0xcb, 0xd2, 0xe6, 0xeb, 0xb0, 0x94, 0xfe, 0x60, 0x01,
0xa8, 0x04, 0xb5, 0x04, 0xaa, 0x34, 0xb6, 0xcb, 0xd2, 0xe6, 0xeb, 0xb0, 0x94, 0x7e, 0x7f, 0x01,
0x96, 0x3e, 0x8a, 0x4f, 0x93, 0x70, 0x84, 0x49, 0xca, 0x29, 0x9b, 0x26, 0xba, 0xcd, 0x40, 0xfc,
0x16, 0x16, 0x1d, 0x2b, 0x68, 0x29, 0x57, 0xd9, 0x43, 0x3d, 0x14, 0xd6, 0x2d, 0x2b, 0x5a, 0x6b,
0xa4, 0xa4, 0x58, 0x10, 0xe1, 0x1f, 0x66, 0x76, 0x5f, 0x91, 0x1a, 0x15, 0x7d, 0x1a, 0x2d, 0xab,
@ -5855,92 +5864,92 @@ var fileDescriptor0 = []byte{
0xb5, 0x60, 0xc3, 0x5e, 0x90, 0xfe, 0x32, 0x90, 0x47, 0x61, 0xce, 0xcd, 0xfe, 0x4c, 0xa8, 0x68,
0x32, 0x5e, 0x56, 0xa8, 0xa8, 0x60, 0x18, 0x2a, 0xde, 0x96, 0xa5, 0xd1, 0xf2, 0xc1, 0xae, 0xc1,
0x72, 0x28, 0x41, 0x5a, 0x0f, 0xaf, 0x28, 0x01, 0xd6, 0x98, 0x66, 0x5e, 0x38, 0x14, 0x0a, 0xe8,
0xa8, 0xf9, 0xef, 0x79, 0xb0, 0xa4, 0x8e, 0x26, 0xcc, 0xa1, 0xd3, 0xe1, 0x26, 0x0f, 0xe6, 0xc0,
0xa8, 0xf9, 0x1f, 0x78, 0xb0, 0xa4, 0x8e, 0x26, 0xcc, 0xa1, 0xd3, 0xe1, 0x26, 0x0f, 0xe6, 0xc0,
0xea, 0xfb, 0x86, 0xaa, 0x52, 0xb7, 0x50, 0x27, 0x75, 0x04, 0x9a, 0x69, 0xc0, 0x4f, 0xd0, 0x83,
0x6e, 0xfb, 0xf8, 0x5b, 0x47, 0x4a, 0x2d, 0x13, 0x29, 0xe9, 0x32, 0xb0, 0xda, 0x94, 0xc9, 0x5a,
0xde, 0x91, 0x65, 0xe0, 0x02, 0x5c, 0xf0, 0x40, 0x6d, 0xb0, 0xcc, 0x03, 0x85, 0xea, 0x9b, 0x79,
0x3a, 0x80, 0xfe, 0x3d, 0x16, 0x31, 0xce, 0x6e, 0x47, 0x51, 0x99, 0xfe, 0x1b, 0x70, 0xa9, 0x66,
0x4e, 0x59, 0xca, 0x07, 0xb0, 0x7e, 0x8f, 0x1d, 0xcd, 0x26, 0x8f, 0xd8, 0x69, 0x51, 0x56, 0x20,
0xd0, 0xcc, 0x4f, 0x92, 0x33, 0x75, 0x5f, 0xf8, 0x9b, 0x7c, 0x09, 0x20, 0x12, 0x38, 0xc3, 0x3c,
0x65, 0x23, 0xdd, 0xf4, 0x82, 0x90, 0xc3, 0x94, 0x8d, 0xe8, 0x7b, 0x40, 0x6c, 0x3a, 0xea, 0x08,
0xe2, 0x35, 0xce, 0x8e, 0x86, 0xf9, 0x3c, 0xe7, 0x6c, 0xaa, 0xbb, 0x79, 0x6c, 0x10, 0x7d, 0x07,
0xba, 0x07, 0xc1, 0xdc, 0x67, 0x9f, 0xab, 0xc6, 0x41, 0x11, 0x90, 0x05, 0x73, 0x21, 0x9e, 0x26,
0x20, 0xc3, 0x69, 0xfa, 0xf7, 0x0d, 0x58, 0x94, 0x98, 0x82, 0xea, 0x98, 0xe5, 0x3c, 0x8c, 0x65,
0x5a, 0x5d, 0x51, 0xb5, 0x40, 0x95, 0xfb, 0x6e, 0xd4, 0xdc, 0xb7, 0x72, 0x91, 0x74, 0x83, 0x80,
0xba, 0x58, 0x07, 0x86, 0xf1, 0x66, 0x38, 0x65, 0xb2, 0x7f, 0xb4, 0xa9, 0xe2, 0x4d, 0x0d, 0x28,
0x45, 0xbe, 0xc5, 0x9b, 0x97, 0xfb, 0xd3, 0x82, 0xa8, 0xcc, 0x82, 0x0d, 0xaa, 0xd5, 0x2c, 0x4b,
0xb2, 0xff, 0xaf, 0xa2, 0x59, 0x2a, 0x1a, 0x64, 0xf9, 0x35, 0x34, 0x88, 0xf4, 0x9b, 0x1c, 0x0d,
0x42, 0x60, 0xed, 0x01, 0x63, 0x3e, 0x4b, 0x93, 0x4c, 0x77, 0x5f, 0xd2, 0xef, 0x7b, 0xb0, 0xa6,
0x2c, 0x82, 0x99, 0x23, 0x6f, 0x3a, 0xe6, 0xc3, 0xab, 0xcb, 0xb4, 0xbe, 0x05, 0x3d, 0x0c, 0xa0,
0x44, 0x74, 0x84, 0xd1, 0x92, 0xca, 0x29, 0x38, 0x40, 0xb1, 0x27, 0x9d, 0x3b, 0x9c, 0x86, 0x91,
0x62, 0xb0, 0x0d, 0x12, 0xa6, 0x4e, 0x07, 0x58, 0xc8, 0x5e, 0xcf, 0x37, 0x63, 0x7a, 0x00, 0xeb,
0xd6, 0x7e, 0x95, 0x40, 0xdd, 0x02, 0x5d, 0x95, 0x94, 0x29, 0x02, 0xf9, 0x2e, 0xb6, 0x5d, 0xe3,
0x56, 0x7c, 0xe6, 0x20, 0xd3, 0x7f, 0xf6, 0x60, 0x43, 0x1a, 0x7a, 0xe5, 0x46, 0x99, 0x46, 0xa6,
0x45, 0xe9, 0xd9, 0x48, 0x81, 0xdf, 0xbf, 0xe0, 0xab, 0x31, 0xf9, 0xea, 0x6b, 0x3a, 0x27, 0xa6,
0x00, 0x78, 0x0e, 0x7b, 0x16, 0xea, 0xd8, 0xf3, 0x92, 0xc3, 0xd7, 0x05, 0xc0, 0xad, 0xda, 0x00,
0xf8, 0xce, 0x12, 0xb4, 0xf2, 0x51, 0x92, 0x32, 0xba, 0x05, 0x9b, 0xee, 0xe1, 0x24, 0xcb, 0xf6,
0xfe, 0xc5, 0x83, 0x15, 0x99, 0x8c, 0x93, 0x7d, 0xdd, 0x2c, 0x23, 0x22, 0xd6, 0xb2, 0xda, 0xc5,
0x89, 0x71, 0x35, 0xab, 0x6d, 0xe7, 0x83, 0x37, 0x6a, 0xe7, 0xb4, 0x9f, 0xfd, 0xdd, 0x1f, 0xfd,
0xfb, 0x9f, 0x36, 0x2e, 0xd2, 0xb5, 0xdd, 0xd3, 0x9b, 0xbb, 0xa8, 0x12, 0xd9, 0x19, 0x62, 0x7c,
0xe0, 0x5d, 0x13, 0xab, 0xd8, 0x9d, 0xe4, 0x66, 0x95, 0x9a, 0x8e, 0x74, 0xb3, 0x4a, 0x6d, 0xeb,
0xb9, 0xb3, 0xca, 0x0c, 0x31, 0xcc, 0x2a, 0x7b, 0xff, 0x35, 0x80, 0xb6, 0x09, 0x0a, 0xc9, 0xb7,
0xa1, 0xe7, 0x24, 0x1e, 0x89, 0x26, 0x5c, 0x97, 0xca, 0x1c, 0x5c, 0xae, 0x9f, 0x54, 0xcb, 0x5e,
0xc1, 0x65, 0xfb, 0x64, 0x4b, 0x2c, 0xab, 0xb2, 0x7d, 0xbb, 0x98, 0x91, 0x95, 0x9d, 0x0c, 0xcf,
0x60, 0xc5, 0x4d, 0x16, 0x92, 0xcb, 0xae, 0x68, 0x94, 0x56, 0xfb, 0xd2, 0x39, 0xb3, 0x6a, 0xb9,
0xcb, 0xb8, 0xdc, 0x16, 0xd9, 0xb4, 0x97, 0x33, 0xc1, 0x1a, 0xc3, 0xde, 0x13, 0xbb, 0xc5, 0x9c,
0x68, 0x7a, 0xf5, 0xad, 0xe7, 0x83, 0x4b, 0xd5, 0x76, 0x72, 0xd5, 0x7f, 0x4e, 0xfb, 0xb8, 0x14,
0x21, 0xc8, 0x50, 0xbb, 0xc3, 0x9c, 0x7c, 0x06, 0x6d, 0xd3, 0x76, 0x4a, 0xb6, 0xad, 0x5e, 0x5f,
0xbb, 0x17, 0x76, 0xd0, 0xaf, 0x4e, 0xd4, 0x5d, 0x95, 0x4d, 0x59, 0x08, 0xc4, 0x23, 0xb8, 0xa8,
0x2c, 0xf4, 0x11, 0xfb, 0x71, 0x4e, 0x52, 0xd3, 0x18, 0x7f, 0xc3, 0x23, 0xb7, 0x60, 0x59, 0x77,
0xf3, 0x92, 0xad, 0xfa, 0xae, 0xe4, 0xc1, 0x76, 0x05, 0xae, 0xf4, 0xc8, 0x6d, 0x80, 0xa2, 0xf1,
0x94, 0xf4, 0xcf, 0xeb, 0x8f, 0x35, 0x4c, 0xac, 0xe9, 0x52, 0x9d, 0x60, 0xdf, 0xad, 0xdb, 0xd7,
0x4a, 0xbe, 0x5c, 0xe0, 0xd7, 0x76, 0xbc, 0xbe, 0x84, 0x20, 0xdd, 0x42, 0xde, 0xad, 0x91, 0x15,
0xc1, 0xbb, 0x98, 0x9d, 0xe9, 0x2e, 0xac, 0x7b, 0xd0, 0xb1, 0x9a, 0x59, 0x89, 0xa6, 0x50, 0x6d,
0x84, 0x1d, 0x0c, 0xea, 0xa6, 0xd4, 0x76, 0x7f, 0x1d, 0x7a, 0x4e, 0x57, 0xaa, 0x79, 0x19, 0x75,
0x3d, 0xaf, 0xe6, 0x65, 0xd4, 0x37, 0xb2, 0x7e, 0x0b, 0x3a, 0x56, 0x0f, 0x29, 0xb1, 0x2a, 0xda,
0xa5, 0x1e, 0x51, 0xb3, 0xa3, 0x9a, 0x96, 0x53, 0xba, 0x89, 0xe7, 0x5d, 0xa1, 0x6d, 0x71, 0x5e,
0x6c, 0x45, 0x12, 0x42, 0xf2, 0x6d, 0x58, 0x71, 0x7b, 0x47, 0xcd, 0xab, 0xaa, 0xed, 0x42, 0x35,
0xaf, 0xea, 0x9c, 0x86, 0x53, 0x25, 0x90, 0xd7, 0x36, 0xcc, 0x22, 0xbb, 0x5f, 0xa8, 0x94, 0xe8,
0x0b, 0xf2, 0x0d, 0xa1, 0x3a, 0x54, 0x6f, 0x18, 0x29, 0x7a, 0x69, 0xdd, 0x0e, 0x32, 0x23, 0xed,
0x95, 0x36, 0x32, 0xba, 0x8e, 0xc4, 0x3b, 0xa4, 0x38, 0x01, 0xf9, 0x18, 0x96, 0x54, 0x8f, 0x18,
0xb9, 0x58, 0x48, 0xb5, 0x95, 0x40, 0x1a, 0x6c, 0x95, 0xc1, 0x8a, 0xd8, 0x06, 0x12, 0xeb, 0x91,
0x8e, 0x20, 0x36, 0x61, 0x3c, 0x14, 0x34, 0x62, 0x58, 0x2d, 0x55, 0xb1, 0xcc, 0x63, 0xa9, 0xaf,
0x81, 0x0f, 0xae, 0xbc, 0xbc, 0xf8, 0xe5, 0xaa, 0x19, 0xad, 0x5e, 0x76, 0x75, 0xcb, 0xc2, 0x6f,
0x41, 0xd7, 0x6e, 0x49, 0x34, 0x3a, 0xbb, 0xa6, 0x7d, 0xd1, 0xe8, 0xec, 0xba, 0x1e, 0x46, 0x7d,
0xb9, 0xa4, 0x6b, 0x2f, 0x43, 0xbe, 0x05, 0xab, 0x56, 0xbd, 0xf4, 0x70, 0x1e, 0x8f, 0x8c, 0xf0,
0x54, 0xbb, 0x5b, 0x06, 0x75, 0x96, 0x96, 0x6e, 0x23, 0xe1, 0x75, 0xea, 0x10, 0x16, 0x82, 0x73,
0x17, 0x3a, 0x76, 0x2d, 0xf6, 0x25, 0x74, 0xb7, 0xad, 0x29, 0xbb, 0xd9, 0xe3, 0x86, 0x47, 0xfe,
0xdc, 0x83, 0xae, 0xdd, 0x37, 0x45, 0x9c, 0x2c, 0x4c, 0x89, 0x4e, 0xdf, 0x9e, 0xb3, 0x09, 0xd1,
0xc7, 0xb8, 0xc9, 0xfd, 0x6b, 0x0f, 0x1c, 0x26, 0x7f, 0xe1, 0x38, 0x51, 0xd7, 0xed, 0x7f, 0x7a,
0xbc, 0x28, 0x4f, 0xda, 0xdd, 0x3f, 0x2f, 0x6e, 0x78, 0xe4, 0x03, 0xf9, 0xcf, 0x1f, 0x1d, 0xd0,
0x10, 0x4b, 0xb1, 0x95, 0xd9, 0x65, 0xff, 0x49, 0x66, 0xc7, 0xbb, 0xe1, 0x91, 0xdf, 0x96, 0x7f,
0xee, 0x50, 0xdf, 0x22, 0xd7, 0x5f, 0xf7, 0x7b, 0xfa, 0x16, 0x9e, 0xe4, 0x0a, 0xbd, 0xe4, 0x9c,
0xa4, 0xac, 0xd9, 0x0f, 0x00, 0x8a, 0xe8, 0x94, 0x94, 0x42, 0x35, 0xa3, 0xf3, 0xaa, 0x01, 0xac,
0x7b, 0x9b, 0x3a, 0xa2, 0x13, 0x14, 0x3f, 0x93, 0x82, 0xa8, 0xf0, 0x73, 0x73, 0x9d, 0xd5, 0x28,
0x73, 0x30, 0xa8, 0x9b, 0xaa, 0x13, 0x43, 0x4d, 0x9f, 0x3c, 0x85, 0xde, 0xa3, 0x24, 0x79, 0x36,
0x4b, 0x4d, 0xc6, 0xc3, 0x0d, 0xac, 0x44, 0x28, 0x3c, 0x28, 0x9d, 0x82, 0x5e, 0x45, 0x52, 0x03,
0xd2, 0xb7, 0x48, 0xed, 0x7e, 0x51, 0xc4, 0xc6, 0x2f, 0x48, 0x00, 0xeb, 0xc6, 0xbe, 0x99, 0x8d,
0x0f, 0x5c, 0x32, 0x76, 0x88, 0x5a, 0x59, 0xc2, 0xf1, 0x38, 0xf4, 0x6e, 0x77, 0x73, 0x4d, 0xf3,
0x86, 0x47, 0x0e, 0xa0, 0x7b, 0x8f, 0x8d, 0x92, 0x31, 0x53, 0xa1, 0xd0, 0x46, 0xb1, 0x71, 0x13,
0x43, 0x0d, 0x7a, 0x0e, 0xd0, 0x7d, 0xf1, 0x69, 0x30, 0xcf, 0xd8, 0xe7, 0xbb, 0x5f, 0xa8, 0x20,
0xeb, 0x85, 0x7e, 0xf1, 0x3a, 0x30, 0x74, 0x5e, 0x7c, 0x29, 0x92, 0x74, 0x5e, 0x7c, 0x25, 0x92,
0x74, 0x58, 0xad, 0x03, 0x53, 0x12, 0x89, 0xf8, 0xb2, 0x14, 0x7c, 0x1a, 0x2b, 0x79, 0x5e, 0xc8,
0x3a, 0xb8, 0x7a, 0x3e, 0x82, 0xbb, 0xda, 0x35, 0x77, 0xb5, 0x43, 0xe8, 0xdd, 0x63, 0x92, 0x59,
0xb2, 0x8a, 0x30, 0x70, 0x55, 0x88, 0x5d, 0x71, 0x28, 0xab, 0x17, 0x9c, 0x73, 0x55, 0x3a, 0xa6,
0xf0, 0xc9, 0x67, 0xd0, 0x79, 0xc8, 0xb8, 0x2e, 0x1b, 0x18, 0x5f, 0xa3, 0x54, 0x47, 0x18, 0xd4,
0x54, 0x1d, 0x5c, 0x99, 0x41, 0x6a, 0xbb, 0x6c, 0x3c, 0x61, 0xf2, 0xb1, 0x0f, 0xc3, 0xf1, 0x0b,
0xf2, 0x1b, 0x48, 0xdc, 0x54, 0x1a, 0xb7, 0xac, 0x6c, 0xb3, 0x4d, 0x7c, 0xb5, 0x04, 0xaf, 0xa3,
0x1c, 0x27, 0x63, 0x66, 0x19, 0xb7, 0x18, 0x3a, 0x56, 0x59, 0xd9, 0x3c, 0xa0, 0x6a, 0xad, 0xda,
0x3c, 0xa0, 0x9a, 0x2a, 0x34, 0xdd, 0xc1, 0x75, 0x28, 0xb9, 0x5a, 0xac, 0x23, 0x2b, 0xcf, 0xc5,
0x4a, 0xbb, 0x5f, 0x04, 0x53, 0xfe, 0x82, 0x7c, 0x8a, 0x0d, 0xd3, 0x76, 0x69, 0xa4, 0xf0, 0x75,
0xca, 0x55, 0x14, 0xc3, 0x2c, 0x6b, 0xca, 0xf5, 0x7f, 0xe4, 0x52, 0x68, 0x03, 0xbf, 0x0a, 0x70,
0xc8, 0x93, 0xf4, 0x5e, 0xc0, 0xa6, 0x49, 0x5c, 0x68, 0xae, 0x22, 0xfd, 0x5f, 0x68, 0x2e, 0xab,
0x06, 0x40, 0x3e, 0xb5, 0xbc, 0x4d, 0xa7, 0xb2, 0xa4, 0x85, 0xeb, 0xdc, 0x0a, 0x81, 0x61, 0x48,
0x4d, 0x95, 0xe0, 0x86, 0x27, 0x7c, 0xc7, 0x22, 0xd5, 0x61, 0x7c, 0xc7, 0x4a, 0x16, 0xc5, 0xa8,
0xbd, 0x9a, 0xbc, 0xc8, 0x01, 0xb4, 0x8b, 0x78, 0x5b, 0x9b, 0xa3, 0x72, 0x74, 0x6e, 0xec, 0x4b,
0x25, 0x0c, 0xa6, 0x6b, 0xc8, 0x2a, 0x20, 0xcb, 0x82, 0x55, 0x58, 0x19, 0x0f, 0x61, 0x43, 0x6e,
0xd0, 0x18, 0x4b, 0x4c, 0x68, 0xeb, 0x93, 0xd4, 0x84, 0xbd, 0xe6, 0x35, 0xd7, 0x45, 0x8d, 0xf4,
0x12, 0xae, 0xb0, 0x41, 0x57, 0xb4, 0xde, 0x97, 0xc9, 0xf4, 0x0f, 0xbc, 0x6b, 0x47, 0x8b, 0xf8,
0x37, 0xe5, 0xaf, 0xfc, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x5b, 0xbc, 0xec, 0xef, 0xd8, 0x3c,
0x00, 0x00,
0x6e, 0xfb, 0xf8, 0x5b, 0x47, 0x4a, 0xad, 0x22, 0x52, 0xaa, 0x6b, 0x45, 0x93, 0x3a, 0xa3, 0x02,
0xd7, 0x25, 0x63, 0x75, 0x00, 0x93, 0xe1, 0xbc, 0x23, 0x4b, 0xc6, 0x05, 0xb8, 0xe0, 0x97, 0x22,
0x51, 0xe6, 0x97, 0x42, 0xf5, 0xcd, 0x3c, 0x1d, 0x40, 0xff, 0x1e, 0x8b, 0x18, 0x67, 0xb7, 0xa3,
0xa8, 0x4c, 0xff, 0x0d, 0xb8, 0x54, 0x33, 0xa7, 0xac, 0xea, 0x03, 0x58, 0xbf, 0xc7, 0x8e, 0x66,
0x93, 0x47, 0xec, 0xb4, 0x28, 0x41, 0x10, 0x68, 0xe6, 0x27, 0xc9, 0x99, 0xba, 0x5b, 0xfc, 0x4d,
0xbe, 0x04, 0x10, 0x09, 0x9c, 0x61, 0x9e, 0xb2, 0x91, 0x6e, 0x90, 0x41, 0xc8, 0x61, 0xca, 0x46,
0xf4, 0x3d, 0x20, 0x36, 0x1d, 0x75, 0x04, 0xf1, 0x72, 0x67, 0x47, 0xc3, 0x7c, 0x9e, 0x73, 0x36,
0xd5, 0x9d, 0x3f, 0x36, 0x88, 0xbe, 0x03, 0xdd, 0x83, 0x60, 0xee, 0xb3, 0xcf, 0x55, 0x93, 0xa1,
0x08, 0xde, 0x82, 0xb9, 0x10, 0x65, 0x13, 0xbc, 0xe1, 0x34, 0xfd, 0xfb, 0x06, 0x2c, 0x4a, 0x4c,
0x41, 0x75, 0xcc, 0x72, 0x1e, 0xc6, 0x32, 0x05, 0xaf, 0xa8, 0x5a, 0xa0, 0x8a, 0x6c, 0x34, 0x6a,
0x64, 0x43, 0xb9, 0x53, 0xba, 0x99, 0x40, 0x09, 0x81, 0x03, 0xc3, 0xd8, 0x34, 0x9c, 0x32, 0xd9,
0x6b, 0xda, 0x54, 0xb1, 0xa9, 0x06, 0x94, 0xa2, 0xe4, 0x42, 0x3f, 0xc8, 0xfd, 0x69, 0xa1, 0x55,
0xe2, 0x60, 0x83, 0x6a, 0xb5, 0xd0, 0x92, 0x94, 0x9a, 0x8a, 0x16, 0xaa, 0x68, 0x9b, 0xe5, 0xd7,
0xd0, 0x36, 0xd2, 0xc7, 0x72, 0xb4, 0x0d, 0x81, 0xb5, 0x07, 0x8c, 0xf9, 0x2c, 0x4d, 0x32, 0xdd,
0xa9, 0x49, 0xbf, 0xe7, 0xc1, 0x9a, 0xb2, 0x1e, 0x66, 0x8e, 0xbc, 0xe9, 0x98, 0x1a, 0xaf, 0x2e,
0x2b, 0xfb, 0x16, 0xf4, 0x30, 0xd8, 0x12, 0x91, 0x14, 0x46, 0x56, 0x2a, 0xff, 0xe0, 0x00, 0xc5,
0x9e, 0x74, 0x9e, 0x71, 0x1a, 0x46, 0x8a, 0xc1, 0x36, 0x48, 0x98, 0x45, 0x1d, 0x8c, 0x21, 0x7b,
0x3d, 0xdf, 0x8c, 0xe9, 0x01, 0xac, 0x5b, 0xfb, 0x55, 0x02, 0x75, 0x0b, 0x74, 0x05, 0x53, 0xa6,
0x13, 0xe4, 0xbb, 0xd8, 0x76, 0x0d, 0x61, 0xf1, 0x99, 0x83, 0x4c, 0xff, 0xd9, 0x83, 0x0d, 0xe9,
0x14, 0x28, 0x97, 0xcb, 0x34, 0x3d, 0x2d, 0x4a, 0x2f, 0x48, 0x0a, 0xfc, 0xfe, 0x05, 0x5f, 0x8d,
0xc9, 0x57, 0x5f, 0xd3, 0x91, 0x31, 0xc5, 0xc2, 0x73, 0xd8, 0xb3, 0x50, 0xc7, 0x9e, 0x97, 0x1c,
0xbe, 0x2e, 0x58, 0x6e, 0xd5, 0x06, 0xcb, 0x77, 0x96, 0xa0, 0x95, 0x8f, 0x92, 0x94, 0xd1, 0x2d,
0xd8, 0x74, 0x0f, 0x27, 0x59, 0xb6, 0xf7, 0x2f, 0x1e, 0xac, 0xc8, 0xc4, 0x9d, 0xec, 0x01, 0x67,
0x19, 0x11, 0x71, 0x99, 0xd5, 0x5a, 0x4e, 0x8c, 0x5b, 0x5a, 0x6d, 0x51, 0x1f, 0xbc, 0x51, 0x3b,
0xa7, 0x7d, 0xf2, 0xef, 0xfe, 0xe8, 0xdf, 0xff, 0xac, 0x71, 0x91, 0xae, 0xed, 0x9e, 0xde, 0xdc,
0x45, 0xf5, 0xc9, 0xce, 0x10, 0xe3, 0x03, 0xef, 0x9a, 0x58, 0xc5, 0xee, 0x3a, 0x37, 0xab, 0xd4,
0x74, 0xaf, 0x9b, 0x55, 0x6a, 0xdb, 0xd4, 0x9d, 0x55, 0x66, 0x88, 0x61, 0x56, 0xd9, 0xfb, 0xaf,
0x01, 0xb4, 0x4d, 0x00, 0x49, 0xbe, 0x0d, 0x3d, 0x27, 0x49, 0x49, 0x34, 0xe1, 0xba, 0xb4, 0xe7,
0xe0, 0x72, 0xfd, 0xa4, 0x5a, 0xf6, 0x0a, 0x2e, 0xdb, 0x27, 0x5b, 0x62, 0x59, 0x95, 0x19, 0xdc,
0xc5, 0xec, 0xad, 0xec, 0x7a, 0x78, 0x06, 0x2b, 0x6e, 0x62, 0x91, 0x5c, 0x76, 0x45, 0xa3, 0xb4,
0xda, 0x97, 0xce, 0x99, 0x55, 0xcb, 0x5d, 0xc6, 0xe5, 0xb6, 0xc8, 0xa6, 0xbd, 0x9c, 0x09, 0xec,
0x18, 0xf6, 0xa9, 0xd8, 0xed, 0xe8, 0x44, 0xd3, 0xab, 0x6f, 0x53, 0x1f, 0x5c, 0xaa, 0xb6, 0x9e,
0xab, 0x5e, 0x75, 0xda, 0xc7, 0xa5, 0x08, 0x41, 0x86, 0xda, 0xdd, 0xe8, 0xe4, 0x33, 0x68, 0x9b,
0x16, 0x55, 0xb2, 0x6d, 0xf5, 0x05, 0xdb, 0x7d, 0xb3, 0x83, 0x7e, 0x75, 0xa2, 0xee, 0xaa, 0x6c,
0xca, 0x42, 0x20, 0x1e, 0xc1, 0x45, 0x65, 0xcd, 0x8f, 0xd8, 0x8f, 0x73, 0x92, 0x9a, 0x26, 0xfa,
0x1b, 0x1e, 0xb9, 0x05, 0xcb, 0xba, 0xf3, 0x97, 0x6c, 0xd5, 0x77, 0x30, 0x0f, 0xb6, 0x2b, 0x70,
0xa5, 0x47, 0x6e, 0x03, 0x14, 0x4d, 0xaa, 0xa4, 0x7f, 0x5e, 0x2f, 0xad, 0x61, 0x62, 0x4d, 0x47,
0xeb, 0x04, 0x7b, 0x74, 0xdd, 0x1e, 0x58, 0xf2, 0xe5, 0x02, 0xbf, 0xb6, 0x3b, 0xf6, 0x25, 0x04,
0xe9, 0x16, 0xf2, 0x6e, 0x8d, 0xac, 0x08, 0xde, 0xc5, 0xec, 0x4c, 0x77, 0x6c, 0xdd, 0x83, 0x8e,
0xd5, 0xf8, 0x4a, 0x34, 0x85, 0x6a, 0xd3, 0xec, 0x60, 0x50, 0x37, 0xa5, 0xb6, 0xfb, 0xeb, 0xd0,
0x73, 0x3a, 0x58, 0xcd, 0xcb, 0xa8, 0xeb, 0x8f, 0x35, 0x2f, 0xa3, 0xbe, 0xe9, 0xf5, 0x5b, 0xd0,
0xb1, 0xfa, 0x4d, 0x89, 0x55, 0xfd, 0x2e, 0xf5, 0x93, 0x9a, 0x1d, 0xd5, 0xb4, 0xa7, 0xd2, 0x4d,
0x3c, 0xef, 0x0a, 0x6d, 0x8b, 0xf3, 0x62, 0xdb, 0x92, 0x10, 0x92, 0x6f, 0xc3, 0x8a, 0xdb, 0x67,
0x6a, 0x5e, 0x55, 0x6d, 0xc7, 0xaa, 0x79, 0x55, 0xe7, 0x34, 0xa7, 0x2a, 0x81, 0xbc, 0xb6, 0x61,
0x16, 0xd9, 0xfd, 0x42, 0xa5, 0x4f, 0x5f, 0x90, 0x6f, 0x08, 0xd5, 0xa1, 0xfa, 0xc8, 0x48, 0xd1,
0x77, 0xeb, 0x76, 0x9b, 0x19, 0x69, 0xaf, 0xb4, 0x9c, 0xd1, 0x75, 0x24, 0xde, 0x21, 0xc5, 0x09,
0xc8, 0xc7, 0xb0, 0xa4, 0xfa, 0xc9, 0xc8, 0xc5, 0x42, 0xaa, 0xad, 0x64, 0xd3, 0x60, 0xab, 0x0c,
0x56, 0xc4, 0x36, 0x90, 0x58, 0x8f, 0x74, 0x04, 0xb1, 0x09, 0xe3, 0xa1, 0xa0, 0x11, 0xc3, 0x6a,
0xa9, 0xe2, 0x65, 0x1e, 0x4b, 0x7d, 0xbd, 0x7c, 0x70, 0xe5, 0xe5, 0x85, 0x32, 0x57, 0xcd, 0x68,
0xf5, 0xb2, 0xab, 0xdb, 0x1b, 0x7e, 0x0b, 0xba, 0x76, 0xfb, 0xa2, 0xd1, 0xd9, 0x35, 0xad, 0x8e,
0x46, 0x67, 0xd7, 0xf5, 0x3b, 0xea, 0xcb, 0x25, 0x5d, 0x7b, 0x19, 0xf2, 0x2d, 0x58, 0xb5, 0x6a,
0xab, 0x87, 0xf3, 0x78, 0x64, 0x84, 0xa7, 0xda, 0x09, 0x33, 0xa8, 0xb3, 0xb4, 0x74, 0x1b, 0x09,
0xaf, 0x53, 0x87, 0xb0, 0x10, 0x9c, 0xbb, 0xd0, 0xb1, 0xeb, 0xb6, 0x2f, 0xa1, 0xbb, 0x6d, 0x4d,
0xd9, 0x8d, 0x21, 0x37, 0x3c, 0xf2, 0x17, 0x1e, 0x74, 0xed, 0x1e, 0x2b, 0xe2, 0x64, 0x6c, 0x4a,
0x74, 0xfa, 0xf6, 0x9c, 0x4d, 0x88, 0x3e, 0xc6, 0x4d, 0xee, 0x5f, 0x7b, 0xe0, 0x30, 0xf9, 0x0b,
0xc7, 0x89, 0xba, 0x6e, 0xff, 0x2b, 0xe4, 0x45, 0x79, 0xd2, 0xee, 0x14, 0x7a, 0x71, 0xc3, 0x23,
0x1f, 0xc8, 0x7f, 0x09, 0xe9, 0xe0, 0x87, 0x58, 0x8a, 0xad, 0xcc, 0x2e, 0xfb, 0x0f, 0x35, 0x3b,
0xde, 0x0d, 0x8f, 0xfc, 0xb6, 0xfc, 0x23, 0x88, 0xfa, 0x16, 0xb9, 0xfe, 0xba, 0xdf, 0xd3, 0xb7,
0xf0, 0x24, 0x57, 0xe8, 0x25, 0xe7, 0x24, 0x65, 0xcd, 0x7e, 0x00, 0x50, 0x44, 0xb2, 0xa4, 0x14,
0xd6, 0x19, 0x9d, 0x57, 0x0d, 0x76, 0xdd, 0xdb, 0xd4, 0xd1, 0x9f, 0xa0, 0xf8, 0x99, 0x14, 0x44,
0x85, 0x9f, 0x9b, 0xeb, 0xac, 0x46, 0xa4, 0x83, 0x41, 0xdd, 0x54, 0x9d, 0x18, 0x6a, 0xfa, 0xe4,
0x29, 0xf4, 0x1e, 0x25, 0xc9, 0xb3, 0x59, 0x6a, 0xb2, 0x23, 0x6e, 0x60, 0x25, 0xc2, 0xe6, 0x41,
0xe9, 0x14, 0xf4, 0x2a, 0x92, 0x1a, 0x90, 0xbe, 0x45, 0x6a, 0xf7, 0x8b, 0x22, 0x8e, 0x7e, 0x41,
0x02, 0x58, 0x37, 0xf6, 0xcd, 0x6c, 0x7c, 0xe0, 0x92, 0xb1, 0xc3, 0xd9, 0xca, 0x12, 0x8e, 0xc7,
0xa1, 0x77, 0xbb, 0x9b, 0x6b, 0x9a, 0x37, 0x3c, 0x72, 0x00, 0xdd, 0x7b, 0x6c, 0x94, 0x8c, 0x99,
0x0a, 0x85, 0x36, 0x8a, 0x8d, 0x9b, 0x18, 0x6a, 0xd0, 0x73, 0x80, 0xee, 0x8b, 0x4f, 0x83, 0x79,
0xc6, 0x3e, 0xdf, 0xfd, 0x42, 0x05, 0x59, 0x2f, 0xf4, 0x8b, 0xd7, 0x81, 0xa1, 0xf3, 0xe2, 0x4b,
0x91, 0xa4, 0xf3, 0xe2, 0x2b, 0x91, 0xa4, 0xc3, 0x6a, 0x1d, 0x98, 0x92, 0x48, 0xc4, 0x97, 0xa5,
0xe0, 0xd3, 0x58, 0xc9, 0xf3, 0x42, 0xd6, 0xc1, 0xd5, 0xf3, 0x11, 0xdc, 0xd5, 0xae, 0xb9, 0xab,
0x1d, 0x42, 0xef, 0x1e, 0x93, 0xcc, 0x92, 0x15, 0x87, 0x81, 0xab, 0x42, 0xec, 0xea, 0x44, 0x59,
0xbd, 0xe0, 0x9c, 0xab, 0xd2, 0x31, 0xdd, 0x4f, 0x3e, 0x83, 0xce, 0x43, 0xc6, 0x75, 0x89, 0xc1,
0xf8, 0x1a, 0xa5, 0x9a, 0xc3, 0xa0, 0xa6, 0x42, 0xe1, 0xca, 0x0c, 0x52, 0xdb, 0x65, 0xe3, 0x09,
0x93, 0x8f, 0x7d, 0x18, 0x8e, 0x5f, 0x90, 0xdf, 0x40, 0xe2, 0xa6, 0x2a, 0xb9, 0x65, 0x65, 0xa6,
0x6d, 0xe2, 0xab, 0x25, 0x78, 0x1d, 0xe5, 0x38, 0x19, 0x33, 0xcb, 0xb8, 0xc5, 0xd0, 0xb1, 0x4a,
0xd0, 0xe6, 0x01, 0x55, 0xeb, 0xda, 0xe6, 0x01, 0xd5, 0x54, 0xac, 0xe9, 0x0e, 0xae, 0x43, 0xc9,
0xd5, 0x62, 0x1d, 0x59, 0xa5, 0x2e, 0x56, 0xda, 0xfd, 0x22, 0x98, 0xf2, 0x17, 0xe4, 0x53, 0x6c,
0xae, 0xb6, 0xcb, 0x28, 0x85, 0xaf, 0x53, 0xae, 0xb8, 0x18, 0x66, 0x59, 0x53, 0xae, 0xff, 0x23,
0x97, 0x42, 0x1b, 0xf8, 0x55, 0x80, 0x43, 0x9e, 0xa4, 0xf7, 0x02, 0x36, 0x4d, 0xe2, 0x42, 0x73,
0x15, 0xa5, 0x82, 0x42, 0x73, 0x59, 0xf5, 0x02, 0xf2, 0xa9, 0xe5, 0x6d, 0x3a, 0x55, 0x28, 0x2d,
0x5c, 0xe7, 0x56, 0x13, 0x0c, 0x43, 0x6a, 0x2a, 0x0a, 0x37, 0x3c, 0xe1, 0x3b, 0x16, 0xa9, 0x0e,
0xe3, 0x3b, 0x56, 0xb2, 0x28, 0x46, 0xed, 0xd5, 0xe4, 0x45, 0x0e, 0xa0, 0x5d, 0xc4, 0xdb, 0xda,
0x1c, 0x95, 0xa3, 0x73, 0x63, 0x5f, 0x2a, 0x61, 0x30, 0x5d, 0x43, 0x56, 0x01, 0x59, 0x16, 0xac,
0xc2, 0x2a, 0x7a, 0x08, 0x1b, 0x72, 0x83, 0xc6, 0x58, 0x62, 0xf2, 0x5b, 0x9f, 0xa4, 0x26, 0xec,
0x35, 0xaf, 0xb9, 0x2e, 0x6a, 0xa4, 0x97, 0x70, 0x85, 0x0d, 0xba, 0xa2, 0xf5, 0xbe, 0x4c, 0xbc,
0x7f, 0xe0, 0x5d, 0x3b, 0x5a, 0xc4, 0xbf, 0x34, 0x7f, 0xe5, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff,
0x74, 0x60, 0x2b, 0x2e, 0x04, 0x3d, 0x00, 0x00,
}

4
lnrpc/rpc.proto
View File

@ -1337,6 +1337,7 @@ message InvoiceSubscription {
message Payment {
/// The payment hash
string payment_hash = 1 [json_name = "payment_hash"];
/// The value of the payment in satoshis
int64 value = 2 [json_name = "value"];
@ -1348,6 +1349,9 @@ message Payment {
/// The fee paid for this payment in satoshis
int64 fee = 5 [json_name = "fee"];
/// The payment preimage
string payment_preimage = 6 [json_name = "payment_preimage"];
}
message ListPaymentsRequest {

4
lnrpc/rpc.swagger.json
View File

@ -1676,6 +1676,10 @@
"type": "string",
"format": "int64",
"title": "/ The fee paid for this payment in satoshis"
},
"payment_preimage": {
"type": "string",
"title": "/ The payment preimage"
}
}
},

18
rpcserver.go
View File

@ -1473,7 +1473,7 @@ func (r *rpcServer) ListChannels(ctx context.Context,
// savePayment saves a successfully completed payment to the database for
// historical record keeping.
func (r *rpcServer) savePayment(route *routing.Route, amount lnwire.MilliSatoshi, rHash []byte) error {
func (r *rpcServer) savePayment(route *routing.Route, amount lnwire.MilliSatoshi, preImage []byte) error {
paymentPath := make([][33]byte, len(route.Hops))
for i, hop := range route.Hops {
@ -1492,7 +1492,7 @@ func (r *rpcServer) savePayment(route *routing.Route, amount lnwire.MilliSatoshi
Fee: route.TotalFees,
TimeLockLength: route.TotalTimeLock,
}
copy(payment.PaymentHash[:], rHash)
copy(payment.PaymentPreimage[:], preImage)
return r.server.chanDB.AddPayment(payment)
}
@ -1742,7 +1742,7 @@ func (r *rpcServer) SendPayment(paymentStream lnrpc.Lightning_SendPaymentServer)
// Save the completed payment to the database
// for record keeping purposes.
if err := r.savePayment(route, p.msat, rHash[:]); err != nil {
if err := r.savePayment(route, p.msat, preImage[:]); err != nil {
errChan <- err
return
}
@ -1885,7 +1885,7 @@ func (r *rpcServer) SendPaymentSync(ctx context.Context,
// With the payment completed successfully, we now ave the details of
// the completed payment to the database for historical record keeping.
if err := r.savePayment(route, amtMSat, rHash[:]); err != nil {
if err := r.savePayment(route, amtMSat, preImage[:]); err != nil {
return nil, err
}
@ -2933,11 +2933,13 @@ func (r *rpcServer) ListPayments(ctx context.Context,
path[i] = hex.EncodeToString(hop[:])
}
paymentHash := sha256.Sum256(payment.PaymentPreimage[:])
paymentsResp.Payments[i] = &lnrpc.Payment{
PaymentHash: hex.EncodeToString(payment.PaymentHash[:]),
Value: int64(payment.Terms.Value.ToSatoshis()),
CreationDate: payment.CreationDate.Unix(),
Path: path,
PaymentHash: hex.EncodeToString(paymentHash[:]),
Value: int64(payment.Terms.Value.ToSatoshis()),
CreationDate: payment.CreationDate.Unix(),
Path: path,
PaymentPreimage: hex.EncodeToString(payment.PaymentPreimage[:]),
}
}