BACKPORT-CONFLICT

Author: ziggie1984

lnrpc/routerrpc/router_server.go

@@ -553,6 +553,7 @@ func (s *Server) probePaymentRequest(ctx context.Context, paymentRequest string,
 	// If the payment addresses is specified, then we'll also populate that
 	// now as well.
 	payReq.PaymentAddr.WhenSome(func(addr [32]byte) {
+		probeRequest.PaymentAddr = make([]byte, lntypes.HashSize)
 		copy(probeRequest.PaymentAddr, addr[:])
 	})
 
@@ -584,12 +585,112 @@ func (s *Server) probePaymentRequest(ctx context.Context, paymentRequest string,
 
 	log.Infof("LSP detected, probing LSP with destination: %x", lspDest)
 
+<<<<<<< HEAD
 	// The adjusted route hints serve the payment probe to find the last
 	// public hop to the LSP on the route.
 	if len(lspAdjustedRouteHints) > 0 {
 		probeRequest.RouteHints = invoicesrpc.CreateRPCRouteHints(
 			lspAdjustedRouteHints,
 		)
+=======
+	for lspKey, group := range lspGroups {
+		if probeCount >= MaxLspsToProbe {
+			break
+		}
+		probeCount++
+
+		lspHint := group.LspHopHint
+
+		log.Infof("Probing LSP with destination: %v", lspKey)
+
+		// Create a new probe request for this LSP.
+		lspProbeRequest := &SendPaymentRequest{
+			TimeoutSeconds:   probeRequest.TimeoutSeconds,
+			Dest:             lspKey[:],
+			MaxParts:         probeRequest.MaxParts,
+			AllowSelfPayment: probeRequest.AllowSelfPayment,
+			AmtMsat:          amtMsat,
+			PaymentHash:      probeRequest.PaymentHash,
+			FeeLimitSat:      probeRequest.FeeLimitSat,
+			FinalCltvDelta:   int32(lspHint.CLTVExpiryDelta),
+			DestFeatures:     probeRequest.DestFeatures,
+		}
+
+		// Copy the payment address if present.
+		if len(probeRequest.PaymentAddr) > 0 {
+			lspProbeRequest.PaymentAddr = make(
+				[]byte, lntypes.HashSize,
+			)
+
+			copy(
+				lspProbeRequest.PaymentAddr,
+				probeRequest.PaymentAddr,
+			)
+		}
+
+		// Set the adjusted route hints for this LSP.
+		if len(group.AdjustedRouteHints) > 0 {
+			lspProbeRequest.RouteHints = invoicesrpc.
+				CreateRPCRouteHints(group.AdjustedRouteHints)
+		}
+
+		// Calculate the hop fee for the last hop manually.
+		hopFee := lspHint.HopFee(*payReq.MilliSat)
+
+		// Add the last hop's fee to the probe amount.
+		lspProbeRequest.AmtMsat += int64(hopFee)
+
+		// Dispatch the payment probe for this LSP.
+		resp, err := s.sendProbePayment(ctx, lspProbeRequest)
+		if err != nil {
+			log.Warnf("Failed to probe LSP %v: %v", lspKey, err)
+			continue
+		}
+
+		// If the probe failed, skip this LSP.
+		if resp.FailureReason !=
+			lnrpc.PaymentFailureReason_FAILURE_REASON_NONE {
+
+			log.Debugf("Probe to LSP %v failed with reason: %v",
+				lspKey, resp.FailureReason)
+
+			continue
+		}
+
+		// The probe succeeded, add the last hop's fee.
+		resp.RoutingFeeMsat += int64(hopFee)
+
+		// Add the final cltv delta of the invoice.
+		resp.TimeLockDelay += int64(payReq.MinFinalCLTVExpiry())
+
+		log.Infof("Probe to LSP %v succeeded with fee: %d msat",
+			lspKey, resp.RoutingFeeMsat)
+
+		// Track the most expensive route for worst-case estimation.
+		// We solely consider the routing fee for the worst-case
+		// estimation.
+		if worstCaseResp == nil ||
+			resp.RoutingFeeMsat > worstCaseResp.RoutingFeeMsat {
+
+			if worstCaseResp != nil {
+				log.Debugf("LSP %v has higher fee "+
+					"(%d msat) than current worst-case "+
+					"%v (%d msat), updating worst-case "+
+					"estimate", lspKey,
+					resp.RoutingFeeMsat, worstCaseLspDest,
+					worstCaseResp.RoutingFeeMsat)
+			}
+
+			worstCaseResp = resp
+			worstCaseLspDest = lspKey
+		} else {
+			log.Debugf("LSP %v fee (%d msat) is lower than "+
+				"current worst-case %v (%d msat), keeping "+
+				"worst-case estimate", lspKey,
+				resp.RoutingFeeMsat, worstCaseLspDest,
+				worstCaseResp.RoutingFeeMsat)
+		}
+>>>>>>> 1c4bcc3b7 (routerrpc: fix payment address deep copy)
 	}
 
 	// The payment probe will be able to calculate the fee up until the LSP