hooks: Add the raw payload to the htlc_accepted call

Since we might soon be changing the payload it is a good idea to not just
expose the v0 payload, but also the raw payload for the plugin to
interpret. This might also include payloads that `lightningd` itself cannot
understand, but the plugin might.

Signed-off-by: Christian Decker <decker.christian@gmail.com>
Suggested-by: Corné Plooy <@bitonic-cjp>

common/sphinx.c

@@ -433,6 +433,8 @@ struct route_step *process_onionpacket(
 	deserialize_hop_data(&step->hop_data, paddedheader);
 
         memcpy(&step->next->mac, step->hop_data.hmac, SECURITY_PARAMETER);
+	step->raw_payload = tal_dup_arr(step, u8, paddedheader + 1,
+					HOP_DATA_SIZE - 1 - HMAC_SIZE, 0);
 
 	memcpy(&step->next->routinginfo, paddedheader + HOP_DATA_SIZE, ROUTING_INFO_SIZE);
 

common/sphinx.h

@@ -77,6 +77,7 @@ struct route_step {
 	enum route_next_case nextcase;
 	struct onionpacket *next;
 	struct hop_data hop_data;
+	u8 *raw_payload;
 };
 
 /**

lightningd/peer_htlcs.c

@@ -718,6 +718,7 @@ static void htlc_accepted_hook_serialize(struct htlc_accepted_hook_payload *p,
 	const struct htlc_in *hin = p->hin;
 	json_object_start(s, "onion");
 
+	json_add_hex_talarr (s, "payload", rs->raw_payload);
 	json_object_start(s, "hop_data");
 	json_add_hex(s, "realm", &rs->hop_data.realm, 1);
 	json_add_short_channel_id(s, "short_channel_id", &rs->hop_data.channel_id);

tests/plugins/fail_htlcs.py

@@ -8,6 +8,7 @@
 @plugin.hook("htlc_accepted")
 def on_htlc_accepted(htlc, onion, plugin):
     plugin.log("Failing htlc on purpose")
+    plugin.log("onion: %r" % (onion))
     return {"result": "fail"}