diff --git a/common/test/run-route_blinding_override_test.c b/common/test/run-route_blinding_override_test.c deleted file mode 100644 index 8f8c916f1..000000000 --- a/common/test/run-route_blinding_override_test.c +++ /dev/null @@ -1,362 +0,0 @@ -#include "config.h" -#include "../bigsize.c" -#include "../blindedpath.c" -#include "../blinding.c" -#include "../hmac.c" -#include "../type_to_string.c" -#include -#include -#include -#include -#include -#include -#include -#include - -/* AUTOGENERATED MOCKS START */ -/* Generated stub for amount_asset_is_main */ -bool amount_asset_is_main(struct amount_asset *asset UNNEEDED) -{ fprintf(stderr, "amount_asset_is_main called!\n"); abort(); } -/* Generated stub for amount_asset_to_sat */ -struct amount_sat amount_asset_to_sat(struct amount_asset *asset UNNEEDED) -{ fprintf(stderr, "amount_asset_to_sat called!\n"); abort(); } -/* Generated stub for amount_sat */ -struct amount_sat amount_sat(u64 satoshis UNNEEDED) -{ fprintf(stderr, "amount_sat called!\n"); abort(); } -/* Generated stub for amount_sat_add */ - bool amount_sat_add(struct amount_sat *val UNNEEDED, - struct amount_sat a UNNEEDED, - struct amount_sat b UNNEEDED) -{ fprintf(stderr, "amount_sat_add called!\n"); abort(); } -/* Generated stub for amount_sat_eq */ -bool amount_sat_eq(struct amount_sat a UNNEEDED, struct amount_sat b UNNEEDED) -{ fprintf(stderr, "amount_sat_eq called!\n"); abort(); } -/* Generated stub for amount_sat_greater_eq */ -bool amount_sat_greater_eq(struct amount_sat a UNNEEDED, struct amount_sat b UNNEEDED) -{ fprintf(stderr, "amount_sat_greater_eq called!\n"); abort(); } -/* Generated stub for amount_sat_sub */ - bool amount_sat_sub(struct amount_sat *val UNNEEDED, - struct amount_sat a UNNEEDED, - struct amount_sat b UNNEEDED) -{ fprintf(stderr, "amount_sat_sub called!\n"); abort(); } -/* Generated stub for amount_sat_to_asset */ -struct amount_asset amount_sat_to_asset(struct amount_sat *sat UNNEEDED, const u8 *asset UNNEEDED) -{ fprintf(stderr, "amount_sat_to_asset called!\n"); abort(); } -/* Generated stub for amount_sat_to_msat */ - bool amount_sat_to_msat(struct amount_msat *msat UNNEEDED, - struct amount_sat sat UNNEEDED) -{ fprintf(stderr, "amount_sat_to_msat called!\n"); abort(); } -/* Generated stub for amount_tx_fee */ -struct amount_sat amount_tx_fee(u32 fee_per_kw UNNEEDED, size_t weight UNNEEDED) -{ fprintf(stderr, "amount_tx_fee called!\n"); abort(); } -/* 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_amount_sat */ -struct amount_sat fromwire_amount_sat(const u8 **cursor UNNEEDED, size_t *max UNNEEDED) -{ fprintf(stderr, "fromwire_amount_sat called!\n"); abort(); } -/* Generated stub for fromwire_channel_id */ -bool fromwire_channel_id(const u8 **cursor UNNEEDED, size_t *max UNNEEDED, - struct channel_id *channel_id UNNEEDED) -{ fprintf(stderr, "fromwire_channel_id called!\n"); abort(); } -/* 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 json_get_member */ -const jsmntok_t *json_get_member(const char *buffer UNNEEDED, const jsmntok_t tok[] UNNEEDED, - const char *label UNNEEDED) -{ fprintf(stderr, "json_get_member called!\n"); abort(); } -/* Generated stub for json_next */ -const jsmntok_t *json_next(const jsmntok_t *tok UNNEEDED) -{ fprintf(stderr, "json_next called!\n"); abort(); } -/* Generated stub for json_to_pubkey */ -bool json_to_pubkey(const char *buffer UNNEEDED, const jsmntok_t *tok UNNEEDED, - struct pubkey *pubkey UNNEEDED) -{ fprintf(stderr, "json_to_pubkey called!\n"); abort(); } -/* Generated stub for json_to_secret */ -bool json_to_secret(const char *buffer UNNEEDED, const jsmntok_t *tok UNNEEDED, struct secret *dest UNNEEDED) -{ fprintf(stderr, "json_to_secret called!\n"); abort(); } -/* Generated stub for json_to_short_channel_id */ -bool json_to_short_channel_id(const char *buffer UNNEEDED, const jsmntok_t *tok UNNEEDED, - struct short_channel_id *scid UNNEEDED) -{ fprintf(stderr, "json_to_short_channel_id called!\n"); abort(); } -/* Generated stub for json_tok_bin_from_hex */ -u8 *json_tok_bin_from_hex(const tal_t *ctx UNNEEDED, const char *buffer UNNEEDED, const jsmntok_t *tok UNNEEDED) -{ fprintf(stderr, "json_tok_bin_from_hex called!\n"); abort(); } -/* Generated stub for json_tok_startswith */ -bool json_tok_startswith(const char *buffer UNNEEDED, const jsmntok_t *tok UNNEEDED, - const char *prefix UNNEEDED) -{ fprintf(stderr, "json_tok_startswith called!\n"); abort(); } -/* Generated stub for json_tok_streq */ -bool json_tok_streq(const char *buffer UNNEEDED, const jsmntok_t *tok UNNEEDED, const char *str UNNEEDED) -{ fprintf(stderr, "json_tok_streq 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_amount_sat */ -void towire_amount_sat(u8 **pptr UNNEEDED, const struct amount_sat sat UNNEEDED) -{ fprintf(stderr, "towire_amount_sat called!\n"); abort(); } -/* Generated stub for towire_channel_id */ -void towire_channel_id(u8 **pptr UNNEEDED, const struct channel_id *channel_id UNNEEDED) -{ fprintf(stderr, "towire_channel_id called!\n"); abort(); } -/* 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(); } -/* AUTOGENERATED MOCKS END */ - -static u8 *json_to_enctlvs(const tal_t *ctx, - const char *buf, const jsmntok_t *tlvs) -{ - struct tlv_encrypted_data_tlv *enctlv = tlv_encrypted_data_tlv_new(tmpctx); - size_t i; - const jsmntok_t *t; - u8 *ret, *appended = tal_arr(tmpctx, u8, 0); - - json_for_each_obj(i, t, tlvs) { - if (json_tok_streq(buf, t, "short_channel_id")) { - enctlv->short_channel_id = tal(enctlv, struct short_channel_id); - assert(json_to_short_channel_id(buf, t+1, - enctlv->short_channel_id)); - } else if (json_tok_streq(buf, t, "padding")) { - enctlv->padding = json_tok_bin_from_hex(enctlv, - buf, t+1); - assert(enctlv->padding); - } else if (json_tok_streq(buf, t, "next_node_id")) { - enctlv->next_node_id = tal(enctlv, struct pubkey); - assert(json_to_pubkey(buf, t+1, - enctlv->next_node_id)); - } else if (json_tok_streq(buf, t, "path_id")) { - enctlv->path_id = json_tok_bin_from_hex(enctlv, - buf, t+1); - assert(enctlv->path_id); - } else if (json_tok_streq(buf, t, "next_blinding_override")) { - enctlv->next_blinding_override = tal(enctlv, struct pubkey); - assert(json_to_pubkey(buf, t+1, - enctlv->next_blinding_override)); - } else { - u16 tagnum; - u8 *val; - assert(json_tok_startswith(buf, t, "unknown_tag_")); - tagnum = atoi(buf + t->start + strlen("unknown_tag_")); - assert(tagnum); - val = json_tok_bin_from_hex(enctlv, buf, t+1); - assert(val); - - /* We can't actually represent these in a way towire_ - * will see, so we literally append them */ - towire_bigsize(&appended, tagnum); - towire_bigsize(&appended, tal_bytelen(val)); - towire_u8_array(&appended, val, tal_bytelen(val)); - } - } - ret = tal_arr(ctx, u8, 0); - towire_tlv_encrypted_data_tlv(&ret, enctlv); - towire_u8_array(&ret, appended, tal_bytelen(appended)); - return ret; -} - -/* Updated each time, as we pretend to be Alice, Bob, Carol */ -static const struct privkey *mykey; - -static void test_ecdh(const struct pubkey *point, struct secret *ss) -{ - if (secp256k1_ecdh(secp256k1_ctx, ss->data, &point->pubkey, - mykey->secret.data, NULL, NULL) != 1) - abort(); -} - -int main(int argc, char *argv[]) -{ - char *json; - size_t i, num_sender_hops; - jsmn_parser parser; - jsmntok_t toks[5000]; - const jsmntok_t *t, *recip_route_hops, *recip_blinding_hops, - *sender_route_hops, *sender_blinding_hops, *unblinding_hops; - struct pubkey *ids; - u8 **enctlvs, **encrypted_data; - struct privkey blinding; - - common_setup(argv[0]); - - if (argv[1]) - json = grab_file(tmpctx, argv[1]); - else { - char *dir = getenv("BOLTDIR"); - json = grab_file(tmpctx, - path_join(tmpctx, - dir ? dir : "../bolts", - "bolt04/route-blinding-override-test.json")); - if (!json) { - printf("test file not found, skipping\n"); - goto out; - } - } - - jsmn_init(&parser); - if (jsmn_parse(&parser, json, strlen(json), toks, ARRAY_SIZE(toks)) < 0) - abort(); - - /* We concatenate the sender_route_blinding and the - * recipient_route_blinding to form a contiguous sequence of - * enctlvs */ - recip_route_hops = json_get_member(json, json_get_member(json, toks, "recipient_route"), "hops"); - sender_route_hops = json_get_member(json, json_get_member(json, toks, "sender_route"), "hops"); - recip_blinding_hops = json_get_member(json, json_get_member(json, toks, "recipient_route_blinding"), "hops"); - sender_blinding_hops = json_get_member(json, json_get_member(json, toks, "sender_route_blinding"), "hops"); - unblinding_hops = json_get_member(json, json_get_member(json, toks, "unblinding"), "hops"); - - assert(recip_route_hops->size == recip_blinding_hops->size); - assert(sender_route_hops->size == sender_blinding_hops->size); - num_sender_hops = sender_route_hops->size; - - ids = tal_arr(tmpctx, struct pubkey, - num_sender_hops + recip_route_hops->size); - enctlvs = tal_arr(tmpctx, u8 *, num_sender_hops + recip_route_hops->size); - json_for_each_arr(i, t, sender_route_hops) { - u8 *expected; - assert(json_to_pubkey(json, json_get_member(json, t, "node_id"), - &ids[i])); - enctlvs[i] = json_tok_bin_from_hex(enctlvs, json, - json_get_member(json, t, "encoded_tlvs")); - expected = json_to_enctlvs(tmpctx, json, - json_get_member(json, t, "tlvs")); - assert(memeq(expected, tal_bytelen(expected), - enctlvs[i], tal_bytelen(enctlvs[i]))); - } - - json_for_each_arr(i, t, recip_route_hops) { - u8 *expected; - assert(json_to_pubkey(json, json_get_member(json, t, "node_id"), - &ids[i + num_sender_hops])); - enctlvs[i + num_sender_hops] - = json_tok_bin_from_hex(enctlvs, json, - json_get_member(json, t, "encoded_tlvs")); - expected = json_to_enctlvs(tmpctx, json, - json_get_member(json, t, "tlvs")); - assert(memeq(expected, tal_bytelen(expected), - enctlvs[i + num_sender_hops], - tal_bytelen(enctlvs[i + num_sender_hops]))); - } - - encrypted_data = tal_arr(tmpctx, u8 *, - num_sender_hops + recip_route_hops->size); - - /* Now do the blinding. */ - json_for_each_arr(i, t, sender_blinding_hops) { - struct secret s; - struct pubkey pubkey, expected_pubkey; - u8 *expected_encdata; - struct pubkey alias, expected_alias; - - assert(json_to_secret(json, - json_get_member(json, t, "ephemeral_privkey"), - &s)); - - /* First blinding is stated, remainder are derived! */ - if (i == 0) { - blinding.secret = s; - } else - assert(secret_eq_consttime(&blinding.secret, &s)); - - assert(pubkey_from_privkey(&blinding, &pubkey)); - json_to_pubkey(json, json_get_member(json, t, "ephemeral_pubkey"), - &expected_pubkey); - assert(pubkey_eq(&pubkey, &expected_pubkey)); - - encrypted_data[i] = enctlv_from_encmsg_raw(encrypted_data, - &blinding, - &ids[i], - enctlvs[i], - &blinding, - &alias); - expected_encdata = json_tok_bin_from_hex(tmpctx,json, - json_get_member(json, t, - "encrypted_data")); - assert(memeq(encrypted_data[i], tal_bytelen(encrypted_data[i]), - expected_encdata, tal_bytelen(expected_encdata))); - - json_to_pubkey(json, json_get_member(json, t, "blinded_node_id"), - &expected_alias); - assert(pubkey_eq(&alias, &expected_alias)); - } - - /* At this point, we override the blinding! */ - json_for_each_arr(i, t, recip_blinding_hops) { - struct secret s; - struct pubkey pubkey, expected_pubkey; - u8 *expected_encdata; - struct pubkey alias, expected_alias; - - assert(json_to_secret(json, - json_get_member(json, t, "ephemeral_privkey"), - &s)); - - /* First blinding is from next_blinding_override, - * remainder are derived! */ - if (i == 0) { - blinding.secret = s; - } else - assert(secret_eq_consttime(&blinding.secret, &s)); - - assert(pubkey_from_privkey(&blinding, &pubkey)); - json_to_pubkey(json, json_get_member(json, t, "ephemeral_pubkey"), - &expected_pubkey); - assert(pubkey_eq(&pubkey, &expected_pubkey)); - - encrypted_data[i + num_sender_hops] - = enctlv_from_encmsg_raw(tmpctx, - &blinding, - &ids[i + num_sender_hops], - enctlvs[i + num_sender_hops], - &blinding, - &alias); - expected_encdata = json_tok_bin_from_hex(tmpctx,json, - json_get_member(json, t, - "encrypted_data")); - assert(memeq(encrypted_data[i + num_sender_hops], - tal_bytelen(encrypted_data[i + num_sender_hops]), - expected_encdata, tal_bytelen(expected_encdata))); - - json_to_pubkey(json, json_get_member(json, t, "blinded_node_id"), - &expected_alias); - assert(pubkey_eq(&alias, &expected_alias)); - } - - /* Now try unblinding */ - json_for_each_arr(i, t, unblinding_hops) { - struct privkey me; - struct secret ss; - struct pubkey blindingpub, expected_blinding; - struct pubkey onion_key, next_node; - - assert(json_to_secret(json, - json_get_member(json, t, "node_privkey"), - &me.secret)); - - mykey = &me; - assert(json_to_pubkey(json, - json_get_member(json, t, "ephemeral_pubkey"), - &blindingpub)); - - assert(unblind_onion(&blindingpub, test_ecdh, &onion_key, &ss)); - if (i != unblinding_hops->size - 1) { - assert(decrypt_enctlv(&blindingpub, &ss, encrypted_data[i], &next_node, &blindingpub)); - assert(json_to_pubkey(json, - json_get_member(json, t, "next_ephemeral_pubkey"), - &expected_blinding)); - assert(pubkey_eq(&blindingpub, &expected_blinding)); - } else { - struct secret *path_id; - struct pubkey my_id, alias; - assert(pubkey_from_privkey(&me, &my_id)); - assert(decrypt_final_enctlv(tmpctx, &blindingpub, &ss, - encrypted_data[i], - &my_id, &alias, - &path_id)); - } - } - -out: - common_shutdown(); -} diff --git a/common/test/run-route_blinding_test.c b/common/test/run-route_blinding_test.c index de1b7e038..4b079ed0d 100644 --- a/common/test/run-route_blinding_test.c +++ b/common/test/run-route_blinding_test.c @@ -1,8 +1,12 @@ #include "config.h" +#include "../amount.c" #include "../bigsize.c" #include "../blindedpath.c" #include "../blinding.c" +#include "../features.c" #include "../hmac.c" +#include "../json_parse.c" +#include "../json_parse_simple.c" #include "../type_to_string.c" #include #include @@ -14,47 +18,6 @@ #include /* AUTOGENERATED MOCKS START */ -/* Generated stub for amount_asset_is_main */ -bool amount_asset_is_main(struct amount_asset *asset UNNEEDED) -{ fprintf(stderr, "amount_asset_is_main called!\n"); abort(); } -/* Generated stub for amount_asset_to_sat */ -struct amount_sat amount_asset_to_sat(struct amount_asset *asset UNNEEDED) -{ fprintf(stderr, "amount_asset_to_sat called!\n"); abort(); } -/* Generated stub for amount_sat */ -struct amount_sat amount_sat(u64 satoshis UNNEEDED) -{ fprintf(stderr, "amount_sat called!\n"); abort(); } -/* Generated stub for amount_sat_add */ - bool amount_sat_add(struct amount_sat *val UNNEEDED, - struct amount_sat a UNNEEDED, - struct amount_sat b UNNEEDED) -{ fprintf(stderr, "amount_sat_add called!\n"); abort(); } -/* Generated stub for amount_sat_eq */ -bool amount_sat_eq(struct amount_sat a UNNEEDED, struct amount_sat b UNNEEDED) -{ fprintf(stderr, "amount_sat_eq called!\n"); abort(); } -/* Generated stub for amount_sat_greater_eq */ -bool amount_sat_greater_eq(struct amount_sat a UNNEEDED, struct amount_sat b UNNEEDED) -{ fprintf(stderr, "amount_sat_greater_eq called!\n"); abort(); } -/* Generated stub for amount_sat_sub */ - bool amount_sat_sub(struct amount_sat *val UNNEEDED, - struct amount_sat a UNNEEDED, - struct amount_sat b UNNEEDED) -{ fprintf(stderr, "amount_sat_sub called!\n"); abort(); } -/* Generated stub for amount_sat_to_asset */ -struct amount_asset amount_sat_to_asset(struct amount_sat *sat UNNEEDED, const u8 *asset UNNEEDED) -{ fprintf(stderr, "amount_sat_to_asset called!\n"); abort(); } -/* Generated stub for amount_sat_to_msat */ - bool amount_sat_to_msat(struct amount_msat *msat UNNEEDED, - struct amount_sat sat UNNEEDED) -{ fprintf(stderr, "amount_sat_to_msat called!\n"); abort(); } -/* Generated stub for amount_tx_fee */ -struct amount_sat amount_tx_fee(u32 fee_per_kw UNNEEDED, size_t weight UNNEEDED) -{ fprintf(stderr, "amount_tx_fee called!\n"); abort(); } -/* 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_amount_sat */ -struct amount_sat fromwire_amount_sat(const u8 **cursor UNNEEDED, size_t *max UNNEEDED) -{ fprintf(stderr, "fromwire_amount_sat called!\n"); abort(); } /* Generated stub for fromwire_channel_id */ bool fromwire_channel_id(const u8 **cursor UNNEEDED, size_t *max UNNEEDED, struct channel_id *channel_id UNNEEDED) @@ -62,40 +25,9 @@ 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 json_get_member */ -const jsmntok_t *json_get_member(const char *buffer UNNEEDED, const jsmntok_t tok[] UNNEEDED, - const char *label UNNEEDED) -{ fprintf(stderr, "json_get_member called!\n"); abort(); } -/* Generated stub for json_next */ -const jsmntok_t *json_next(const jsmntok_t *tok UNNEEDED) -{ fprintf(stderr, "json_next called!\n"); abort(); } -/* Generated stub for json_to_pubkey */ -bool json_to_pubkey(const char *buffer UNNEEDED, const jsmntok_t *tok UNNEEDED, - struct pubkey *pubkey UNNEEDED) -{ fprintf(stderr, "json_to_pubkey called!\n"); abort(); } -/* Generated stub for json_to_secret */ -bool json_to_secret(const char *buffer UNNEEDED, const jsmntok_t *tok UNNEEDED, struct secret *dest UNNEEDED) -{ fprintf(stderr, "json_to_secret called!\n"); abort(); } -/* Generated stub for json_to_short_channel_id */ -bool json_to_short_channel_id(const char *buffer UNNEEDED, const jsmntok_t *tok UNNEEDED, - struct short_channel_id *scid UNNEEDED) -{ fprintf(stderr, "json_to_short_channel_id called!\n"); abort(); } -/* Generated stub for json_tok_bin_from_hex */ -u8 *json_tok_bin_from_hex(const tal_t *ctx UNNEEDED, const char *buffer UNNEEDED, const jsmntok_t *tok UNNEEDED) -{ fprintf(stderr, "json_tok_bin_from_hex called!\n"); abort(); } -/* Generated stub for json_tok_startswith */ -bool json_tok_startswith(const char *buffer UNNEEDED, const jsmntok_t *tok UNNEEDED, - const char *prefix UNNEEDED) -{ fprintf(stderr, "json_tok_startswith called!\n"); abort(); } -/* Generated stub for json_tok_streq */ -bool json_tok_streq(const char *buffer UNNEEDED, const jsmntok_t *tok UNNEEDED, const char *str UNNEEDED) -{ fprintf(stderr, "json_tok_streq 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_amount_sat */ -void towire_amount_sat(u8 **pptr UNNEEDED, const struct amount_sat sat UNNEEDED) -{ fprintf(stderr, "towire_amount_sat 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(); } /* Generated stub for towire_channel_id */ void towire_channel_id(u8 **pptr UNNEEDED, const struct channel_id *channel_id UNNEEDED) { fprintf(stderr, "towire_channel_id called!\n"); abort(); } @@ -104,6 +36,53 @@ void towire_node_id(u8 **pptr UNNEEDED, const struct node_id *id UNNEEDED) { fprintf(stderr, "towire_node_id called!\n"); abort(); } /* AUTOGENERATED MOCKS END */ +static struct tlv_encrypted_data_tlv_payment_constraints * +json_to_payment_constraints(const tal_t *ctx, const char *buf, const jsmntok_t *t) +{ + struct tlv_encrypted_data_tlv_payment_constraints *pc + = tal(ctx, struct tlv_encrypted_data_tlv_payment_constraints); + + assert(json_to_u32(buf, json_get_member(buf, t, "max_cltv_expiry"), + &pc->max_cltv_expiry)); + assert(json_to_u64(buf, json_get_member(buf, t, "htlc_minimum_msat"), + &pc->htlc_minimum_msat)); + return pc; +} + +static struct tlv_encrypted_data_tlv_payment_relay * +json_to_payment_relay(const tal_t *ctx, const char *buf, const jsmntok_t *t) +{ + struct tlv_encrypted_data_tlv_payment_relay *relay + = tal(ctx, struct tlv_encrypted_data_tlv_payment_relay); + + assert(json_to_u16(buf, json_get_member(buf, t, "cltv_expiry_delta"), + &relay->cltv_expiry_delta)); + assert(json_to_u32(buf, json_get_member(buf, t, "fee_proportional_millionths"), + &relay->fee_proportional_millionths)); + if (json_get_member(buf, t, "fee_base_msat")) + assert(json_to_u32(buf, json_get_member(buf, t, "fee_base_msat"), + &relay->fee_base_msat)); + else + relay->fee_base_msat = 0; + return relay; +} + +static u8 *json_to_allowed_features(const tal_t *ctx, + const char *buf, const jsmntok_t *t) +{ + size_t i; + const jsmntok_t *f, *features = json_get_member(buf, t, "features"); + u8 *allowed_features; + + allowed_features = tal_arr(ctx, u8, 0); + json_for_each_arr(i, f, features) { + u32 n; + assert(json_to_u32(buf, f, &n)); + set_feature_bit(&allowed_features, n); + } + return allowed_features; +} + static u8 *json_to_enctlvs(const tal_t *ctx, const char *buf, const jsmntok_t *tlvs) { @@ -129,6 +108,16 @@ static u8 *json_to_enctlvs(const tal_t *ctx, enctlv->path_id = json_tok_bin_from_hex(enctlv, buf, t+1); assert(enctlv->path_id); + } else if (json_tok_streq(buf, t, "next_blinding_override")) { + enctlv->next_blinding_override = tal(enctlv, struct pubkey); + assert(json_to_pubkey(buf, t+1, + enctlv->next_blinding_override)); + } else if (json_tok_streq(buf, t, "payment_relay")) { + enctlv->payment_relay = json_to_payment_relay(enctlv, buf, t+1); + } else if (json_tok_streq(buf, t, "payment_constraints")) { + enctlv->payment_constraints = json_to_payment_constraints(enctlv, buf, t+1); + } else if (json_tok_streq(buf, t, "allowed_features")) { + enctlv->allowed_features = json_to_allowed_features(enctlv, buf, t+1); } else { u16 tagnum; u8 *val; @@ -182,7 +171,7 @@ int main(int argc, char *argv[]) if (jsmn_parse(&parser, json, strlen(json), toks, ARRAY_SIZE(toks)) < 0) abort(); - hops_tok = json_get_member(json, json_get_member(json, toks, "route"), "hops"); + hops_tok = json_get_member(json, json_get_member(json, toks, "generate"), "hops"); ids = tal_arr(tmpctx, struct pubkey, hops_tok->size); enctlvs = tal_arr(tmpctx, u8 *, hops_tok->size); @@ -199,9 +188,6 @@ int main(int argc, char *argv[]) } /* Now do the blinding. */ - hops_tok = json_get_member(json, json_get_member(json, toks, "blinding"), "hops"); - assert(hops_tok->size == tal_count(ids)); - json_for_each_arr(i, t, hops_tok) { struct secret s; struct pubkey pubkey, expected_pubkey; @@ -212,10 +198,13 @@ int main(int argc, char *argv[]) json_get_member(json, t, "ephemeral_privkey"), &s)); - /* First blinding is stated, remainder are derived! */ - if (i == 0) { - blinding.secret = s; - } else + /* First blinding/replacement is stated, remainder are + * derived! */ + if (json_get_member(json, t, "session_key")) + assert(json_to_secret(json, + json_get_member(json, t, "session_key"), + &blinding.secret)); + else assert(secret_eq_consttime(&blinding.secret, &s)); assert(pubkey_from_privkey(&blinding, &pubkey));