multi: use wire records on payment and intercept flows

htlcswitch/packet.go

@@ -94,9 +94,13 @@ type htlcPacket struct {
 	// link.
 	outgoingTimeout uint32
 
-	// customRecords are user-defined records in the custom type range that
-	// were included in the payload.
-	customRecords record.CustomSet
+	// inOnionCustomRecords are user-defined records in the custom type
+	// range that were included in the onion payload.
+	inOnionCustomRecords record.CustomSet
+
+	// inWireCustomRecords are custom type range TLVs that are included
+	// in the incoming update_add_htlc wire message.
+	inWireCustomRecords lnwire.CustomRecords
 
 	// originalOutgoingChanID is used when sending back failure messages.
 	// It is only used for forwarded Adds on option_scid_alias channels.