routing+migration: make payment failure msg optional

Author: bitromortac

channeldb/migration32/mission_control_store.go

@@ -163,7 +163,14 @@ func newPaymentFailure(sourceIdx *int,
 		sourceIdx: tlv.NewPrimitiveRecord[tlv.TlvType0](
 			uint8(*sourceIdx),
 		),
-		msg: tlv.NewRecordT[tlv.TlvType1](failureMessage{failureMsg}),
+	}
+
+	if failureMsg != nil {
+		info.msg = tlv.SomeRecordT(
+			tlv.NewRecordT[tlv.TlvType1](
+				failureMessage{failureMsg},
+			),
+		)
 	}
 
 	return &paymentFailure{
@@ -237,7 +244,7 @@ func decodePaymentFailure(r io.Reader, val interface{}, _ *[8]byte,
 // paymentFailureInfo holds additional information about a payment failure.
 type paymentFailureInfo struct {
 	sourceIdx tlv.RecordT[tlv.TlvType0, uint8]
-	msg       tlv.RecordT[tlv.TlvType1, failureMessage]
+	msg       tlv.OptionalRecordT[tlv.TlvType1, failureMessage]
 }
 
 // Record returns a TLV record that can be used to encode/decode a
@@ -263,10 +270,17 @@ func (r *paymentFailureInfo) Record() tlv.Record {
 
 func encodePaymentFailureInfo(w io.Writer, val interface{}, _ *[8]byte) error {
 	if v, ok := val.(*paymentFailureInfo); ok {
+		recordProducers := []tlv.RecordProducer{
+			&v.sourceIdx,
+		}
+		v.msg.WhenSome(
+			func(r tlv.RecordT[tlv.TlvType1, failureMessage]) {
+				recordProducers = append(recordProducers, &r)
+			},
+		)
+
 		return lnwire.EncodeRecordsTo(
-			w, lnwire.ProduceRecordsSorted(
-				&v.sourceIdx, &v.msg,
-			),
+			w, lnwire.ProduceRecordsSorted(recordProducers...),
 		)
 	}
 
@@ -279,14 +293,19 @@ func decodePaymentFailureInfo(r io.Reader, val interface{}, _ *[8]byte,
 	if v, ok := val.(*paymentFailureInfo); ok {
 		var h paymentFailureInfo
 
-		_, err := lnwire.DecodeRecords(
+		msg := tlv.ZeroRecordT[tlv.TlvType1, failureMessage]()
+		typeMap, err := lnwire.DecodeRecords(
 			r,
-			lnwire.ProduceRecordsSorted(&h.sourceIdx, &h.msg)...,
+			lnwire.ProduceRecordsSorted(&h.sourceIdx, &msg)...,
 		)
 		if err != nil {
 			return err
 		}
 
+		if _, ok := typeMap[h.msg.TlvType()]; ok {
+			h.msg = tlv.SomeRecordT(msg)
+		}
+
 		*v = h
 
 		return nil

routing/missioncontrol.go

@@ -848,7 +848,14 @@ func newPaymentFailure(sourceIdx *int,
 		sourceIdx: tlv.NewPrimitiveRecord[tlv.TlvType0](
 			uint8(*sourceIdx),
 		),
-		msg: tlv.NewRecordT[tlv.TlvType1](failureMessage{failureMsg}),
+	}
+
+	if failureMsg != nil {
+		info.msg = tlv.SomeRecordT(
+			tlv.NewRecordT[tlv.TlvType1](
+				failureMessage{failureMsg},
+			),
+		)
 	}
 
 	return &paymentFailure{
@@ -922,7 +929,7 @@ func decodePaymentFailure(r io.Reader, val interface{}, _ *[8]byte,
 // paymentFailureInfo holds additional information about a payment failure.
 type paymentFailureInfo struct {
 	sourceIdx tlv.RecordT[tlv.TlvType0, uint8]
-	msg       tlv.RecordT[tlv.TlvType1, failureMessage]
+	msg       tlv.OptionalRecordT[tlv.TlvType1, failureMessage]
 }
 
 // Record returns a TLV record that can be used to encode/decode a
@@ -948,10 +955,17 @@ func (r *paymentFailureInfo) Record() tlv.Record {
 
 func encodePaymentFailureInfo(w io.Writer, val interface{}, _ *[8]byte) error {
 	if v, ok := val.(*paymentFailureInfo); ok {
+		recordProducers := []tlv.RecordProducer{
+			&v.sourceIdx,
+		}
+		v.msg.WhenSome(
+			func(r tlv.RecordT[tlv.TlvType1, failureMessage]) {
+				recordProducers = append(recordProducers, &r)
+			},
+		)
+
 		return lnwire.EncodeRecordsTo(
-			w, lnwire.ProduceRecordsSorted(
-				&v.sourceIdx, &v.msg,
-			),
+			w, lnwire.ProduceRecordsSorted(recordProducers...),
 		)
 	}
 
@@ -964,14 +978,19 @@ func decodePaymentFailureInfo(r io.Reader, val interface{}, _ *[8]byte,
 	if v, ok := val.(*paymentFailureInfo); ok {
 		var h paymentFailureInfo
 
-		_, err := lnwire.DecodeRecords(
+		msg := tlv.ZeroRecordT[tlv.TlvType1, failureMessage]()
+		typeMap, err := lnwire.DecodeRecords(
 			r,
-			lnwire.ProduceRecordsSorted(&h.sourceIdx, &h.msg)...,
+			lnwire.ProduceRecordsSorted(&h.sourceIdx, &msg)...,
 		)
 		if err != nil {
 			return err
 		}
 
+		if _, ok := typeMap[h.msg.TlvType()]; ok {
+			h.msg = tlv.SomeRecordT(msg)
+		}
+
 		*v = h
 
 		return nil

routing/result_interpretation.go

@@ -139,7 +139,14 @@ func (i *interpretedResult) processFail(rt *mcRoute, failure paymentFailure) {
 	failure.info.WhenSome(
 		func(r tlv.RecordT[tlv.TlvType0, paymentFailureInfo]) {
 			idx = int(r.Val.sourceIdx.Val)
-			failMsg = r.Val.msg.Val.FailureMessage
+
+			r.Val.msg.WhenSome(
+				func(msg tlv.RecordT[tlv.TlvType1,
+					failureMessage]) {
+
+					failMsg = msg.Val.FailureMessage
+				},
+			)
 		},
 	)