rpcserver: skip rfq negotiation on manual SendPayment rfq

rpcserver.go

@@ -7034,6 +7034,27 @@ func (r *rpcServer) SendPayment(req *tchrpc.SendPaymentRequest,
 	case len(firstHopRecords) > 0:
 		// Continue below.
 
+	case req.Scid != 0:
+		var quote rfqmsg.SellAccept
+		for id, q := range r.cfg.RfqManager.PeerAcceptedSellQuotes() {
+			if id == rfqmsg.SerialisedScid(req.Scid) {
+				quote = q
+				break
+			}
+		}
+
+		htlc := rfqmsg.NewHtlc(nil, fn.Some(quote.ID))
+
+		// We'll now map the HTLC struct into a set of TLV records,
+		// which we can then encode into the expected map format.
+		htlcMapRecords, err := tlv.RecordsToMap(htlc.Records())
+		if err != nil {
+			return fmt.Errorf("unable to encode records as map: %w",
+				err)
+		}
+
+		pReq.FirstHopCustomRecords = htlcMapRecords
+
 	// The request wants to pay a specific invoice.
 	case pReq.PaymentRequest != "":
 		invoice, err := zpay32.Decode(