aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-24 01:24:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

devtools/blindedpath: add --simple-output for use from python.

Browse Source 
Normal output is suitable for feeding to devtools/onion, but for python tests
we want something simpler.

Ideally, we'd simply generate blinded paths in pyln.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2020-04-01 14:23:22 +10:30
parent 74228605ef
commit fcc68b9b06
1 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
devtools/blindedpath.c
View File

@@ -19,6 +19,8 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
static bool simpleout = false;
/* Tal wrappers for opt. */ /* Tal wrappers for opt. */
static void *opt_allocfn(size_t size) static void *opt_allocfn(size_t size)
{ {
@@ -99,6 +101,8 @@ int main(int argc, char **argv)
"Show this message"); "Show this message");
opt_register_noarg("--first-node", opt_set_bool, &first, opt_register_noarg("--first-node", opt_set_bool, &first,
"Don't try to tweak key to unwrap onion"); "Don't try to tweak key to unwrap onion");
opt_register_noarg("--simple-output", opt_set_bool, &simpleout,
"Output values without prefixes, one per line");
opt_register_version(); opt_register_version();
opt_parse(&argc, argv, opt_log_stderr_exit); opt_parse(&argc, argv, opt_log_stderr_exit);
@@ -158,8 +162,12 @@ int main(int argc, char **argv)
} }
/* Print initial blinding factor */ /* Print initial blinding factor */
printf("Blinding: %s\n", if (simpleout)
type_to_string(tmpctx, struct pubkey, &pk_e[0])); printf("%s\n",
type_to_string(tmpctx, struct pubkey, &pk_e[0]));
else
printf("Blinding: %s\n",
type_to_string(tmpctx, struct pubkey, &pk_e[0]));
for (size_t i = 0; i < num - 1; i++) { for (size_t i = 0; i < num - 1; i++) {
u8 *p; u8 *p;
@@ -192,16 +200,28 @@ int main(int argc, char **argv)
towire_onionmsg_payload(&p, outer); towire_onionmsg_payload(&p, outer);
ret = bigsize_put(buf, tal_bytelen(p)); ret = bigsize_put(buf, tal_bytelen(p));
/* devtools/onion wants length explicitly prepended */ if (simpleout) {
printf("%s/%.*s%s ", printf("%s\n%s\n",
type_to_string(tmpctx, struct pubkey, &b[i]), type_to_string(tmpctx, struct pubkey,
ret * 2, &b[i]),
tal_hexstr(tmpctx, buf, ret), tal_hex(tmpctx, outer->enctlv->enctlv));
tal_hex(tmpctx, p)); } else {
/* devtools/onion wants length explicitly prepended */
printf("%s/%.*s%s ",
type_to_string(tmpctx, struct pubkey,
&b[i]),
ret * 2,
tal_hexstr(tmpctx, buf, ret),
tal_hex(tmpctx, p));
}
} }
/* No payload for last node */ /* No payload for last node */
printf("%s/00\n", if (simpleout)
type_to_string(tmpctx, struct pubkey, &b[num-1])); printf("%s\n",
type_to_string(tmpctx, struct pubkey, &b[num-1]));
else
printf("%s/00\n",
type_to_string(tmpctx, struct pubkey, &b[num-1]));
} else if (streq(argv[1], "unwrap")) { } else if (streq(argv[1], "unwrap")) {
struct privkey privkey; struct privkey privkey;
struct pubkey blinding; struct pubkey blinding;