lnd: Add payment hash to SendResponse

This commit is contained in:
carla
2018-12-05 08:57:44 +02:00
parent 640fe2558b
commit b2adfca67e
4 changed files with 421 additions and 404 deletions

View File

@@ -2638,6 +2638,7 @@ func (r *rpcServer) sendPayment(stream *paymentStream) error {
if err != nil {
if err := stream.send(&lnrpc.SendResponse{
PaymentError: err.Error(),
PaymentHash: payIntent.rHash[:],
}); err != nil {
select {
case errChan <- err:
@@ -2696,6 +2697,7 @@ func (r *rpcServer) sendPayment(stream *paymentStream) error {
case resp.Err != nil:
err := stream.send(&lnrpc.SendResponse{
PaymentError: resp.Err.Error(),
PaymentHash: payIntent.rHash[:],
})
if err != nil {
errChan <- err
@@ -2705,6 +2707,7 @@ func (r *rpcServer) sendPayment(stream *paymentStream) error {
marshalledRouted := r.marshallRoute(resp.Route)
err := stream.send(&lnrpc.SendResponse{
PaymentHash: payIntent.rHash[:],
PaymentPreimage: resp.Preimage[:],
PaymentRoute: marshalledRouted,
})
@@ -2789,10 +2792,12 @@ func (r *rpcServer) sendPaymentSync(ctx context.Context,
case resp.Err != nil:
return &lnrpc.SendResponse{
PaymentError: resp.Err.Error(),
PaymentHash: payIntent.rHash[:],
}, nil
}
return &lnrpc.SendResponse{
PaymentHash: payIntent.rHash[:],
PaymentPreimage: resp.Preimage[:],
PaymentRoute: r.marshallRoute(resp.Route),
}, nil