common: re-add legacy v0 hop generation to Sphinx for testing.

Signed-off-by: Rusty Russell <[email protected]>

Author: rustyrussell

common/sphinx.c

@@ -1,6 +1,7 @@
 #include "config.h"
 #include <assert.h>
 
+#include <ccan/array_size/array_size.h>
 #include <ccan/mem/mem.h>
 #include <common/onion_decode.h>
 #include <common/onionreply.h>
@@ -122,6 +123,33 @@ bool sphinx_add_hop_has_length(struct sphinx_path *path, const struct pubkey *pu
 	return true;
 }
 
+static u8 *make_v0_hop(const tal_t *ctx,
+		       const struct short_channel_id *scid,
+		       struct amount_msat forward, u32 outgoing_cltv)
+{
+	const u8 padding[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+			      0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+	/* Prepend 0 byte for realm */
+	u8 *buf = tal_arrz(ctx, u8, 1);
+	towire_short_channel_id(&buf, *scid);
+	towire_amount_msat(&buf, forward);
+	towire_u32(&buf, outgoing_cltv);
+	towire(&buf, padding, ARRAY_SIZE(padding));
+	assert(tal_bytelen(buf) == 1 + 32);
+	return buf;
+}
+
+void sphinx_add_v0_hop(struct sphinx_path *path, const struct pubkey *pubkey,
+		       const struct short_channel_id *scid,
+		       struct amount_msat forward, u32 outgoing_cltv)
+{
+	struct sphinx_hop sp;
+
+	sp.raw_payload = make_v0_hop(path, scid, forward, outgoing_cltv);
+	sp.pubkey = *pubkey;
+	tal_arr_expand(&path->hops, sp);
+}
+
 void sphinx_add_hop(struct sphinx_path *path, const struct pubkey *pubkey,
 		    const u8 *payload TAKES)
 {

common/sphinx.h

@@ -216,6 +216,13 @@ bool sphinx_add_hop_has_length(struct sphinx_path *path, const struct pubkey *pu
 void sphinx_add_hop(struct sphinx_path *path, const struct pubkey *pubkey,
 		    const u8 *payload TAKES);
 
+/**
+ * Do not use, function is cursed.
+ */
+void sphinx_add_v0_hop(struct sphinx_path *path, const struct pubkey *pubkey,
+		       const struct short_channel_id *scid,
+		       struct amount_msat forward, u32 outgoing_cltv);
+
 /**
  * Compute the size of the serialized payloads.
  */

common/test/run-sphinx-xor_cipher_stream.c

@@ -111,6 +111,9 @@ void subkey_from_hmac(const char *prefix UNNEEDED,
 /* Generated stub for towire */
 void towire(u8 **pptr UNNEEDED, const void *data UNNEEDED, size_t len UNNEEDED)
 { fprintf(stderr, "towire called!\n"); abort(); }
+/* Generated stub for towire_amount_msat */
+void towire_amount_msat(u8 **pptr UNNEEDED, const struct amount_msat msat UNNEEDED)
+{ fprintf(stderr, "towire_amount_msat called!\n"); abort(); }
 /* Generated stub for towire_bigsize */
 void towire_bigsize(u8 **pptr UNNEEDED, const bigsize_t val UNNEEDED)
 { fprintf(stderr, "towire_bigsize called!\n"); abort(); }

wallet/test/run-wallet.c

@@ -932,6 +932,11 @@ u8 *serialize_onionpacket(
 bool sphinx_add_hop_has_length(struct sphinx_path *path UNNEEDED, const struct pubkey *pubkey UNNEEDED,
 			       const u8 *payload TAKES UNNEEDED)
 { fprintf(stderr, "sphinx_add_hop_has_length called!\n"); abort(); }
+/* Generated stub for sphinx_add_v0_hop */
+void sphinx_add_v0_hop(struct sphinx_path *path UNNEEDED, const struct pubkey *pubkey UNNEEDED,
+		       const struct short_channel_id *scid UNNEEDED,
+		       struct amount_msat forward UNNEEDED, u32 outgoing_cltv UNNEEDED)
+{ fprintf(stderr, "sphinx_add_v0_hop called!\n"); abort(); }
 /* Generated stub for sphinx_path_new */
 struct sphinx_path *sphinx_path_new(const tal_t *ctx UNNEEDED,
 				    const u8 *associated_data UNNEEDED)