Serialize and deserialize attr data

Sending attr data while sending update_fail_htlc and processing the attr data
when received a update_fail_htlc msg.

Key Changes:
 - Serializing updated attr data inside send_fail_or_fulfill.
 - Deserializing and processing the TLVs while parsing recvd update_fail_htlc msg.

Author: adi2011

channeld/channeld.c

@@ -2367,10 +2367,11 @@ static void handle_peer_fail_htlc(struct peer *peer, const u8 *msg)
 	u8 *reason;
 	struct htlc *htlc;
 	struct failed_htlc *f;
+	struct tlv_update_fail_htlc_tlvs *tlvs_attr_data;
 
 	/* reason is not an onionreply because spec doesn't know about that */
 	if (!fromwire_update_fail_htlc(msg, msg,
-				       &channel_id, &id, &reason)) {
+				       &channel_id, &id, &reason, &tlvs_attr_data)) {
 		peer_failed_warn(peer->pps, &peer->channel_id,
 				 "Bad update_fail_htlc %s", tal_hex(msg, msg));
 	}
@@ -2381,7 +2382,10 @@ static void handle_peer_fail_htlc(struct peer *peer, const u8 *msg)
 		htlc->failed = f = tal(htlc, struct failed_htlc);
 		f->id = id;
 		f->sha256_of_onion = NULL;
-		f->onion = new_onionreply(f, take(reason));
+		f->onion = new_onionreply(f, take(reason),
+					  tlvs_attr_data->attribution_data->htlc_hold_times,
+					  tlvs_attr_data->attribution_data->truncated_hmacs);
+
 		start_commit_timer(peer);
 		return;
 	}
@@ -4621,8 +4625,12 @@ static void send_fail_or_fulfill(struct peer *peer, const struct htlc *h)
 								f->sha256_of_onion,
 								f->badonion);
 		} else {
+			struct tlv_update_fail_htlc_tlvs *attr_data_tlv = tlv_update_fail_htlc_tlvs_new(peer);
+			attr_data_tlv->attribution_data = tal(peer, struct tlv_update_fail_htlc_tlvs_attribution_data);
+			memcpy(attr_data_tlv->attribution_data->htlc_hold_times, f->onion->htlc_hold_time, 80);
+			memcpy(attr_data_tlv->attribution_data->truncated_hmacs, f->onion->truncated_hmac, 840);
 			msg = towire_update_fail_htlc(peer, &peer->channel_id, h->id,
-						      f->onion->contents);
+						      f->onion->contents, attr_data_tlv);
 		}
 	} else if (h->r) {
 		msg = towire_update_fulfill_htlc(NULL, &peer->channel_id, h->id,

lightningd/peer_htlcs.c

@@ -2,6 +2,7 @@
 #include <ccan/cast/cast.h>
 #include <ccan/mem/mem.h>
 #include <ccan/tal/str/str.h>
+#include <ccan/time/time.h>
 #include <channeld/channeld_wiregen.h>
 #include <common/blinding.h>
 #include <common/configdir.h>
@@ -10,6 +11,7 @@
 #include <common/json_param.h>
 #include <common/onion_decode.h>
 #include <common/onionreply.h>
+#include <common/sphinx.h>
 #include <common/timeout.h>
 #include <connectd/connectd_wiregen.h>
 #include <db/exec.h>
@@ -313,16 +315,22 @@ static void fail_out_htlc(struct htlc_out *hout, const char *localfail)
 			       hout->failmsg,
 			       localfail);
 	} else if (hout->in) {
+		const struct onionreply *final_failonion;
+		struct onionreply *failonion;
 		const u32 hold_times = time_between(time_now(), hout->send_timestamp).ts.tv_nsec/1000000;
 		/* If we have an onion, simply copy it. */
 		if (hout->failonion)
-			failonion = hout->failonion;
+			failonion = dup_onionreply(hout, hout->failonion);
 		/* Otherwise, we need to onionize this local error. */
 		else
 			failonion = create_onionreply(hout,
 						      hout->in->shared_secret,
 						      hout->failmsg);
-		fail_in_htlc(hout->in, failonion);
+
+		update_attributable_data(failonion, hold_times, hout->in->shared_secret);
+
+		final_failonion = failonion;
+		fail_in_htlc(hout->in, final_failonion);
 	} else {
 		log_broken(hout->key.channel->log, "Neither origin nor in?");
 	}

plugins/renepay/json.c

@@ -90,7 +90,7 @@ static bool get_data_details_onionreply(struct payment_result *result,
 		goto fail;
 	onionreply = new_onionreply(
 	    this_ctx,
-	    take(json_tok_bin_from_hex(this_ctx, buffer, onionreplytok)));
+	    take(json_tok_bin_from_hex(this_ctx, buffer, onionreplytok)), NULL, NULL);
 	assert(onionreply);
 	/* FIXME: It seems that lightningd will unwrap top portion of the
 	 * onionreply for us before serializing it, while unwrap_onionreply will