bolt12: allow first_node_id in blinded path to be a scid.

We don't actually support it yet, but this threads through the type change, puts it in "decode" etc. Signed-off-by: Rusty Russell <[email protected]>
ElementsProject · Apr 11, 2024 · 0a13f4a · 0a13f4a
1 parent 20ff5c2
commit 0a13f4a
Show file tree

Hide file tree

Showing 39 changed files with 494 additions and 203 deletions.
diff --git a/.msggen.json b/.msggen.json
@@ -524,6 +524,8 @@
         "DecodeOffer_paths": {
             "Decode.offer_paths[].blinding": 2,
             "Decode.offer_paths[].first_node_id": 1,
+            "Decode.offer_paths[].first_scid": 4,
+            "Decode.offer_paths[].first_scid_dir": 5,
             "Decode.offer_paths[].path[]": 3
         },
         "DecodeOffer_recurrencePaywindow": {
@@ -2315,6 +2317,14 @@
             "added": "pre-v0.10.1",
             "deprecated": false
         },
+        "Decode.invoice_paths[].first_scid": {
+            "added": "v23.05",
+            "deprecated": false
+        },
+        "Decode.invoice_paths[].first_scid_dir": {
+            "added": "v23.05",
+            "deprecated": false
+        },
         "Decode.invoice_paths[].path[]": {
             "added": "pre-v0.10.1",
             "deprecated": false
@@ -2455,6 +2465,14 @@
             "added": "pre-v0.10.1",
             "deprecated": false
         },
+        "Decode.offer_paths[].first_scid": {
+            "added": "v23.05",
+            "deprecated": false
+        },
+        "Decode.offer_paths[].first_scid_dir": {
+            "added": "v23.05",
+            "deprecated": false
+        },
         "Decode.offer_paths[].path[]": {
             "added": "pre-v0.10.1",
             "deprecated": false

diff --git a/cln-grpc/proto/node.proto b/cln-grpc/proto/node.proto
diff --git a/cln-grpc/src/convert.rs b/cln-grpc/src/convert.rs
diff --git a/cln-rpc/src/model.rs b/cln-rpc/src/model.rs
diff --git a/common/json_blinded_path.c b/common/json_blinded_path.c
@@ -10,15 +10,31 @@ json_to_blinded_path(const tal_t *ctx, const char *buffer, const jsmntok_t *tok)
 	const jsmntok_t *hops, *t;
 	size_t i;
 	const char *err;
+	struct pubkey first_node_id;
+	struct short_channel_id_dir first_scidd;
 
 	rpath = tal(ctx, struct blinded_path);
-	err = json_scan(tmpctx, buffer, tok, "{blinding:%,first_node_id:%}",
+
+	/* It will give us either scid or node_id */
+	memset(&first_scidd, 0, sizeof(first_scidd));
+	err = json_scan(tmpctx, buffer, tok,
+			"{blinding:%,"
+			"first_node_id?:%,"
+			"first_scid?:%,"
+			"first_scid_dir?:%}",
 			JSON_SCAN(json_to_pubkey, &rpath->blinding),
-			JSON_SCAN(json_to_pubkey, &rpath->first_node_id),
+			JSON_SCAN(json_to_pubkey, &first_node_id),
+			JSON_SCAN(json_to_short_channel_id, &first_scidd.scid),
+			JSON_SCAN(json_to_int, &first_scidd.dir),
 			NULL);
 	if (err)
 		return tal_free(rpath);
 
+	if (first_scidd.scid.u64 != 0)
+		sciddir_or_pubkey_from_scidd(&rpath->first_node_id, &first_scidd);
+	else
+		sciddir_or_pubkey_from_pubkey(&rpath->first_node_id, &first_node_id);
+
 	hops = json_get_member(buffer, tok, "hops");
 	if (!hops || hops->size < 1)
 		return tal_free(rpath);

diff --git a/common/test/run-blindedpath_enctlv.c b/common/test/run-blindedpath_enctlv.c
@@ -58,6 +58,10 @@ bool fromwire_channel_id(const u8 **cursor UNNEEDED, size_t *max UNNEEDED,
 /* Generated stub for fromwire_node_id */
 void fromwire_node_id(const u8 **cursor UNNEEDED, size_t *max UNNEEDED, struct node_id *id UNNEEDED)
 { fprintf(stderr, "fromwire_node_id called!\n"); abort(); }
+/* Generated stub for fromwire_sciddir_or_pubkey */
+void fromwire_sciddir_or_pubkey(const u8 **cursor UNNEEDED, size_t *max UNNEEDED,
+				struct sciddir_or_pubkey *sciddpk UNNEEDED)
+{ fprintf(stderr, "fromwire_sciddir_or_pubkey 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(); }
@@ -70,6 +74,10 @@ void towire_channel_id(u8 **pptr UNNEEDED, const struct channel_id *channel_id U
 /* Generated stub for towire_node_id */
 void towire_node_id(u8 **pptr UNNEEDED, const struct node_id *id UNNEEDED)
 { fprintf(stderr, "towire_node_id called!\n"); abort(); }
+/* Generated stub for towire_sciddir_or_pubkey */
+void towire_sciddir_or_pubkey(u8 **pptr UNNEEDED,
+			      const struct sciddir_or_pubkey *sciddpk UNNEEDED)
+{ fprintf(stderr, "towire_sciddir_or_pubkey called!\n"); abort(); }
 /* AUTOGENERATED MOCKS END */
 
 static void json_strfield(const char *name, const char *val)

diff --git a/common/test/run-blindedpath_onion.c b/common/test/run-blindedpath_onion.c
@@ -68,6 +68,10 @@ bool fromwire_channel_id(const u8 **cursor UNNEEDED, size_t *max UNNEEDED,
 /* Generated stub for fromwire_node_id */
 void fromwire_node_id(const u8 **cursor UNNEEDED, size_t *max UNNEEDED, struct node_id *id UNNEEDED)
 { fprintf(stderr, "fromwire_node_id called!\n"); abort(); }
+/* Generated stub for fromwire_sciddir_or_pubkey */
+void fromwire_sciddir_or_pubkey(const u8 **cursor UNNEEDED, size_t *max UNNEEDED,
+				struct sciddir_or_pubkey *sciddpk UNNEEDED)
+{ fprintf(stderr, "fromwire_sciddir_or_pubkey called!\n"); abort(); }
 /* Generated stub for new_onionreply */
 struct onionreply *new_onionreply(const tal_t *ctx UNNEEDED, const u8 *contents TAKES UNNEEDED)
 { fprintf(stderr, "new_onionreply called!\n"); abort(); }
@@ -86,6 +90,10 @@ void towire_channel_id(u8 **pptr UNNEEDED, const struct channel_id *channel_id U
 /* Generated stub for towire_node_id */
 void towire_node_id(u8 **pptr UNNEEDED, const struct node_id *id UNNEEDED)
 { fprintf(stderr, "towire_node_id called!\n"); abort(); }
+/* Generated stub for towire_sciddir_or_pubkey */
+void towire_sciddir_or_pubkey(u8 **pptr UNNEEDED,
+			      const struct sciddir_or_pubkey *sciddpk UNNEEDED)
+{ fprintf(stderr, "towire_sciddir_or_pubkey called!\n"); abort(); }
 /* AUTOGENERATED MOCKS END */
 
 static void json_strfield(const char *name, const char *val)

diff --git a/common/test/run-bolt12-encode-test.c b/common/test/run-bolt12-encode-test.c
@@ -58,6 +58,10 @@ struct amount_sat amount_tx_fee(u32 fee_per_kw UNNEEDED, size_t weight UNNEEDED)
 /* Generated stub for fromwire_amount_msat */
 struct amount_msat fromwire_amount_msat(const u8 **cursor UNNEEDED, size_t *max UNNEEDED)
 { fprintf(stderr, "fromwire_amount_msat called!\n"); abort(); }
+/* Generated stub for fromwire_sciddir_or_pubkey */
+void fromwire_sciddir_or_pubkey(const u8 **cursor UNNEEDED, size_t *max UNNEEDED,
+				struct sciddir_or_pubkey *sciddpk UNNEEDED)
+{ fprintf(stderr, "fromwire_sciddir_or_pubkey called!\n"); abort(); }
 /* Generated stub for merkle_tlv */
 void merkle_tlv(const struct tlv_field *fields UNNEEDED, struct sha256 *merkle UNNEEDED)
 { fprintf(stderr, "merkle_tlv called!\n"); abort(); }
@@ -70,6 +74,10 @@ void sighash_from_merkle(const char *messagename UNNEEDED,
 /* 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_sciddir_or_pubkey */
+void towire_sciddir_or_pubkey(u8 **pptr UNNEEDED,
+			      const struct sciddir_or_pubkey *sciddpk UNNEEDED)
+{ fprintf(stderr, "towire_sciddir_or_pubkey called!\n"); abort(); }
 /* AUTOGENERATED MOCKS END */
 
 static utf8 *tal_utf8(const tal_t *ctx, const char *str)
@@ -221,7 +229,8 @@ int main(int argc, char *argv[])
 
 	offer->offer_paths = tal_arr(offer, struct blinded_path *, 1);
 	offer->offer_paths[0] = tal(offer->offer_paths, struct blinded_path);
-	assert(pubkey_from_secret(&bob, &offer->offer_paths[0]->first_node_id));
+	offer->offer_paths[0]->first_node_id.is_pubkey = true;
+	assert(pubkey_from_secret(&bob, &offer->offer_paths[0]->first_node_id.pubkey));
 	/* Random blinding secret. */
 	assert(pubkey_from_hexstr("020202020202020202020202020202020202020202020202020202020202020202", 66, &offer->offer_paths[0]->blinding));
 	offer->offer_paths[0]->path = tal_arr(offer->offer_paths[0],
@@ -240,7 +249,8 @@ int main(int argc, char *argv[])
 
 	tal_resize(&offer->offer_paths, 2);
 	offer->offer_paths[1] = tal(offer->offer_paths, struct blinded_path);
-	assert(pubkey_from_secret(&carol, &offer->offer_paths[1]->first_node_id));
+	offer->offer_paths[1]->first_node_id.is_pubkey = true;
+	assert(pubkey_from_secret(&carol, &offer->offer_paths[1]->first_node_id.pubkey));
 	/* Random blinding secret. */
 	assert(pubkey_from_hexstr("020202020202020202020202020202020202020202020202020202020202020202", 66, &offer->offer_paths[1]->blinding));
 	offer->offer_paths[1]->path = tal_arr(offer->offer_paths[1],

diff --git a/common/test/run-bolt12-offer-decode.c b/common/test/run-bolt12-offer-decode.c
@@ -53,6 +53,10 @@ struct amount_sat amount_tx_fee(u32 fee_per_kw UNNEEDED, size_t weight UNNEEDED)
 /* Generated stub for fromwire_amount_msat */
 struct amount_msat fromwire_amount_msat(const u8 **cursor UNNEEDED, size_t *max UNNEEDED)
 { fprintf(stderr, "fromwire_amount_msat called!\n"); abort(); }
+/* Generated stub for fromwire_sciddir_or_pubkey */
+void fromwire_sciddir_or_pubkey(const u8 **cursor UNNEEDED, size_t *max UNNEEDED,
+				struct sciddir_or_pubkey *sciddpk UNNEEDED)
+{ fprintf(stderr, "fromwire_sciddir_or_pubkey called!\n"); abort(); }
 /* Generated stub for merkle_tlv */
 void merkle_tlv(const struct tlv_field *fields UNNEEDED, struct sha256 *merkle UNNEEDED)
 { fprintf(stderr, "merkle_tlv called!\n"); abort(); }
@@ -83,6 +87,10 @@ void towire_amount_msat(u8 **pptr UNNEEDED, const struct amount_msat msat UNNEED
 /* Generated stub for towire_bool */
 void towire_bool(u8 **pptr UNNEEDED, bool v UNNEEDED)
 { fprintf(stderr, "towire_bool called!\n"); abort(); }
+/* Generated stub for towire_sciddir_or_pubkey */
+void towire_sciddir_or_pubkey(u8 **pptr UNNEEDED,
+			      const struct sciddir_or_pubkey *sciddpk UNNEEDED)
+{ fprintf(stderr, "towire_sciddir_or_pubkey called!\n"); abort(); }
 /* Generated stub for towire_secp256k1_ecdsa_signature */
 void towire_secp256k1_ecdsa_signature(u8 **pptr UNNEEDED,
 			      const secp256k1_ecdsa_signature *signature UNNEEDED)

diff --git a/common/test/run-json.c b/common/test/run-json.c
@@ -10,6 +10,10 @@
 #include <stdio.h>
 
 /* AUTOGENERATED MOCKS START */
+/* Generated stub for fromwire_sciddir_or_pubkey */
+void fromwire_sciddir_or_pubkey(const u8 **cursor UNNEEDED, size_t *max UNNEEDED,
+				struct sciddir_or_pubkey *sciddpk UNNEEDED)
+{ fprintf(stderr, "fromwire_sciddir_or_pubkey called!\n"); abort(); }
 /* Generated stub for fromwire_tlv */
 bool fromwire_tlv(const u8 **cursor UNNEEDED, size_t *max UNNEEDED,
 		  const struct tlv_record_type *types UNNEEDED, size_t num_types UNNEEDED,
@@ -31,6 +35,10 @@ bool json_filter_ok(const struct json_filter *filter UNNEEDED, const char *membe
 /* Generated stub for json_filter_up */
 bool json_filter_up(struct json_filter **filter UNNEEDED)
 { fprintf(stderr, "json_filter_up called!\n"); abort(); }
+/* Generated stub for towire_sciddir_or_pubkey */
+void towire_sciddir_or_pubkey(u8 **pptr UNNEEDED,
+			      const struct sciddir_or_pubkey *sciddpk UNNEEDED)
+{ fprintf(stderr, "towire_sciddir_or_pubkey called!\n"); abort(); }
 /* Generated stub for towire_tlv */
 void towire_tlv(u8 **pptr UNNEEDED,
 		const struct tlv_record_type *types UNNEEDED, size_t num_types UNNEEDED,

diff --git a/common/test/run-onion-message-test.c b/common/test/run-onion-message-test.c
@@ -29,6 +29,10 @@ bool fromwire_channel_id(const u8 **cursor UNNEEDED, size_t *max UNNEEDED,
 /* Generated stub for fromwire_node_id */
 void fromwire_node_id(const u8 **cursor UNNEEDED, size_t *max UNNEEDED, struct node_id *id UNNEEDED)
 { fprintf(stderr, "fromwire_node_id called!\n"); abort(); }
+/* Generated stub for fromwire_sciddir_or_pubkey */
+void fromwire_sciddir_or_pubkey(const u8 **cursor UNNEEDED, size_t *max UNNEEDED,
+				struct sciddir_or_pubkey *sciddpk UNNEEDED)
+{ fprintf(stderr, "fromwire_sciddir_or_pubkey called!\n"); abort(); }
 /* Generated stub for new_onionreply */
 struct onionreply *new_onionreply(const tal_t *ctx UNNEEDED, const u8 *contents TAKES UNNEEDED)
 { fprintf(stderr, "new_onionreply called!\n"); abort(); }
@@ -47,6 +51,10 @@ void towire_channel_id(u8 **pptr UNNEEDED, const struct channel_id *channel_id U
 /* Generated stub for towire_node_id */
 void towire_node_id(u8 **pptr UNNEEDED, const struct node_id *id UNNEEDED)
 { fprintf(stderr, "towire_node_id called!\n"); abort(); }
+/* Generated stub for towire_sciddir_or_pubkey */
+void towire_sciddir_or_pubkey(u8 **pptr UNNEEDED,
+			      const struct sciddir_or_pubkey *sciddpk UNNEEDED)
+{ fprintf(stderr, "towire_sciddir_or_pubkey called!\n"); abort(); }
 /* AUTOGENERATED MOCKS END */
 
 static bool comma;

diff --git a/common/test/run-onion-test-vector.c b/common/test/run-onion-test-vector.c
@@ -70,6 +70,10 @@ void ecdh(const struct pubkey *point UNNEEDED, struct secret *ss UNNEEDED)
 /* Generated stub for fromwire_amount_msat */
 struct amount_msat fromwire_amount_msat(const u8 **cursor UNNEEDED, size_t *max UNNEEDED)
 { fprintf(stderr, "fromwire_amount_msat called!\n"); abort(); }
+/* Generated stub for fromwire_sciddir_or_pubkey */
+void fromwire_sciddir_or_pubkey(const u8 **cursor UNNEEDED, size_t *max UNNEEDED,
+				struct sciddir_or_pubkey *sciddpk UNNEEDED)
+{ fprintf(stderr, "fromwire_sciddir_or_pubkey called!\n"); abort(); }
 /* Generated stub for fromwire_tlv */
 bool fromwire_tlv(const u8 **cursor UNNEEDED, size_t *max UNNEEDED,
 		  const struct tlv_record_type *types UNNEEDED, size_t num_types UNNEEDED,
@@ -100,6 +104,10 @@ size_t tlv_field_offset(const u8 *tlvstream UNNEEDED, size_t tlvlen UNNEEDED, u6
 /* 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_sciddir_or_pubkey */
+void towire_sciddir_or_pubkey(u8 **pptr UNNEEDED,
+			      const struct sciddir_or_pubkey *sciddpk UNNEEDED)
+{ fprintf(stderr, "towire_sciddir_or_pubkey called!\n"); abort(); }
 /* Generated stub for towire_tlv */
 void towire_tlv(u8 **pptr UNNEEDED,
 		const struct tlv_record_type *types UNNEEDED, size_t num_types UNNEEDED,

diff --git a/common/test/run-param.c b/common/test/run-param.c
@@ -63,6 +63,10 @@ bool command_dev_apis(const struct command *cmd UNNEEDED)
 /* Generated stub for command_filter_ptr */
 struct json_filter **command_filter_ptr(struct command *cmd UNNEEDED)
 { fprintf(stderr, "command_filter_ptr called!\n"); abort(); }
+/* Generated stub for fromwire_sciddir_or_pubkey */
+void fromwire_sciddir_or_pubkey(const u8 **cursor UNNEEDED, size_t *max UNNEEDED,
+				struct sciddir_or_pubkey *sciddpk UNNEEDED)
+{ fprintf(stderr, "fromwire_sciddir_or_pubkey called!\n"); abort(); }
 /* Generated stub for fromwire_tlv */
 bool fromwire_tlv(const u8 **cursor UNNEEDED, size_t *max UNNEEDED,
 		  const struct tlv_record_type *types UNNEEDED, size_t num_types UNNEEDED,
@@ -72,6 +76,10 @@ bool fromwire_tlv(const u8 **cursor UNNEEDED, size_t *max UNNEEDED,
 /* Generated stub for to_canonical_invstr */
 const char *to_canonical_invstr(const tal_t *ctx UNNEEDED, const char *invstring UNNEEDED)
 { fprintf(stderr, "to_canonical_invstr called!\n"); abort(); }
+/* Generated stub for towire_sciddir_or_pubkey */
+void towire_sciddir_or_pubkey(u8 **pptr UNNEEDED,
+			      const struct sciddir_or_pubkey *sciddpk UNNEEDED)
+{ fprintf(stderr, "towire_sciddir_or_pubkey called!\n"); abort(); }
 /* Generated stub for towire_tlv */
 void towire_tlv(u8 **pptr UNNEEDED,
 		const struct tlv_record_type *types UNNEEDED, size_t num_types UNNEEDED,

diff --git a/common/test/run-route_blinding_onion_test.c b/common/test/run-route_blinding_onion_test.c
@@ -25,6 +25,10 @@
 #include <stdio.h>
 
 /* AUTOGENERATED MOCKS START */
+/* Generated stub for fromwire_sciddir_or_pubkey */
+void fromwire_sciddir_or_pubkey(const u8 **cursor UNNEEDED, size_t *max UNNEEDED,
+				struct sciddir_or_pubkey *sciddpk UNNEEDED)
+{ fprintf(stderr, "fromwire_sciddir_or_pubkey called!\n"); abort(); }
 /* Generated stub for mvt_tag_str */
 const char *mvt_tag_str(enum mvt_tag tag UNNEEDED)
 { fprintf(stderr, "mvt_tag_str called!\n"); abort(); }
@@ -37,6 +41,10 @@ bool node_id_from_hexstr(const char *str UNNEEDED, size_t slen UNNEEDED, struct
 /* Generated stub for pubkey_from_node_id */
 bool pubkey_from_node_id(struct pubkey *key UNNEEDED, const struct node_id *id UNNEEDED)
 { fprintf(stderr, "pubkey_from_node_id called!\n"); abort(); }
+/* Generated stub for towire_sciddir_or_pubkey */
+void towire_sciddir_or_pubkey(u8 **pptr UNNEEDED,
+			      const struct sciddir_or_pubkey *sciddpk UNNEEDED)
+{ fprintf(stderr, "towire_sciddir_or_pubkey called!\n"); abort(); }
 /* AUTOGENERATED MOCKS END */
 
 #if 0
@@ -111,10 +119,12 @@ int main(int argc, char *argv[])
 			 JSON_SCAN(json_to_u32, &path_fee_base_msat),
 			 JSON_SCAN(json_to_u32, &path_fee_proportional_millionths),
 			 JSON_SCAN(json_to_u32, &path_cltv_delta),
-			 JSON_SCAN(json_to_pubkey, &bpath->first_node_id),
+			 JSON_SCAN(json_to_pubkey, &bpath->first_node_id.pubkey),
 			 JSON_SCAN(json_to_pubkey, &bpath->blinding),
 			 JSON_SCAN(json_to_tok, &hops_tok)) == NULL);
 
+	/* FIXME: Test scid as well! */
+	bpath->first_node_id.is_pubkey = true;
 	bpath->path = tal_arr(bpath, struct onionmsg_hop *, hops_tok->size);
 	json_for_each_arr(i, t, hops_tok) {
 		bpath->path[i] = tal(bpath->path, struct onionmsg_hop);

diff --git a/common/test/run-route_blinding_test.c b/common/test/run-route_blinding_test.c
@@ -27,6 +27,10 @@ bool fromwire_channel_id(const u8 **cursor UNNEEDED, size_t *max UNNEEDED,
 /* Generated stub for fromwire_node_id */
 void fromwire_node_id(const u8 **cursor UNNEEDED, size_t *max UNNEEDED, struct node_id *id UNNEEDED)
 { fprintf(stderr, "fromwire_node_id called!\n"); abort(); }
+/* Generated stub for fromwire_sciddir_or_pubkey */
+void fromwire_sciddir_or_pubkey(const u8 **cursor UNNEEDED, size_t *max UNNEEDED,
+				struct sciddir_or_pubkey *sciddpk UNNEEDED)
+{ fprintf(stderr, "fromwire_sciddir_or_pubkey called!\n"); abort(); }
 /* Generated stub for node_id_from_hexstr */
 bool node_id_from_hexstr(const char *str UNNEEDED, size_t slen UNNEEDED, struct node_id *id UNNEEDED)
 { fprintf(stderr, "node_id_from_hexstr called!\n"); abort(); }
@@ -36,6 +40,10 @@ void towire_channel_id(u8 **pptr UNNEEDED, const struct channel_id *channel_id U
 /* Generated stub for towire_node_id */
 void towire_node_id(u8 **pptr UNNEEDED, const struct node_id *id UNNEEDED)
 { fprintf(stderr, "towire_node_id called!\n"); abort(); }
+/* Generated stub for towire_sciddir_or_pubkey */
+void towire_sciddir_or_pubkey(u8 **pptr UNNEEDED,
+			      const struct sciddir_or_pubkey *sciddpk UNNEEDED)
+{ fprintf(stderr, "towire_sciddir_or_pubkey called!\n"); abort(); }
 /* AUTOGENERATED MOCKS END */
 
 static struct tlv_encrypted_data_tlv_payment_constraints *

diff --git a/common/test/run-sphinx.c b/common/test/run-sphinx.c
@@ -74,6 +74,10 @@ struct amount_msat fromwire_amount_msat(const u8 **cursor UNNEEDED, size_t *max
 /* Generated stub for fromwire_bigsize */
 bigsize_t fromwire_bigsize(const u8 **cursor UNNEEDED, size_t *max UNNEEDED)
 { fprintf(stderr, "fromwire_bigsize called!\n"); abort(); }
+/* Generated stub for fromwire_sciddir_or_pubkey */
+void fromwire_sciddir_or_pubkey(const u8 **cursor UNNEEDED, size_t *max UNNEEDED,
+				struct sciddir_or_pubkey *sciddpk UNNEEDED)
+{ fprintf(stderr, "fromwire_sciddir_or_pubkey called!\n"); abort(); }
 /* Generated stub for fromwire_tlv */
 bool fromwire_tlv(const u8 **cursor UNNEEDED, size_t *max UNNEEDED,
 		  const struct tlv_record_type *types UNNEEDED, size_t num_types UNNEEDED,
@@ -92,6 +96,10 @@ void towire_amount_msat(u8 **pptr UNNEEDED, const struct amount_msat msat UNNEED
 /* Generated stub for towire_bigsize */
 void towire_bigsize(u8 **pptr UNNEEDED, const bigsize_t val UNNEEDED)
 { fprintf(stderr, "towire_bigsize called!\n"); abort(); }
+/* Generated stub for towire_sciddir_or_pubkey */
+void towire_sciddir_or_pubkey(u8 **pptr UNNEEDED,
+			      const struct sciddir_or_pubkey *sciddpk UNNEEDED)
+{ fprintf(stderr, "towire_sciddir_or_pubkey called!\n"); abort(); }
 /* Generated stub for towire_tlv */
 void towire_tlv(u8 **pptr UNNEEDED,
 		const struct tlv_record_type *types UNNEEDED, size_t num_types UNNEEDED,