htlc: Wire extra TLV types into the HTLC onion decoding

Author: cdecker

common/onion.c

@@ -267,6 +267,7 @@ struct onion_payload *onion_decode(const tal_t *ctx,
 				   const struct route_step *rs,
 				   const struct pubkey *blinding,
 				   const struct secret *blinding_ss,
+				   u64 *accepted_extra_tlvs,
 				   u64 *failtlvtype,
 				   size_t *failtlvpos)
 {
@@ -312,7 +313,7 @@ struct onion_payload *onion_decode(const tal_t *ctx,
 		if (!fromwire_tlv_payload(&cursor, &max, tlv))
 			goto fail;
 
-		if (!tlv_payload_is_valid(tlv, failtlvpos)) {
+		if (!tlv_fields_valid(tlv->fields, accepted_extra_tlvs, failtlvpos)) {
 			*failtlvtype = tlv->fields[*failtlvpos].numtype;
 			goto fail;
 		}

common/onion.h

@@ -68,6 +68,7 @@ size_t onion_payload_length(const u8 *raw_payload, size_t len,
  *       onion_payload_length().
  * @blinding: the optional incoming blinding point.
  * @blinding_ss: the shared secret derived from @blinding (iff that's non-NULL)
+ * @accepted_extra_tlvs: Allow these types to be in the TLV without failing
  * @failtlvtype: (out) the tlv type which failed to parse.
  * @failtlvpos: (out) the offset in the tlv which failed to parse.
  *
@@ -77,6 +78,7 @@ struct onion_payload *onion_decode(const tal_t *ctx,
 				   const struct route_step *rs,
 				   const struct pubkey *blinding,
 				   const struct secret *blinding_ss,
+				   u64 *accepted_extra_tlvs,
 				   u64 *failtlvtype,
 				   size_t *failtlvpos);
 

lightningd/peer_htlcs.c

@@ -927,6 +927,7 @@ static bool htlc_accepted_hook_deserialize(struct htlc_accepted_hook_payload *re
 		rs->raw_payload = prepend_length(rs, take(payload));
 		request->payload = onion_decode(request, rs,
 						hin->blinding, &hin->blinding_ss,
+						ld->accept_extra_tlv_types,
 						&request->failtlvtype,
 						&request->failtlvpos);
 
@@ -1243,6 +1244,7 @@ static bool peer_accepted_htlc(const tal_t *ctx,
 	hook_payload->route_step = tal_steal(hook_payload, rs);
 	hook_payload->payload = onion_decode(hook_payload, rs,
 					     hin->blinding, &hin->blinding_ss,
+					     ld->accept_extra_tlv_types,
 					     &hook_payload->failtlvtype,
 					     &hook_payload->failtlvpos);
 	hook_payload->ld = ld;

wallet/db_postgres_sqlgen.c

@@ -525,6 +525,7 @@ struct onion_payload *onion_decode(const tal_t *ctx UNNEEDED,
 				   const struct route_step *rs UNNEEDED,
 				   const struct pubkey *blinding UNNEEDED,
 				   const struct secret *blinding_ss UNNEEDED,
+				   u64 *accepted_extra_tlvs UNNEEDED,
 				   u64 *failtlvtype UNNEEDED,
 				   size_t *failtlvpos UNNEEDED)
 { fprintf(stderr, "onion_decode called!\n"); abort(); }