diff --git a/channeld/channeld_wiregen.c b/channeld/channeld_wiregen.c index f6465a8c0..705f2b09a 100644 --- a/channeld/channeld_wiregen.c +++ b/channeld/channeld_wiregen.c @@ -1184,5 +1184,4 @@ bool fromwire_send_onionmsg(const tal_t *ctx, const void *p, u8 onion[1366], str } return cursor != NULL; } - -// SHA256STAMP:b336984ad884507c4624dec512a7ac93b4bfe92d543a1e077a1d2cf7d3c30fd3 +// SHA256STAMP:b706854b9a5a26d5176006150ca8a0d18def0fe79a255b55383a3b5beb6f86af diff --git a/channeld/channeld_wiregen.h b/channeld/channeld_wiregen.h index 082d9381e..2a265b599 100644 --- a/channeld/channeld_wiregen.h +++ b/channeld/channeld_wiregen.h @@ -229,5 +229,4 @@ bool fromwire_send_onionmsg(const tal_t *ctx, const void *p, u8 onion[1366], str #endif /* LIGHTNING_CHANNELD_CHANNELD_WIREGEN_H */ - -// SHA256STAMP:b336984ad884507c4624dec512a7ac93b4bfe92d543a1e077a1d2cf7d3c30fd3 +// SHA256STAMP:b706854b9a5a26d5176006150ca8a0d18def0fe79a255b55383a3b5beb6f86af diff --git a/closingd/closingd_wiregen.c b/closingd/closingd_wiregen.c index b3a9e1dfc..5e1a4692d 100644 --- a/closingd/closingd_wiregen.c +++ b/closingd/closingd_wiregen.c @@ -199,5 +199,4 @@ bool fromwire_closingd_complete(const void *p) return false; return cursor != NULL; } - -// SHA256STAMP:dbd3c58cd169d183d94e9b40e53243eb300e32d514f7891f332a117ff50f569c +// SHA256STAMP:b6e109cf1e06fb2421d1ee78a18015e2f4b8e0697509409357735aaba2a479a5 diff --git a/closingd/closingd_wiregen.h b/closingd/closingd_wiregen.h index 9def7c7ae..d48fd8af8 100644 --- a/closingd/closingd_wiregen.h +++ b/closingd/closingd_wiregen.h @@ -55,5 +55,4 @@ bool fromwire_closingd_complete(const void *p); #endif /* LIGHTNING_CLOSINGD_CLOSINGD_WIREGEN_H */ - -// SHA256STAMP:dbd3c58cd169d183d94e9b40e53243eb300e32d514f7891f332a117ff50f569c +// SHA256STAMP:b6e109cf1e06fb2421d1ee78a18015e2f4b8e0697509409357735aaba2a479a5 diff --git a/common/peer_status_wiregen.c b/common/peer_status_wiregen.c index e54b01d13..d1c32dbc2 100644 --- a/common/peer_status_wiregen.c +++ b/common/peer_status_wiregen.c @@ -80,5 +80,4 @@ bool fromwire_status_peer_error(const tal_t *ctx, const void *p, struct channel_ fromwire_u8_array(&cursor, &plen, *error_for_them, len); return cursor != NULL; } - -// SHA256STAMP:e956fdfdddc89d050229153e3db7a9539795b35b23d4c132f0f65eb0cc339d97 +// SHA256STAMP:f544c3823afd22d04793aed1f57fdaa57eecb207d1ad8186d0259c24c391b138 diff --git a/common/peer_status_wiregen.h b/common/peer_status_wiregen.h index 1198d0fed..0bd106d17 100644 --- a/common/peer_status_wiregen.h +++ b/common/peer_status_wiregen.h @@ -34,5 +34,4 @@ bool fromwire_status_peer_error(const tal_t *ctx, const void *p, struct channel_ #endif /* LIGHTNING_COMMON_PEER_STATUS_WIREGEN_H */ - -// SHA256STAMP:e956fdfdddc89d050229153e3db7a9539795b35b23d4c132f0f65eb0cc339d97 +// SHA256STAMP:f544c3823afd22d04793aed1f57fdaa57eecb207d1ad8186d0259c24c391b138 diff --git a/common/status_wiregen.c b/common/status_wiregen.c index 8978ba818..4a263041e 100644 --- a/common/status_wiregen.c +++ b/common/status_wiregen.c @@ -191,5 +191,4 @@ bool fromwire_status_peer_billboard(const tal_t *ctx, const void *p, bool *perm, *happenings = fromwire_wirestring(ctx, &cursor, &plen); return cursor != NULL; } - -// SHA256STAMP:8459550d3539dee0f13d3c40aa017972987cd7901131fdaa1be05d393424636c +// SHA256STAMP:473107ef4898aae5b290a9b994c0d17122ece1cdf07f50e34bc10ad0f84bcbd6 diff --git a/common/status_wiregen.h b/common/status_wiregen.h index 3ca1866ba..21639ffd0 100644 --- a/common/status_wiregen.h +++ b/common/status_wiregen.h @@ -53,5 +53,4 @@ bool fromwire_status_peer_billboard(const tal_t *ctx, const void *p, bool *perm, #endif /* LIGHTNING_COMMON_STATUS_WIREGEN_H */ - -// SHA256STAMP:8459550d3539dee0f13d3c40aa017972987cd7901131fdaa1be05d393424636c +// SHA256STAMP:473107ef4898aae5b290a9b994c0d17122ece1cdf07f50e34bc10ad0f84bcbd6 diff --git a/connectd/connectd_gossipd_wiregen.c b/connectd/connectd_gossipd_wiregen.c index 2bf116c7c..c34a528f5 100644 --- a/connectd/connectd_gossipd_wiregen.c +++ b/connectd/connectd_gossipd_wiregen.c @@ -161,5 +161,4 @@ bool fromwire_gossipd_get_addrs_reply(const tal_t *ctx, const void *p, struct wi fromwire_wireaddr(&cursor, &plen, *addrs + i); return cursor != NULL; } - -// SHA256STAMP:ff16f166eb5fe1a4389c503645deeea4b3e782cc3fb3fda7c87fab32c7f2ee05 +// SHA256STAMP:a1efacc8ceb430e230ca7a5fb382307f3f86d95ac6cd1d67596294f98adc63f3 diff --git a/connectd/connectd_gossipd_wiregen.h b/connectd/connectd_gossipd_wiregen.h index 130c1a64e..956db8c71 100644 --- a/connectd/connectd_gossipd_wiregen.h +++ b/connectd/connectd_gossipd_wiregen.h @@ -54,5 +54,4 @@ bool fromwire_gossipd_get_addrs_reply(const tal_t *ctx, const void *p, struct wi #endif /* LIGHTNING_CONNECTD_CONNECTD_GOSSIPD_WIREGEN_H */ - -// SHA256STAMP:ff16f166eb5fe1a4389c503645deeea4b3e782cc3fb3fda7c87fab32c7f2ee05 +// SHA256STAMP:a1efacc8ceb430e230ca7a5fb382307f3f86d95ac6cd1d67596294f98adc63f3 diff --git a/connectd/connectd_wiregen.c b/connectd/connectd_wiregen.c index 69b84a5b4..b7988d927 100644 --- a/connectd/connectd_wiregen.c +++ b/connectd/connectd_wiregen.c @@ -404,5 +404,4 @@ bool fromwire_connectd_dev_memleak_reply(const void *p, bool *leak) *leak = fromwire_bool(&cursor, &plen); return cursor != NULL; } - -// SHA256STAMP:63529c4b1d95e8cb69c017829e3269e72c0d884545ae67b925f424b231c9633a +// SHA256STAMP:ae6ae82d79526abc039896e90f677549a6acb73c0a2cd171f6658849025318b5 diff --git a/connectd/connectd_wiregen.h b/connectd/connectd_wiregen.h index 000965369..4ab89fda8 100644 --- a/connectd/connectd_wiregen.h +++ b/connectd/connectd_wiregen.h @@ -103,5 +103,4 @@ bool fromwire_connectd_dev_memleak_reply(const void *p, bool *leak); #endif /* LIGHTNING_CONNECTD_CONNECTD_WIREGEN_H */ - -// SHA256STAMP:63529c4b1d95e8cb69c017829e3269e72c0d884545ae67b925f424b231c9633a +// SHA256STAMP:ae6ae82d79526abc039896e90f677549a6acb73c0a2cd171f6658849025318b5 diff --git a/gossipd/gossip_store_wiregen.c b/gossipd/gossip_store_wiregen.c index e042260ed..e9da88a18 100644 --- a/gossipd/gossip_store_wiregen.c +++ b/gossipd/gossip_store_wiregen.c @@ -117,5 +117,4 @@ bool fromwire_gossip_store_delete_chan(const void *p, struct short_channel_id *s fromwire_short_channel_id(&cursor, &plen, scid); return cursor != NULL; } - -// SHA256STAMP:96e087792923799ac0e76d097bbf30972d627228742d69d9b1f90100cae8241a +// SHA256STAMP:6c656ed77dab897dd0f8a9bb0bbdc9bfc5ad61f82d7ec6800d0987f766213e73 diff --git a/gossipd/gossip_store_wiregen.h b/gossipd/gossip_store_wiregen.h index c621e16e2..541531bf5 100644 --- a/gossipd/gossip_store_wiregen.h +++ b/gossipd/gossip_store_wiregen.h @@ -43,5 +43,4 @@ bool fromwire_gossip_store_delete_chan(const void *p, struct short_channel_id *s #endif /* LIGHTNING_GOSSIPD_GOSSIP_STORE_WIREGEN_H */ - -// SHA256STAMP:96e087792923799ac0e76d097bbf30972d627228742d69d9b1f90100cae8241a +// SHA256STAMP:6c656ed77dab897dd0f8a9bb0bbdc9bfc5ad61f82d7ec6800d0987f766213e73 diff --git a/gossipd/gossipd_peerd_wiregen.c b/gossipd/gossipd_peerd_wiregen.c index 112754a3e..618e2e9e7 100644 --- a/gossipd/gossipd_peerd_wiregen.c +++ b/gossipd/gossipd_peerd_wiregen.c @@ -226,5 +226,4 @@ bool fromwire_gossipd_local_channel_announcement(const tal_t *ctx, const void *p fromwire_u8_array(&cursor, &plen, *cannount, len); return cursor != NULL; } - -// SHA256STAMP:8d8786f111a7dea8a44e064e382adf00265494b06cdf4cef1c6466bd03878b73 +// SHA256STAMP:1ce1a60212ceeda5de7592f21328824690a16a1b6e59a4fc14e08fab9d355736 diff --git a/gossipd/gossipd_peerd_wiregen.h b/gossipd/gossipd_peerd_wiregen.h index ba46fe7d7..ac92a935e 100644 --- a/gossipd/gossipd_peerd_wiregen.h +++ b/gossipd/gossipd_peerd_wiregen.h @@ -76,5 +76,4 @@ bool fromwire_gossipd_local_channel_announcement(const tal_t *ctx, const void *p #endif /* LIGHTNING_GOSSIPD_GOSSIPD_PEERD_WIREGEN_H */ - -// SHA256STAMP:8d8786f111a7dea8a44e064e382adf00265494b06cdf4cef1c6466bd03878b73 +// SHA256STAMP:1ce1a60212ceeda5de7592f21328824690a16a1b6e59a4fc14e08fab9d355736 diff --git a/gossipd/gossipd_wiregen.c b/gossipd/gossipd_wiregen.c index 7f88f336f..c87f31678 100644 --- a/gossipd/gossipd_wiregen.c +++ b/gossipd/gossipd_wiregen.c @@ -857,5 +857,4 @@ bool fromwire_gossipd_new_blockheight(const void *p, u32 *blockheight) *blockheight = fromwire_u32(&cursor, &plen); return cursor != NULL; } - -// SHA256STAMP:9ac18b60ff39a11d7871d17a660aa9661a49d2585abe25d0ba0e048c32ac02eb +// SHA256STAMP:a494fd8a3f5ae31d113f387445744dd19490149be92d83f9bf61cc952457ad8f diff --git a/gossipd/gossipd_wiregen.h b/gossipd/gossipd_wiregen.h index 83743247d..edf2d666e 100644 --- a/gossipd/gossipd_wiregen.h +++ b/gossipd/gossipd_wiregen.h @@ -199,5 +199,4 @@ bool fromwire_gossipd_new_blockheight(const void *p, u32 *blockheight); #endif /* LIGHTNING_GOSSIPD_GOSSIPD_WIREGEN_H */ - -// SHA256STAMP:9ac18b60ff39a11d7871d17a660aa9661a49d2585abe25d0ba0e048c32ac02eb +// SHA256STAMP:a494fd8a3f5ae31d113f387445744dd19490149be92d83f9bf61cc952457ad8f diff --git a/hsmd/hsmd_wiregen.c b/hsmd/hsmd_wiregen.c index 4ae018fda..1b1d73724 100644 --- a/hsmd/hsmd_wiregen.c +++ b/hsmd/hsmd_wiregen.c @@ -1214,5 +1214,4 @@ bool fromwire_hsmd_get_output_scriptpubkey_reply(const tal_t *ctx, const void *p fromwire_u8_array(&cursor, &plen, *script, script_len); return cursor != NULL; } - -// SHA256STAMP:a5ae76a1418b72d95fbb559fe568596318040de4e3726f2317969b9d9eee7788 +// SHA256STAMP:6f67af9abcc4b8cd7fd2b0580341f72dd7ca323a4f1fa8fc02c97b83d63dec82 diff --git a/hsmd/hsmd_wiregen.h b/hsmd/hsmd_wiregen.h index 7618671c6..030db3ea2 100644 --- a/hsmd/hsmd_wiregen.h +++ b/hsmd/hsmd_wiregen.h @@ -271,5 +271,4 @@ bool fromwire_hsmd_get_output_scriptpubkey_reply(const tal_t *ctx, const void *p #endif /* LIGHTNING_HSMD_HSMD_WIREGEN_H */ - -// SHA256STAMP:a5ae76a1418b72d95fbb559fe568596318040de4e3726f2317969b9d9eee7788 +// SHA256STAMP:6f67af9abcc4b8cd7fd2b0580341f72dd7ca323a4f1fa8fc02c97b83d63dec82 diff --git a/onchaind/onchaind_wiregen.c b/onchaind/onchaind_wiregen.c index d3ef707fc..99a1e92f5 100644 --- a/onchaind/onchaind_wiregen.c +++ b/onchaind/onchaind_wiregen.c @@ -635,5 +635,4 @@ bool fromwire_onchaind_notify_coin_mvt(const void *p, struct chain_coin_mvt *mvt fromwire_chain_coin_mvt(&cursor, &plen, mvt); return cursor != NULL; } - -// SHA256STAMP:e21aeee2bb2e0c56f77595f7083aaacecdaf2b88b6808b33a63de4adcce58de8 +// SHA256STAMP:9f47e39e5ad9fb20dd7aa39f76a630b3ee41e430620975be8077f7f47e6febe6 diff --git a/onchaind/onchaind_wiregen.h b/onchaind/onchaind_wiregen.h index 9fc99665d..e8e009806 100644 --- a/onchaind/onchaind_wiregen.h +++ b/onchaind/onchaind_wiregen.h @@ -161,5 +161,4 @@ bool fromwire_onchaind_notify_coin_mvt(const void *p, struct chain_coin_mvt *mvt #endif /* LIGHTNING_ONCHAIND_ONCHAIND_WIREGEN_H */ - -// SHA256STAMP:e21aeee2bb2e0c56f77595f7083aaacecdaf2b88b6808b33a63de4adcce58de8 +// SHA256STAMP:9f47e39e5ad9fb20dd7aa39f76a630b3ee41e430620975be8077f7f47e6febe6 diff --git a/openingd/openingd_wiregen.c b/openingd/openingd_wiregen.c index 2bb437465..68ba3c2ba 100644 --- a/openingd/openingd_wiregen.c +++ b/openingd/openingd_wiregen.c @@ -579,5 +579,4 @@ bool fromwire_openingd_dev_memleak_reply(const void *p, bool *leak) *leak = fromwire_bool(&cursor, &plen); return cursor != NULL; } - -// SHA256STAMP:164910f4bbe7967d43674158574280364e83db53c4487f5f470ac0d2a929f90b +// SHA256STAMP:8fda6ba9ec7bc264356849e91e6ad850ef2ee9c3dddf0dfdd7a2ac2cf4017abd diff --git a/openingd/openingd_wiregen.h b/openingd/openingd_wiregen.h index 08c9057db..dc26456c4 100644 --- a/openingd/openingd_wiregen.h +++ b/openingd/openingd_wiregen.h @@ -121,5 +121,4 @@ bool fromwire_openingd_dev_memleak_reply(const void *p, bool *leak); #endif /* LIGHTNING_OPENINGD_OPENINGD_WIREGEN_H */ - -// SHA256STAMP:164910f4bbe7967d43674158574280364e83db53c4487f5f470ac0d2a929f90b +// SHA256STAMP:8fda6ba9ec7bc264356849e91e6ad850ef2ee9c3dddf0dfdd7a2ac2cf4017abd diff --git a/tools/gen/impl_template b/tools/gen/impl_template index edeee0b8f..ca02d0d4f 100644 --- a/tools/gen/impl_template +++ b/tools/gen/impl_template @@ -296,9 +296,7 @@ bool fromwire_${tlv.name}(const u8 **cursor, size_t *max, struct ${tlv.struct_na /* BOLT #1: * - * A `varint` is a variable-length, unsigned integer encoding - * using the [BigSize](#appendix-a-bigsize-test-vectors) - * format + * The `type` is encoded using the BigSize format. */ field.numtype = fromwire_bigsize(cursor, max); @@ -396,7 +394,9 @@ bool ${tlv.name}_is_valid(const struct ${tlv.struct_name()} *record, size_t *err return false; } else if (!first && f->numtype <= prev_type) { /* BOLT #1: - * - if decoded `type`s are not monotonically-increasing: + * - if decoded `type`s are not strictly-increasing + * (including situations when two or more occurrences + * of the same `type` are met): * - MUST fail to parse the `tlv_stream`. */ if (f->numtype == prev_type) diff --git a/tools/generate-wire.py b/tools/generate-wire.py index 9714c90dc..4aaeb3e90 100755 --- a/tools/generate-wire.py +++ b/tools/generate-wire.py @@ -537,7 +537,8 @@ class Master(object): stuff['messages'] = list(self.messages.values()) + list(self.extension_msgs.values()) stuff['subtypes'] = subtypes - print(template.render(**stuff), file=output) + for line in template.render(**stuff).splitlines(): + print(line.rstrip(), file=output) def main(options, args=None, output=sys.stdout, lines=None): diff --git a/wire/common_wiregen.c b/wire/common_wiregen.c index ec0b1c5f2..973c93709 100644 --- a/wire/common_wiregen.c +++ b/wire/common_wiregen.c @@ -100,5 +100,4 @@ bool fromwire_custommsg_out(const tal_t *ctx, const void *p, u8 **msg) fromwire_u8_array(&cursor, &plen, *msg, msg_len); return cursor != NULL; } - -// SHA256STAMP:b7c32f920bcd5725670e679935629442e3866d3cba8e149d3269fec6835c1908 +// SHA256STAMP:1526dd638eeeb6b2a5170d7135a8bd80d91bcfa2ce8afa337d31209616e6cb9a diff --git a/wire/common_wiregen.h b/wire/common_wiregen.h index 887525f9b..255ab645b 100644 --- a/wire/common_wiregen.h +++ b/wire/common_wiregen.h @@ -41,5 +41,4 @@ bool fromwire_custommsg_out(const tal_t *ctx, const void *p, u8 **msg); #endif /* LIGHTNING_WIRE_COMMON_WIREGEN_H */ - -// SHA256STAMP:b7c32f920bcd5725670e679935629442e3866d3cba8e149d3269fec6835c1908 +// SHA256STAMP:1526dd638eeeb6b2a5170d7135a8bd80d91bcfa2ce8afa337d31209616e6cb9a diff --git a/wire/onion_printgen.c b/wire/onion_printgen.c index 854ac894e..97a726e34 100644 --- a/wire/onion_printgen.c +++ b/wire/onion_printgen.c @@ -105,72 +105,72 @@ void printonion_wire_message(const u8 *msg) printf("UNKNOWN: %s\\n", tal_hex(msg, msg)); } - + static void printwire_tlv_tlv_payload_amt_to_forward(const char *fieldname, const u8 **cursor, size_t *plen) { printf("(msg_name=%s)\n", "amt_to_forward"); - + printf("amt_to_forward="); u64 amt_to_forward = fromwire_tu64(cursor, plen); - - printwire_u64(tal_fmt(NULL, "%s.amt_to_forward", fieldname), &amt_to_forward); + + printwire_u64(tal_fmt(NULL, "%s.amt_to_forward", fieldname), &amt_to_forward); if (!*cursor) { printf("**TRUNCATED**\n"); return; } - + } static void printwire_tlv_tlv_payload_outgoing_cltv_value(const char *fieldname, const u8 **cursor, size_t *plen) { printf("(msg_name=%s)\n", "outgoing_cltv_value"); - + printf("outgoing_cltv_value="); u32 outgoing_cltv_value = fromwire_tu32(cursor, plen); - - printwire_u32(tal_fmt(NULL, "%s.outgoing_cltv_value", fieldname), &outgoing_cltv_value); + + printwire_u32(tal_fmt(NULL, "%s.outgoing_cltv_value", fieldname), &outgoing_cltv_value); if (!*cursor) { printf("**TRUNCATED**\n"); return; } - + } static void printwire_tlv_tlv_payload_short_channel_id(const char *fieldname, const u8 **cursor, size_t *plen) { printf("(msg_name=%s)\n", "short_channel_id"); - + printf("short_channel_id="); struct short_channel_id short_channel_id; fromwire_short_channel_id(cursor, plen, &short_channel_id); - - printwire_short_channel_id(tal_fmt(NULL, "%s.short_channel_id", fieldname), &short_channel_id); + + printwire_short_channel_id(tal_fmt(NULL, "%s.short_channel_id", fieldname), &short_channel_id); if (!*cursor) { printf("**TRUNCATED**\n"); return; } - + } static void printwire_tlv_tlv_payload_payment_data(const char *fieldname, const u8 **cursor, size_t *plen) { printf("(msg_name=%s)\n", "payment_data"); - + printf("payment_secret="); struct secret payment_secret; fromwire_secret(cursor, plen, &payment_secret); - - printwire_secret(tal_fmt(NULL, "%s.payment_secret", fieldname), &payment_secret); + + printwire_secret(tal_fmt(NULL, "%s.payment_secret", fieldname), &payment_secret); if (!*cursor) { printf("**TRUNCATED**\n"); return; } printf("total_msat="); u64 total_msat = fromwire_tu64(cursor, plen); - - printwire_u64(tal_fmt(NULL, "%s.total_msat", fieldname), &total_msat); + + printwire_u64(tal_fmt(NULL, "%s.total_msat", fieldname), &total_msat); if (!*cursor) { printf("**TRUNCATED**\n"); return; } - + } static const struct tlv_print_record_type print_tlvs_tlv_payload[] = { @@ -247,13 +247,13 @@ void printwire_invalid_onion_version(const char *fieldname, const u8 *cursor) printf("sha256_of_onion="); struct sha256 sha256_of_onion; fromwire_sha256(&cursor, &plen, &sha256_of_onion); - - printwire_sha256(tal_fmt(NULL, "%s.sha256_of_onion", fieldname), &sha256_of_onion); + + printwire_sha256(tal_fmt(NULL, "%s.sha256_of_onion", fieldname), &sha256_of_onion); if (!cursor) { printf("**TRUNCATED**\n"); return; } - + if (plen != 0) printf("EXTRA: %s\n", tal_hexstr(NULL, cursor, plen)); @@ -270,13 +270,13 @@ void printwire_invalid_onion_hmac(const char *fieldname, const u8 *cursor) printf("sha256_of_onion="); struct sha256 sha256_of_onion; fromwire_sha256(&cursor, &plen, &sha256_of_onion); - - printwire_sha256(tal_fmt(NULL, "%s.sha256_of_onion", fieldname), &sha256_of_onion); + + printwire_sha256(tal_fmt(NULL, "%s.sha256_of_onion", fieldname), &sha256_of_onion); if (!cursor) { printf("**TRUNCATED**\n"); return; } - + if (plen != 0) printf("EXTRA: %s\n", tal_hexstr(NULL, cursor, plen)); @@ -293,13 +293,13 @@ void printwire_invalid_onion_key(const char *fieldname, const u8 *cursor) printf("sha256_of_onion="); struct sha256 sha256_of_onion; fromwire_sha256(&cursor, &plen, &sha256_of_onion); - - printwire_sha256(tal_fmt(NULL, "%s.sha256_of_onion", fieldname), &sha256_of_onion); + + printwire_sha256(tal_fmt(NULL, "%s.sha256_of_onion", fieldname), &sha256_of_onion); if (!cursor) { printf("**TRUNCATED**\n"); return; } - + if (plen != 0) printf("EXTRA: %s\n", tal_hexstr(NULL, cursor, plen)); @@ -325,7 +325,7 @@ void printwire_temporary_channel_failure(const char *fieldname, const u8 *cursor printf("**TRUNCATED**\n"); return; } - + if (plen != 0) printf("EXTRA: %s\n", tal_hexstr(NULL, cursor, plen)); @@ -383,8 +383,8 @@ void printwire_amount_below_minimum(const char *fieldname, const u8 *cursor) printf("htlc_msat="); struct amount_msat htlc_msat = fromwire_amount_msat(&cursor, &plen); - - printwire_amount_msat(tal_fmt(NULL, "%s.htlc_msat", fieldname), &htlc_msat); + + printwire_amount_msat(tal_fmt(NULL, "%s.htlc_msat", fieldname), &htlc_msat); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -401,7 +401,7 @@ void printwire_amount_below_minimum(const char *fieldname, const u8 *cursor) printf("**TRUNCATED**\n"); return; } - + if (plen != 0) printf("EXTRA: %s\n", tal_hexstr(NULL, cursor, plen)); @@ -417,8 +417,8 @@ void printwire_fee_insufficient(const char *fieldname, const u8 *cursor) printf("htlc_msat="); struct amount_msat htlc_msat = fromwire_amount_msat(&cursor, &plen); - - printwire_amount_msat(tal_fmt(NULL, "%s.htlc_msat", fieldname), &htlc_msat); + + printwire_amount_msat(tal_fmt(NULL, "%s.htlc_msat", fieldname), &htlc_msat); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -435,7 +435,7 @@ void printwire_fee_insufficient(const char *fieldname, const u8 *cursor) printf("**TRUNCATED**\n"); return; } - + if (plen != 0) printf("EXTRA: %s\n", tal_hexstr(NULL, cursor, plen)); @@ -451,8 +451,8 @@ void printwire_incorrect_cltv_expiry(const char *fieldname, const u8 *cursor) printf("cltv_expiry="); u32 cltv_expiry = fromwire_u32(&cursor, &plen); - - printwire_u32(tal_fmt(NULL, "%s.cltv_expiry", fieldname), &cltv_expiry); + + printwire_u32(tal_fmt(NULL, "%s.cltv_expiry", fieldname), &cltv_expiry); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -469,7 +469,7 @@ void printwire_incorrect_cltv_expiry(const char *fieldname, const u8 *cursor) printf("**TRUNCATED**\n"); return; } - + if (plen != 0) printf("EXTRA: %s\n", tal_hexstr(NULL, cursor, plen)); @@ -495,7 +495,7 @@ void printwire_expiry_too_soon(const char *fieldname, const u8 *cursor) printf("**TRUNCATED**\n"); return; } - + if (plen != 0) printf("EXTRA: %s\n", tal_hexstr(NULL, cursor, plen)); @@ -511,21 +511,21 @@ void printwire_incorrect_or_unknown_payment_details(const char *fieldname, const printf("htlc_msat="); struct amount_msat htlc_msat = fromwire_amount_msat(&cursor, &plen); - - printwire_amount_msat(tal_fmt(NULL, "%s.htlc_msat", fieldname), &htlc_msat); + + printwire_amount_msat(tal_fmt(NULL, "%s.htlc_msat", fieldname), &htlc_msat); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("height="); u32 height = fromwire_u32(&cursor, &plen); - - printwire_u32(tal_fmt(NULL, "%s.height", fieldname), &height); + + printwire_u32(tal_fmt(NULL, "%s.height", fieldname), &height); if (!cursor) { printf("**TRUNCATED**\n"); return; } - + if (plen != 0) printf("EXTRA: %s\n", tal_hexstr(NULL, cursor, plen)); @@ -541,13 +541,13 @@ void printwire_final_incorrect_cltv_expiry(const char *fieldname, const u8 *curs printf("cltv_expiry="); u32 cltv_expiry = fromwire_u32(&cursor, &plen); - - printwire_u32(tal_fmt(NULL, "%s.cltv_expiry", fieldname), &cltv_expiry); + + printwire_u32(tal_fmt(NULL, "%s.cltv_expiry", fieldname), &cltv_expiry); if (!cursor) { printf("**TRUNCATED**\n"); return; } - + if (plen != 0) printf("EXTRA: %s\n", tal_hexstr(NULL, cursor, plen)); @@ -563,13 +563,13 @@ void printwire_final_incorrect_htlc_amount(const char *fieldname, const u8 *curs printf("incoming_htlc_amt="); struct amount_msat incoming_htlc_amt = fromwire_amount_msat(&cursor, &plen); - - printwire_amount_msat(tal_fmt(NULL, "%s.incoming_htlc_amt", fieldname), &incoming_htlc_amt); + + printwire_amount_msat(tal_fmt(NULL, "%s.incoming_htlc_amt", fieldname), &incoming_htlc_amt); if (!cursor) { printf("**TRUNCATED**\n"); return; } - + if (plen != 0) printf("EXTRA: %s\n", tal_hexstr(NULL, cursor, plen)); @@ -613,21 +613,21 @@ void printwire_invalid_onion_payload(const char *fieldname, const u8 *cursor) printf("type="); bigsize type = fromwire_bigsize(&cursor, &plen); - - printwire_bigsize(tal_fmt(NULL, "%s.type", fieldname), &type); + + printwire_bigsize(tal_fmt(NULL, "%s.type", fieldname), &type); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("offset="); u16 offset = fromwire_u16(&cursor, &plen); - - printwire_u16(tal_fmt(NULL, "%s.offset", fieldname), &offset); + + printwire_u16(tal_fmt(NULL, "%s.offset", fieldname), &offset); if (!cursor) { printf("**TRUNCATED**\n"); return; } - + if (plen != 0) printf("EXTRA: %s\n", tal_hexstr(NULL, cursor, plen)); @@ -653,5 +653,4 @@ void printonion_wire_tlv_message(const char *tlv_name, const u8 *msg) { printwire_tlvs(tlv_name, &msg, &plen, print_tlvs_tlv_payload, ARRAY_SIZE(print_tlvs_tlv_payload)); } } - -// SHA256STAMP:ceeead04b6dc0928c189be726bd2ea88561db5e91e69ba610ef76ed1ba9e552e +// SHA256STAMP:34ee8c689fc4081ab70cb70519583868d14057acdb69d1f3e242c4cfdbbbc39d diff --git a/wire/onion_printgen.h b/wire/onion_printgen.h index 39ada48d7..6b512703f 100644 --- a/wire/onion_printgen.h +++ b/wire/onion_printgen.h @@ -57,5 +57,4 @@ void printwire_mpp_timeout(const char *fieldname, const u8 *cursor); #endif /* LIGHTNING_WIRE_ONION_PRINTGEN_H */ - -// SHA256STAMP:ceeead04b6dc0928c189be726bd2ea88561db5e91e69ba610ef76ed1ba9e552e +// SHA256STAMP:34ee8c689fc4081ab70cb70519583868d14057acdb69d1f3e242c4cfdbbbc39d diff --git a/wire/onion_wiregen.c b/wire/onion_wiregen.c index a09cef7f4..cb95057a6 100644 --- a/wire/onion_wiregen.c +++ b/wire/onion_wiregen.c @@ -112,7 +112,7 @@ static void fromwire_tlv_tlv_payload_amt_to_forward(const u8 **cursor, size_t *p struct tlv_tlv_payload *r = vrecord; r->amt_to_forward = tal(r, u64); - + *r->amt_to_forward = fromwire_tu64(cursor, plen); } /* TLV_PAYLOAD MSG: outgoing_cltv_value */ @@ -135,7 +135,7 @@ static void fromwire_tlv_tlv_payload_outgoing_cltv_value(const u8 **cursor, size struct tlv_tlv_payload *r = vrecord; r->outgoing_cltv_value = tal(r, u32); - + *r->outgoing_cltv_value = fromwire_tu32(cursor, plen); } /* TLV_PAYLOAD MSG: short_channel_id */ @@ -158,7 +158,7 @@ static void fromwire_tlv_tlv_payload_short_channel_id(const u8 **cursor, size_t struct tlv_tlv_payload *r = vrecord; r->short_channel_id = tal(r, struct short_channel_id); - + fromwire_short_channel_id(cursor, plen, &*r->short_channel_id); } /* TLV_PAYLOAD MSG: payment_data */ @@ -233,9 +233,7 @@ bool fromwire_tlv_payload(const u8 **cursor, size_t *max, struct tlv_tlv_payload /* BOLT #1: * - * A `varint` is a variable-length, unsigned integer encoding - * using the [BigSize](#appendix-a-bigsize-test-vectors) - * format + * The `type` is encoded using the BigSize format. */ field.numtype = fromwire_bigsize(cursor, max); @@ -333,7 +331,9 @@ bool tlv_payload_is_valid(const struct tlv_tlv_payload *record, size_t *err_inde return false; } else if (!first && f->numtype <= prev_type) { /* BOLT #1: - * - if decoded `type`s are not monotonically-increasing: + * - if decoded `type`s are not strictly-increasing + * (including situations when two or more occurrences + * of the same `type` are met): * - MUST fail to parse the `tlv_stream`. */ if (f->numtype == prev_type) @@ -837,5 +837,4 @@ bool fromwire_mpp_timeout(const void *p) return false; return cursor != NULL; } - -// SHA256STAMP:ceeead04b6dc0928c189be726bd2ea88561db5e91e69ba610ef76ed1ba9e552e +// SHA256STAMP:34ee8c689fc4081ab70cb70519583868d14057acdb69d1f3e242c4cfdbbbc39d diff --git a/wire/onion_wiregen.h b/wire/onion_wiregen.h index 99f597795..fd97fd9da 100644 --- a/wire/onion_wiregen.h +++ b/wire/onion_wiregen.h @@ -207,5 +207,4 @@ bool fromwire_mpp_timeout(const void *p); #endif /* LIGHTNING_WIRE_ONION_WIREGEN_H */ - -// SHA256STAMP:ceeead04b6dc0928c189be726bd2ea88561db5e91e69ba610ef76ed1ba9e552e +// SHA256STAMP:34ee8c689fc4081ab70cb70519583868d14057acdb69d1f3e242c4cfdbbbc39d diff --git a/wire/peer_printgen.c b/wire/peer_printgen.c index f872e109f..8154a16d9 100644 --- a/wire/peer_printgen.c +++ b/wire/peer_printgen.c @@ -129,55 +129,55 @@ void printpeer_wire_message(const u8 *msg) printf("UNKNOWN: %s\\n", tal_hex(msg, msg)); } - + void printwire_channel_update_checksums(const char *fieldname, const u8 **cursor, size_t *plen) { - + printf("checksum_node_id_1="); u32 checksum_node_id_1 = fromwire_u32(cursor, plen); - - printwire_u32(tal_fmt(NULL, "%s.checksum_node_id_1", fieldname), &checksum_node_id_1); + + printwire_u32(tal_fmt(NULL, "%s.checksum_node_id_1", fieldname), &checksum_node_id_1); if (!*cursor) { printf("**TRUNCATED**\n"); return; } printf("checksum_node_id_2="); u32 checksum_node_id_2 = fromwire_u32(cursor, plen); - - printwire_u32(tal_fmt(NULL, "%s.checksum_node_id_2", fieldname), &checksum_node_id_2); + + printwire_u32(tal_fmt(NULL, "%s.checksum_node_id_2", fieldname), &checksum_node_id_2); if (!*cursor) { printf("**TRUNCATED**\n"); return; } - + } void printwire_channel_update_timestamps(const char *fieldname, const u8 **cursor, size_t *plen) { - + printf("timestamp_node_id_1="); u32 timestamp_node_id_1 = fromwire_u32(cursor, plen); - - printwire_u32(tal_fmt(NULL, "%s.timestamp_node_id_1", fieldname), ×tamp_node_id_1); + + printwire_u32(tal_fmt(NULL, "%s.timestamp_node_id_1", fieldname), ×tamp_node_id_1); if (!*cursor) { printf("**TRUNCATED**\n"); return; } printf("timestamp_node_id_2="); u32 timestamp_node_id_2 = fromwire_u32(cursor, plen); - - printwire_u32(tal_fmt(NULL, "%s.timestamp_node_id_2", fieldname), ×tamp_node_id_2); + + printwire_u32(tal_fmt(NULL, "%s.timestamp_node_id_2", fieldname), ×tamp_node_id_2); if (!*cursor) { printf("**TRUNCATED**\n"); return; } - + } static void printwire_tlv_init_tlvs_networks(const char *fieldname, const u8 **cursor, size_t *plen) { printf("(msg_name=%s)\n", "networks"); - + printf("chains="); printf("["); for (size_t i = 0; i < *plen; i++) { @@ -195,7 +195,7 @@ static void printwire_tlv_init_tlvs_networks(const char *fieldname, const u8 **c printf("**TRUNCATED**\n"); return; } - + } static const struct tlv_print_record_type print_tlvs_init_tlvs[] = { @@ -205,76 +205,76 @@ static const struct tlv_print_record_type print_tlvs_init_tlvs[] = { static void printwire_tlv_n1_tlv1(const char *fieldname, const u8 **cursor, size_t *plen) { printf("(msg_name=%s)\n", "tlv1"); - + printf("amount_msat="); u64 amount_msat = fromwire_tu64(cursor, plen); - - printwire_u64(tal_fmt(NULL, "%s.amount_msat", fieldname), &amount_msat); + + printwire_u64(tal_fmt(NULL, "%s.amount_msat", fieldname), &amount_msat); if (!*cursor) { printf("**TRUNCATED**\n"); return; } - + } static void printwire_tlv_n1_tlv2(const char *fieldname, const u8 **cursor, size_t *plen) { printf("(msg_name=%s)\n", "tlv2"); - + printf("scid="); struct short_channel_id scid; fromwire_short_channel_id(cursor, plen, &scid); - - printwire_short_channel_id(tal_fmt(NULL, "%s.scid", fieldname), &scid); + + printwire_short_channel_id(tal_fmt(NULL, "%s.scid", fieldname), &scid); if (!*cursor) { printf("**TRUNCATED**\n"); return; } - + } static void printwire_tlv_n1_tlv3(const char *fieldname, const u8 **cursor, size_t *plen) { printf("(msg_name=%s)\n", "tlv3"); - + printf("node_id="); struct pubkey node_id; fromwire_pubkey(cursor, plen, &node_id); - - printwire_pubkey(tal_fmt(NULL, "%s.node_id", fieldname), &node_id); + + printwire_pubkey(tal_fmt(NULL, "%s.node_id", fieldname), &node_id); if (!*cursor) { printf("**TRUNCATED**\n"); return; } printf("amount_msat_1="); struct amount_msat amount_msat_1 = fromwire_amount_msat(cursor, plen); - - printwire_amount_msat(tal_fmt(NULL, "%s.amount_msat_1", fieldname), &amount_msat_1); + + printwire_amount_msat(tal_fmt(NULL, "%s.amount_msat_1", fieldname), &amount_msat_1); if (!*cursor) { printf("**TRUNCATED**\n"); return; } printf("amount_msat_2="); struct amount_msat amount_msat_2 = fromwire_amount_msat(cursor, plen); - - printwire_amount_msat(tal_fmt(NULL, "%s.amount_msat_2", fieldname), &amount_msat_2); + + printwire_amount_msat(tal_fmt(NULL, "%s.amount_msat_2", fieldname), &amount_msat_2); if (!*cursor) { printf("**TRUNCATED**\n"); return; } - + } static void printwire_tlv_n1_tlv4(const char *fieldname, const u8 **cursor, size_t *plen) { printf("(msg_name=%s)\n", "tlv4"); - + printf("cltv_delta="); u16 cltv_delta = fromwire_u16(cursor, plen); - - printwire_u16(tal_fmt(NULL, "%s.cltv_delta", fieldname), &cltv_delta); + + printwire_u16(tal_fmt(NULL, "%s.cltv_delta", fieldname), &cltv_delta); if (!*cursor) { printf("**TRUNCATED**\n"); return; } - + } static const struct tlv_print_record_type print_tlvs_n1[] = { @@ -287,30 +287,30 @@ static const struct tlv_print_record_type print_tlvs_n1[] = { static void printwire_tlv_n2_tlv1(const char *fieldname, const u8 **cursor, size_t *plen) { printf("(msg_name=%s)\n", "tlv1"); - + printf("amount_msat="); u64 amount_msat = fromwire_tu64(cursor, plen); - - printwire_u64(tal_fmt(NULL, "%s.amount_msat", fieldname), &amount_msat); + + printwire_u64(tal_fmt(NULL, "%s.amount_msat", fieldname), &amount_msat); if (!*cursor) { printf("**TRUNCATED**\n"); return; } - + } static void printwire_tlv_n2_tlv2(const char *fieldname, const u8 **cursor, size_t *plen) { printf("(msg_name=%s)\n", "tlv2"); - + printf("cltv_expiry="); u32 cltv_expiry = fromwire_tu32(cursor, plen); - - printwire_u32(tal_fmt(NULL, "%s.cltv_expiry", fieldname), &cltv_expiry); + + printwire_u32(tal_fmt(NULL, "%s.cltv_expiry", fieldname), &cltv_expiry); if (!*cursor) { printf("**TRUNCATED**\n"); return; } - + } static const struct tlv_print_record_type print_tlvs_n2[] = { @@ -321,7 +321,7 @@ static const struct tlv_print_record_type print_tlvs_n2[] = { static void printwire_tlv_open_channel_tlvs_upfront_shutdown_script(const char *fieldname, const u8 **cursor, size_t *plen) { printf("(msg_name=%s)\n", "upfront_shutdown_script"); - + printf("shutdown_scriptpubkey="); printwire_u8_array(tal_fmt(NULL, "%s.shutdown_scriptpubkey", fieldname), cursor, plen, *plen); @@ -329,7 +329,7 @@ static void printwire_tlv_open_channel_tlvs_upfront_shutdown_script(const char * printf("**TRUNCATED**\n"); return; } - + } static const struct tlv_print_record_type print_tlvs_open_channel_tlvs[] = { @@ -339,7 +339,7 @@ static const struct tlv_print_record_type print_tlvs_open_channel_tlvs[] = { static void printwire_tlv_accept_channel_tlvs_upfront_shutdown_script(const char *fieldname, const u8 **cursor, size_t *plen) { printf("(msg_name=%s)\n", "upfront_shutdown_script"); - + printf("shutdown_scriptpubkey="); printwire_u8_array(tal_fmt(NULL, "%s.shutdown_scriptpubkey", fieldname), cursor, plen, *plen); @@ -347,7 +347,7 @@ static void printwire_tlv_accept_channel_tlvs_upfront_shutdown_script(const char printf("**TRUNCATED**\n"); return; } - + } static const struct tlv_print_record_type print_tlvs_accept_channel_tlvs[] = { @@ -357,11 +357,11 @@ static const struct tlv_print_record_type print_tlvs_accept_channel_tlvs[] = { static void printwire_tlv_query_short_channel_ids_tlvs_query_flags(const char *fieldname, const u8 **cursor, size_t *plen) { printf("(msg_name=%s)\n", "query_flags"); - + printf("encoding_type="); u8 encoding_type = fromwire_u8(cursor, plen); - - printwire_u8(tal_fmt(NULL, "%s.encoding_type", fieldname), &encoding_type); + + printwire_u8(tal_fmt(NULL, "%s.encoding_type", fieldname), &encoding_type); if (!*cursor) { printf("**TRUNCATED**\n"); return; @@ -373,7 +373,7 @@ static void printwire_tlv_query_short_channel_ids_tlvs_query_flags(const char *f printf("**TRUNCATED**\n"); return; } - + } static const struct tlv_print_record_type print_tlvs_query_short_channel_ids_tlvs[] = { @@ -383,16 +383,16 @@ static const struct tlv_print_record_type print_tlvs_query_short_channel_ids_tlv static void printwire_tlv_query_channel_range_tlvs_query_option(const char *fieldname, const u8 **cursor, size_t *plen) { printf("(msg_name=%s)\n", "query_option"); - + printf("query_option_flags="); bigsize query_option_flags = fromwire_bigsize(cursor, plen); - - printwire_bigsize(tal_fmt(NULL, "%s.query_option_flags", fieldname), &query_option_flags); + + printwire_bigsize(tal_fmt(NULL, "%s.query_option_flags", fieldname), &query_option_flags); if (!*cursor) { printf("**TRUNCATED**\n"); return; } - + } static const struct tlv_print_record_type print_tlvs_query_channel_range_tlvs[] = { @@ -402,11 +402,11 @@ static const struct tlv_print_record_type print_tlvs_query_channel_range_tlvs[] static void printwire_tlv_reply_channel_range_tlvs_timestamps_tlv(const char *fieldname, const u8 **cursor, size_t *plen) { printf("(msg_name=%s)\n", "timestamps_tlv"); - + printf("encoding_type="); u8 encoding_type = fromwire_u8(cursor, plen); - - printwire_u8(tal_fmt(NULL, "%s.encoding_type", fieldname), &encoding_type); + + printwire_u8(tal_fmt(NULL, "%s.encoding_type", fieldname), &encoding_type); if (!*cursor) { printf("**TRUNCATED**\n"); return; @@ -418,12 +418,12 @@ static void printwire_tlv_reply_channel_range_tlvs_timestamps_tlv(const char *fi printf("**TRUNCATED**\n"); return; } - + } static void printwire_tlv_reply_channel_range_tlvs_checksums_tlv(const char *fieldname, const u8 **cursor, size_t *plen) { printf("(msg_name=%s)\n", "checksums_tlv"); - + printf("checksums="); printf("["); for (size_t i = 0; i < *plen; i++) { @@ -437,7 +437,7 @@ static void printwire_tlv_reply_channel_range_tlvs_checksums_tlv(const char *fie printf("**TRUNCATED**\n"); return; } - + } static const struct tlv_print_record_type print_tlvs_reply_channel_range_tlvs[] = { @@ -496,8 +496,8 @@ void printwire_error(const char *fieldname, const u8 *cursor) printf("channel_id="); struct channel_id channel_id; fromwire_channel_id(&cursor, &plen, &channel_id); - - printwire_channel_id(tal_fmt(NULL, "%s.channel_id", fieldname), &channel_id); + + printwire_channel_id(tal_fmt(NULL, "%s.channel_id", fieldname), &channel_id); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -514,7 +514,7 @@ void printwire_error(const char *fieldname, const u8 *cursor) printf("**TRUNCATED**\n"); return; } - + if (plen != 0) printf("EXTRA: %s\n", tal_hexstr(NULL, cursor, plen)); @@ -530,8 +530,8 @@ void printwire_ping(const char *fieldname, const u8 *cursor) printf("num_pong_bytes="); u16 num_pong_bytes = fromwire_u16(&cursor, &plen); - - printwire_u16(tal_fmt(NULL, "%s.num_pong_bytes", fieldname), &num_pong_bytes); + + printwire_u16(tal_fmt(NULL, "%s.num_pong_bytes", fieldname), &num_pong_bytes); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -548,7 +548,7 @@ void printwire_ping(const char *fieldname, const u8 *cursor) printf("**TRUNCATED**\n"); return; } - + if (plen != 0) printf("EXTRA: %s\n", tal_hexstr(NULL, cursor, plen)); @@ -574,7 +574,7 @@ void printwire_pong(const char *fieldname, const u8 *cursor) printf("**TRUNCATED**\n"); return; } - + if (plen != 0) printf("EXTRA: %s\n", tal_hexstr(NULL, cursor, plen)); @@ -591,8 +591,8 @@ void printwire_open_channel(const char *fieldname, const u8 *cursor) printf("chain_hash="); struct bitcoin_blkid chain_hash; fromwire_bitcoin_blkid(&cursor, &plen, &chain_hash); - - printwire_bitcoin_blkid(tal_fmt(NULL, "%s.chain_hash", fieldname), &chain_hash); + + printwire_bitcoin_blkid(tal_fmt(NULL, "%s.chain_hash", fieldname), &chain_hash); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -600,80 +600,80 @@ void printwire_open_channel(const char *fieldname, const u8 *cursor) printf("temporary_channel_id="); struct channel_id temporary_channel_id; fromwire_channel_id(&cursor, &plen, &temporary_channel_id); - - printwire_channel_id(tal_fmt(NULL, "%s.temporary_channel_id", fieldname), &temporary_channel_id); + + printwire_channel_id(tal_fmt(NULL, "%s.temporary_channel_id", fieldname), &temporary_channel_id); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("funding_satoshis="); struct amount_sat funding_satoshis = fromwire_amount_sat(&cursor, &plen); - - printwire_amount_sat(tal_fmt(NULL, "%s.funding_satoshis", fieldname), &funding_satoshis); + + printwire_amount_sat(tal_fmt(NULL, "%s.funding_satoshis", fieldname), &funding_satoshis); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("push_msat="); struct amount_msat push_msat = fromwire_amount_msat(&cursor, &plen); - - printwire_amount_msat(tal_fmt(NULL, "%s.push_msat", fieldname), &push_msat); + + printwire_amount_msat(tal_fmt(NULL, "%s.push_msat", fieldname), &push_msat); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("dust_limit_satoshis="); struct amount_sat dust_limit_satoshis = fromwire_amount_sat(&cursor, &plen); - - printwire_amount_sat(tal_fmt(NULL, "%s.dust_limit_satoshis", fieldname), &dust_limit_satoshis); + + printwire_amount_sat(tal_fmt(NULL, "%s.dust_limit_satoshis", fieldname), &dust_limit_satoshis); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("max_htlc_value_in_flight_msat="); struct amount_msat max_htlc_value_in_flight_msat = fromwire_amount_msat(&cursor, &plen); - - printwire_amount_msat(tal_fmt(NULL, "%s.max_htlc_value_in_flight_msat", fieldname), &max_htlc_value_in_flight_msat); + + printwire_amount_msat(tal_fmt(NULL, "%s.max_htlc_value_in_flight_msat", fieldname), &max_htlc_value_in_flight_msat); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("channel_reserve_satoshis="); struct amount_sat channel_reserve_satoshis = fromwire_amount_sat(&cursor, &plen); - - printwire_amount_sat(tal_fmt(NULL, "%s.channel_reserve_satoshis", fieldname), &channel_reserve_satoshis); + + printwire_amount_sat(tal_fmt(NULL, "%s.channel_reserve_satoshis", fieldname), &channel_reserve_satoshis); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("htlc_minimum_msat="); struct amount_msat htlc_minimum_msat = fromwire_amount_msat(&cursor, &plen); - - printwire_amount_msat(tal_fmt(NULL, "%s.htlc_minimum_msat", fieldname), &htlc_minimum_msat); + + printwire_amount_msat(tal_fmt(NULL, "%s.htlc_minimum_msat", fieldname), &htlc_minimum_msat); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("feerate_per_kw="); u32 feerate_per_kw = fromwire_u32(&cursor, &plen); - - printwire_u32(tal_fmt(NULL, "%s.feerate_per_kw", fieldname), &feerate_per_kw); + + printwire_u32(tal_fmt(NULL, "%s.feerate_per_kw", fieldname), &feerate_per_kw); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("to_self_delay="); u16 to_self_delay = fromwire_u16(&cursor, &plen); - - printwire_u16(tal_fmt(NULL, "%s.to_self_delay", fieldname), &to_self_delay); + + printwire_u16(tal_fmt(NULL, "%s.to_self_delay", fieldname), &to_self_delay); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("max_accepted_htlcs="); u16 max_accepted_htlcs = fromwire_u16(&cursor, &plen); - - printwire_u16(tal_fmt(NULL, "%s.max_accepted_htlcs", fieldname), &max_accepted_htlcs); + + printwire_u16(tal_fmt(NULL, "%s.max_accepted_htlcs", fieldname), &max_accepted_htlcs); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -681,8 +681,8 @@ void printwire_open_channel(const char *fieldname, const u8 *cursor) printf("funding_pubkey="); struct pubkey funding_pubkey; fromwire_pubkey(&cursor, &plen, &funding_pubkey); - - printwire_pubkey(tal_fmt(NULL, "%s.funding_pubkey", fieldname), &funding_pubkey); + + printwire_pubkey(tal_fmt(NULL, "%s.funding_pubkey", fieldname), &funding_pubkey); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -690,8 +690,8 @@ void printwire_open_channel(const char *fieldname, const u8 *cursor) printf("revocation_basepoint="); struct pubkey revocation_basepoint; fromwire_pubkey(&cursor, &plen, &revocation_basepoint); - - printwire_pubkey(tal_fmt(NULL, "%s.revocation_basepoint", fieldname), &revocation_basepoint); + + printwire_pubkey(tal_fmt(NULL, "%s.revocation_basepoint", fieldname), &revocation_basepoint); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -699,8 +699,8 @@ void printwire_open_channel(const char *fieldname, const u8 *cursor) printf("payment_basepoint="); struct pubkey payment_basepoint; fromwire_pubkey(&cursor, &plen, &payment_basepoint); - - printwire_pubkey(tal_fmt(NULL, "%s.payment_basepoint", fieldname), &payment_basepoint); + + printwire_pubkey(tal_fmt(NULL, "%s.payment_basepoint", fieldname), &payment_basepoint); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -708,8 +708,8 @@ void printwire_open_channel(const char *fieldname, const u8 *cursor) printf("delayed_payment_basepoint="); struct pubkey delayed_payment_basepoint; fromwire_pubkey(&cursor, &plen, &delayed_payment_basepoint); - - printwire_pubkey(tal_fmt(NULL, "%s.delayed_payment_basepoint", fieldname), &delayed_payment_basepoint); + + printwire_pubkey(tal_fmt(NULL, "%s.delayed_payment_basepoint", fieldname), &delayed_payment_basepoint); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -717,8 +717,8 @@ void printwire_open_channel(const char *fieldname, const u8 *cursor) printf("htlc_basepoint="); struct pubkey htlc_basepoint; fromwire_pubkey(&cursor, &plen, &htlc_basepoint); - - printwire_pubkey(tal_fmt(NULL, "%s.htlc_basepoint", fieldname), &htlc_basepoint); + + printwire_pubkey(tal_fmt(NULL, "%s.htlc_basepoint", fieldname), &htlc_basepoint); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -726,16 +726,16 @@ void printwire_open_channel(const char *fieldname, const u8 *cursor) printf("first_per_commitment_point="); struct pubkey first_per_commitment_point; fromwire_pubkey(&cursor, &plen, &first_per_commitment_point); - - printwire_pubkey(tal_fmt(NULL, "%s.first_per_commitment_point", fieldname), &first_per_commitment_point); + + printwire_pubkey(tal_fmt(NULL, "%s.first_per_commitment_point", fieldname), &first_per_commitment_point); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("channel_flags="); u8 channel_flags = fromwire_u8(&cursor, &plen); - - printwire_u8(tal_fmt(NULL, "%s.channel_flags", fieldname), &channel_flags); + + printwire_u8(tal_fmt(NULL, "%s.channel_flags", fieldname), &channel_flags); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -759,64 +759,64 @@ void printwire_accept_channel(const char *fieldname, const u8 *cursor) printf("temporary_channel_id="); struct channel_id temporary_channel_id; fromwire_channel_id(&cursor, &plen, &temporary_channel_id); - - printwire_channel_id(tal_fmt(NULL, "%s.temporary_channel_id", fieldname), &temporary_channel_id); + + printwire_channel_id(tal_fmt(NULL, "%s.temporary_channel_id", fieldname), &temporary_channel_id); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("dust_limit_satoshis="); struct amount_sat dust_limit_satoshis = fromwire_amount_sat(&cursor, &plen); - - printwire_amount_sat(tal_fmt(NULL, "%s.dust_limit_satoshis", fieldname), &dust_limit_satoshis); + + printwire_amount_sat(tal_fmt(NULL, "%s.dust_limit_satoshis", fieldname), &dust_limit_satoshis); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("max_htlc_value_in_flight_msat="); struct amount_msat max_htlc_value_in_flight_msat = fromwire_amount_msat(&cursor, &plen); - - printwire_amount_msat(tal_fmt(NULL, "%s.max_htlc_value_in_flight_msat", fieldname), &max_htlc_value_in_flight_msat); + + printwire_amount_msat(tal_fmt(NULL, "%s.max_htlc_value_in_flight_msat", fieldname), &max_htlc_value_in_flight_msat); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("channel_reserve_satoshis="); struct amount_sat channel_reserve_satoshis = fromwire_amount_sat(&cursor, &plen); - - printwire_amount_sat(tal_fmt(NULL, "%s.channel_reserve_satoshis", fieldname), &channel_reserve_satoshis); + + printwire_amount_sat(tal_fmt(NULL, "%s.channel_reserve_satoshis", fieldname), &channel_reserve_satoshis); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("htlc_minimum_msat="); struct amount_msat htlc_minimum_msat = fromwire_amount_msat(&cursor, &plen); - - printwire_amount_msat(tal_fmt(NULL, "%s.htlc_minimum_msat", fieldname), &htlc_minimum_msat); + + printwire_amount_msat(tal_fmt(NULL, "%s.htlc_minimum_msat", fieldname), &htlc_minimum_msat); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("minimum_depth="); u32 minimum_depth = fromwire_u32(&cursor, &plen); - - printwire_u32(tal_fmt(NULL, "%s.minimum_depth", fieldname), &minimum_depth); + + printwire_u32(tal_fmt(NULL, "%s.minimum_depth", fieldname), &minimum_depth); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("to_self_delay="); u16 to_self_delay = fromwire_u16(&cursor, &plen); - - printwire_u16(tal_fmt(NULL, "%s.to_self_delay", fieldname), &to_self_delay); + + printwire_u16(tal_fmt(NULL, "%s.to_self_delay", fieldname), &to_self_delay); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("max_accepted_htlcs="); u16 max_accepted_htlcs = fromwire_u16(&cursor, &plen); - - printwire_u16(tal_fmt(NULL, "%s.max_accepted_htlcs", fieldname), &max_accepted_htlcs); + + printwire_u16(tal_fmt(NULL, "%s.max_accepted_htlcs", fieldname), &max_accepted_htlcs); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -824,8 +824,8 @@ void printwire_accept_channel(const char *fieldname, const u8 *cursor) printf("funding_pubkey="); struct pubkey funding_pubkey; fromwire_pubkey(&cursor, &plen, &funding_pubkey); - - printwire_pubkey(tal_fmt(NULL, "%s.funding_pubkey", fieldname), &funding_pubkey); + + printwire_pubkey(tal_fmt(NULL, "%s.funding_pubkey", fieldname), &funding_pubkey); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -833,8 +833,8 @@ void printwire_accept_channel(const char *fieldname, const u8 *cursor) printf("revocation_basepoint="); struct pubkey revocation_basepoint; fromwire_pubkey(&cursor, &plen, &revocation_basepoint); - - printwire_pubkey(tal_fmt(NULL, "%s.revocation_basepoint", fieldname), &revocation_basepoint); + + printwire_pubkey(tal_fmt(NULL, "%s.revocation_basepoint", fieldname), &revocation_basepoint); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -842,8 +842,8 @@ void printwire_accept_channel(const char *fieldname, const u8 *cursor) printf("payment_basepoint="); struct pubkey payment_basepoint; fromwire_pubkey(&cursor, &plen, &payment_basepoint); - - printwire_pubkey(tal_fmt(NULL, "%s.payment_basepoint", fieldname), &payment_basepoint); + + printwire_pubkey(tal_fmt(NULL, "%s.payment_basepoint", fieldname), &payment_basepoint); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -851,8 +851,8 @@ void printwire_accept_channel(const char *fieldname, const u8 *cursor) printf("delayed_payment_basepoint="); struct pubkey delayed_payment_basepoint; fromwire_pubkey(&cursor, &plen, &delayed_payment_basepoint); - - printwire_pubkey(tal_fmt(NULL, "%s.delayed_payment_basepoint", fieldname), &delayed_payment_basepoint); + + printwire_pubkey(tal_fmt(NULL, "%s.delayed_payment_basepoint", fieldname), &delayed_payment_basepoint); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -860,8 +860,8 @@ void printwire_accept_channel(const char *fieldname, const u8 *cursor) printf("htlc_basepoint="); struct pubkey htlc_basepoint; fromwire_pubkey(&cursor, &plen, &htlc_basepoint); - - printwire_pubkey(tal_fmt(NULL, "%s.htlc_basepoint", fieldname), &htlc_basepoint); + + printwire_pubkey(tal_fmt(NULL, "%s.htlc_basepoint", fieldname), &htlc_basepoint); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -869,8 +869,8 @@ void printwire_accept_channel(const char *fieldname, const u8 *cursor) printf("first_per_commitment_point="); struct pubkey first_per_commitment_point; fromwire_pubkey(&cursor, &plen, &first_per_commitment_point); - - printwire_pubkey(tal_fmt(NULL, "%s.first_per_commitment_point", fieldname), &first_per_commitment_point); + + printwire_pubkey(tal_fmt(NULL, "%s.first_per_commitment_point", fieldname), &first_per_commitment_point); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -894,8 +894,8 @@ void printwire_funding_created(const char *fieldname, const u8 *cursor) printf("temporary_channel_id="); struct channel_id temporary_channel_id; fromwire_channel_id(&cursor, &plen, &temporary_channel_id); - - printwire_channel_id(tal_fmt(NULL, "%s.temporary_channel_id", fieldname), &temporary_channel_id); + + printwire_channel_id(tal_fmt(NULL, "%s.temporary_channel_id", fieldname), &temporary_channel_id); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -903,16 +903,16 @@ void printwire_funding_created(const char *fieldname, const u8 *cursor) printf("funding_txid="); struct bitcoin_txid funding_txid; fromwire_bitcoin_txid(&cursor, &plen, &funding_txid); - - printwire_bitcoin_txid(tal_fmt(NULL, "%s.funding_txid", fieldname), &funding_txid); + + printwire_bitcoin_txid(tal_fmt(NULL, "%s.funding_txid", fieldname), &funding_txid); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("funding_output_index="); u16 funding_output_index = fromwire_u16(&cursor, &plen); - - printwire_u16(tal_fmt(NULL, "%s.funding_output_index", fieldname), &funding_output_index); + + printwire_u16(tal_fmt(NULL, "%s.funding_output_index", fieldname), &funding_output_index); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -920,13 +920,13 @@ void printwire_funding_created(const char *fieldname, const u8 *cursor) printf("signature="); secp256k1_ecdsa_signature signature; fromwire_secp256k1_ecdsa_signature(&cursor, &plen, &signature); - - printwire_secp256k1_ecdsa_signature(tal_fmt(NULL, "%s.signature", fieldname), &signature); + + printwire_secp256k1_ecdsa_signature(tal_fmt(NULL, "%s.signature", fieldname), &signature); if (!cursor) { printf("**TRUNCATED**\n"); return; } - + if (plen != 0) printf("EXTRA: %s\n", tal_hexstr(NULL, cursor, plen)); @@ -943,8 +943,8 @@ void printwire_funding_signed(const char *fieldname, const u8 *cursor) printf("channel_id="); struct channel_id channel_id; fromwire_channel_id(&cursor, &plen, &channel_id); - - printwire_channel_id(tal_fmt(NULL, "%s.channel_id", fieldname), &channel_id); + + printwire_channel_id(tal_fmt(NULL, "%s.channel_id", fieldname), &channel_id); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -952,13 +952,13 @@ void printwire_funding_signed(const char *fieldname, const u8 *cursor) printf("signature="); secp256k1_ecdsa_signature signature; fromwire_secp256k1_ecdsa_signature(&cursor, &plen, &signature); - - printwire_secp256k1_ecdsa_signature(tal_fmt(NULL, "%s.signature", fieldname), &signature); + + printwire_secp256k1_ecdsa_signature(tal_fmt(NULL, "%s.signature", fieldname), &signature); if (!cursor) { printf("**TRUNCATED**\n"); return; } - + if (plen != 0) printf("EXTRA: %s\n", tal_hexstr(NULL, cursor, plen)); @@ -975,8 +975,8 @@ void printwire_funding_locked(const char *fieldname, const u8 *cursor) printf("channel_id="); struct channel_id channel_id; fromwire_channel_id(&cursor, &plen, &channel_id); - - printwire_channel_id(tal_fmt(NULL, "%s.channel_id", fieldname), &channel_id); + + printwire_channel_id(tal_fmt(NULL, "%s.channel_id", fieldname), &channel_id); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -984,13 +984,13 @@ void printwire_funding_locked(const char *fieldname, const u8 *cursor) printf("next_per_commitment_point="); struct pubkey next_per_commitment_point; fromwire_pubkey(&cursor, &plen, &next_per_commitment_point); - - printwire_pubkey(tal_fmt(NULL, "%s.next_per_commitment_point", fieldname), &next_per_commitment_point); + + printwire_pubkey(tal_fmt(NULL, "%s.next_per_commitment_point", fieldname), &next_per_commitment_point); if (!cursor) { printf("**TRUNCATED**\n"); return; } - + if (plen != 0) printf("EXTRA: %s\n", tal_hexstr(NULL, cursor, plen)); @@ -1007,8 +1007,8 @@ void printwire_shutdown(const char *fieldname, const u8 *cursor) printf("channel_id="); struct channel_id channel_id; fromwire_channel_id(&cursor, &plen, &channel_id); - - printwire_channel_id(tal_fmt(NULL, "%s.channel_id", fieldname), &channel_id); + + printwire_channel_id(tal_fmt(NULL, "%s.channel_id", fieldname), &channel_id); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -1025,7 +1025,7 @@ void printwire_shutdown(const char *fieldname, const u8 *cursor) printf("**TRUNCATED**\n"); return; } - + if (plen != 0) printf("EXTRA: %s\n", tal_hexstr(NULL, cursor, plen)); @@ -1042,16 +1042,16 @@ void printwire_closing_signed(const char *fieldname, const u8 *cursor) printf("channel_id="); struct channel_id channel_id; fromwire_channel_id(&cursor, &plen, &channel_id); - - printwire_channel_id(tal_fmt(NULL, "%s.channel_id", fieldname), &channel_id); + + printwire_channel_id(tal_fmt(NULL, "%s.channel_id", fieldname), &channel_id); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("fee_satoshis="); struct amount_sat fee_satoshis = fromwire_amount_sat(&cursor, &plen); - - printwire_amount_sat(tal_fmt(NULL, "%s.fee_satoshis", fieldname), &fee_satoshis); + + printwire_amount_sat(tal_fmt(NULL, "%s.fee_satoshis", fieldname), &fee_satoshis); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -1059,13 +1059,13 @@ void printwire_closing_signed(const char *fieldname, const u8 *cursor) printf("signature="); secp256k1_ecdsa_signature signature; fromwire_secp256k1_ecdsa_signature(&cursor, &plen, &signature); - - printwire_secp256k1_ecdsa_signature(tal_fmt(NULL, "%s.signature", fieldname), &signature); + + printwire_secp256k1_ecdsa_signature(tal_fmt(NULL, "%s.signature", fieldname), &signature); if (!cursor) { printf("**TRUNCATED**\n"); return; } - + if (plen != 0) printf("EXTRA: %s\n", tal_hexstr(NULL, cursor, plen)); @@ -1082,24 +1082,24 @@ void printwire_update_add_htlc(const char *fieldname, const u8 *cursor) printf("channel_id="); struct channel_id channel_id; fromwire_channel_id(&cursor, &plen, &channel_id); - - printwire_channel_id(tal_fmt(NULL, "%s.channel_id", fieldname), &channel_id); + + printwire_channel_id(tal_fmt(NULL, "%s.channel_id", fieldname), &channel_id); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("id="); u64 id = fromwire_u64(&cursor, &plen); - - printwire_u64(tal_fmt(NULL, "%s.id", fieldname), &id); + + printwire_u64(tal_fmt(NULL, "%s.id", fieldname), &id); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("amount_msat="); struct amount_msat amount_msat = fromwire_amount_msat(&cursor, &plen); - - printwire_amount_msat(tal_fmt(NULL, "%s.amount_msat", fieldname), &amount_msat); + + printwire_amount_msat(tal_fmt(NULL, "%s.amount_msat", fieldname), &amount_msat); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -1107,16 +1107,16 @@ void printwire_update_add_htlc(const char *fieldname, const u8 *cursor) printf("payment_hash="); struct sha256 payment_hash; fromwire_sha256(&cursor, &plen, &payment_hash); - - printwire_sha256(tal_fmt(NULL, "%s.payment_hash", fieldname), &payment_hash); + + printwire_sha256(tal_fmt(NULL, "%s.payment_hash", fieldname), &payment_hash); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("cltv_expiry="); u32 cltv_expiry = fromwire_u32(&cursor, &plen); - - printwire_u32(tal_fmt(NULL, "%s.cltv_expiry", fieldname), &cltv_expiry); + + printwire_u32(tal_fmt(NULL, "%s.cltv_expiry", fieldname), &cltv_expiry); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -1128,7 +1128,7 @@ void printwire_update_add_htlc(const char *fieldname, const u8 *cursor) printf("**TRUNCATED**\n"); return; } - + if (plen != 0) printf("EXTRA: %s\n", tal_hexstr(NULL, cursor, plen)); @@ -1145,16 +1145,16 @@ void printwire_update_fulfill_htlc(const char *fieldname, const u8 *cursor) printf("channel_id="); struct channel_id channel_id; fromwire_channel_id(&cursor, &plen, &channel_id); - - printwire_channel_id(tal_fmt(NULL, "%s.channel_id", fieldname), &channel_id); + + printwire_channel_id(tal_fmt(NULL, "%s.channel_id", fieldname), &channel_id); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("id="); u64 id = fromwire_u64(&cursor, &plen); - - printwire_u64(tal_fmt(NULL, "%s.id", fieldname), &id); + + printwire_u64(tal_fmt(NULL, "%s.id", fieldname), &id); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -1162,13 +1162,13 @@ void printwire_update_fulfill_htlc(const char *fieldname, const u8 *cursor) printf("payment_preimage="); struct preimage payment_preimage; fromwire_preimage(&cursor, &plen, &payment_preimage); - - printwire_preimage(tal_fmt(NULL, "%s.payment_preimage", fieldname), &payment_preimage); + + printwire_preimage(tal_fmt(NULL, "%s.payment_preimage", fieldname), &payment_preimage); if (!cursor) { printf("**TRUNCATED**\n"); return; } - + if (plen != 0) printf("EXTRA: %s\n", tal_hexstr(NULL, cursor, plen)); @@ -1185,16 +1185,16 @@ void printwire_update_fail_htlc(const char *fieldname, const u8 *cursor) printf("channel_id="); struct channel_id channel_id; fromwire_channel_id(&cursor, &plen, &channel_id); - - printwire_channel_id(tal_fmt(NULL, "%s.channel_id", fieldname), &channel_id); + + printwire_channel_id(tal_fmt(NULL, "%s.channel_id", fieldname), &channel_id); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("id="); u64 id = fromwire_u64(&cursor, &plen); - - printwire_u64(tal_fmt(NULL, "%s.id", fieldname), &id); + + printwire_u64(tal_fmt(NULL, "%s.id", fieldname), &id); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -1211,7 +1211,7 @@ void printwire_update_fail_htlc(const char *fieldname, const u8 *cursor) printf("**TRUNCATED**\n"); return; } - + if (plen != 0) printf("EXTRA: %s\n", tal_hexstr(NULL, cursor, plen)); @@ -1228,16 +1228,16 @@ void printwire_update_fail_malformed_htlc(const char *fieldname, const u8 *curso printf("channel_id="); struct channel_id channel_id; fromwire_channel_id(&cursor, &plen, &channel_id); - - printwire_channel_id(tal_fmt(NULL, "%s.channel_id", fieldname), &channel_id); + + printwire_channel_id(tal_fmt(NULL, "%s.channel_id", fieldname), &channel_id); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("id="); u64 id = fromwire_u64(&cursor, &plen); - - printwire_u64(tal_fmt(NULL, "%s.id", fieldname), &id); + + printwire_u64(tal_fmt(NULL, "%s.id", fieldname), &id); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -1245,21 +1245,21 @@ void printwire_update_fail_malformed_htlc(const char *fieldname, const u8 *curso printf("sha256_of_onion="); struct sha256 sha256_of_onion; fromwire_sha256(&cursor, &plen, &sha256_of_onion); - - printwire_sha256(tal_fmt(NULL, "%s.sha256_of_onion", fieldname), &sha256_of_onion); + + printwire_sha256(tal_fmt(NULL, "%s.sha256_of_onion", fieldname), &sha256_of_onion); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("failure_code="); u16 failure_code = fromwire_u16(&cursor, &plen); - - printwire_u16(tal_fmt(NULL, "%s.failure_code", fieldname), &failure_code); + + printwire_u16(tal_fmt(NULL, "%s.failure_code", fieldname), &failure_code); if (!cursor) { printf("**TRUNCATED**\n"); return; } - + if (plen != 0) printf("EXTRA: %s\n", tal_hexstr(NULL, cursor, plen)); @@ -1276,8 +1276,8 @@ void printwire_commitment_signed(const char *fieldname, const u8 *cursor) printf("channel_id="); struct channel_id channel_id; fromwire_channel_id(&cursor, &plen, &channel_id); - - printwire_channel_id(tal_fmt(NULL, "%s.channel_id", fieldname), &channel_id); + + printwire_channel_id(tal_fmt(NULL, "%s.channel_id", fieldname), &channel_id); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -1285,8 +1285,8 @@ void printwire_commitment_signed(const char *fieldname, const u8 *cursor) printf("signature="); secp256k1_ecdsa_signature signature; fromwire_secp256k1_ecdsa_signature(&cursor, &plen, &signature); - - printwire_secp256k1_ecdsa_signature(tal_fmt(NULL, "%s.signature", fieldname), &signature); + + printwire_secp256k1_ecdsa_signature(tal_fmt(NULL, "%s.signature", fieldname), &signature); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -1313,7 +1313,7 @@ void printwire_commitment_signed(const char *fieldname, const u8 *cursor) printf("**TRUNCATED**\n"); return; } - + if (plen != 0) printf("EXTRA: %s\n", tal_hexstr(NULL, cursor, plen)); @@ -1330,8 +1330,8 @@ void printwire_revoke_and_ack(const char *fieldname, const u8 *cursor) printf("channel_id="); struct channel_id channel_id; fromwire_channel_id(&cursor, &plen, &channel_id); - - printwire_channel_id(tal_fmt(NULL, "%s.channel_id", fieldname), &channel_id); + + printwire_channel_id(tal_fmt(NULL, "%s.channel_id", fieldname), &channel_id); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -1339,8 +1339,8 @@ void printwire_revoke_and_ack(const char *fieldname, const u8 *cursor) printf("per_commitment_secret="); struct secret per_commitment_secret; fromwire_secret(&cursor, &plen, &per_commitment_secret); - - printwire_secret(tal_fmt(NULL, "%s.per_commitment_secret", fieldname), &per_commitment_secret); + + printwire_secret(tal_fmt(NULL, "%s.per_commitment_secret", fieldname), &per_commitment_secret); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -1348,13 +1348,13 @@ void printwire_revoke_and_ack(const char *fieldname, const u8 *cursor) printf("next_per_commitment_point="); struct pubkey next_per_commitment_point; fromwire_pubkey(&cursor, &plen, &next_per_commitment_point); - - printwire_pubkey(tal_fmt(NULL, "%s.next_per_commitment_point", fieldname), &next_per_commitment_point); + + printwire_pubkey(tal_fmt(NULL, "%s.next_per_commitment_point", fieldname), &next_per_commitment_point); if (!cursor) { printf("**TRUNCATED**\n"); return; } - + if (plen != 0) printf("EXTRA: %s\n", tal_hexstr(NULL, cursor, plen)); @@ -1371,21 +1371,21 @@ void printwire_update_fee(const char *fieldname, const u8 *cursor) printf("channel_id="); struct channel_id channel_id; fromwire_channel_id(&cursor, &plen, &channel_id); - - printwire_channel_id(tal_fmt(NULL, "%s.channel_id", fieldname), &channel_id); + + printwire_channel_id(tal_fmt(NULL, "%s.channel_id", fieldname), &channel_id); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("feerate_per_kw="); u32 feerate_per_kw = fromwire_u32(&cursor, &plen); - - printwire_u32(tal_fmt(NULL, "%s.feerate_per_kw", fieldname), &feerate_per_kw); + + printwire_u32(tal_fmt(NULL, "%s.feerate_per_kw", fieldname), &feerate_per_kw); if (!cursor) { printf("**TRUNCATED**\n"); return; } - + if (plen != 0) printf("EXTRA: %s\n", tal_hexstr(NULL, cursor, plen)); @@ -1402,24 +1402,24 @@ void printwire_channel_reestablish(const char *fieldname, const u8 *cursor) printf("channel_id="); struct channel_id channel_id; fromwire_channel_id(&cursor, &plen, &channel_id); - - printwire_channel_id(tal_fmt(NULL, "%s.channel_id", fieldname), &channel_id); + + printwire_channel_id(tal_fmt(NULL, "%s.channel_id", fieldname), &channel_id); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("next_commitment_number="); u64 next_commitment_number = fromwire_u64(&cursor, &plen); - - printwire_u64(tal_fmt(NULL, "%s.next_commitment_number", fieldname), &next_commitment_number); + + printwire_u64(tal_fmt(NULL, "%s.next_commitment_number", fieldname), &next_commitment_number); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("next_revocation_number="); u64 next_revocation_number = fromwire_u64(&cursor, &plen); - - printwire_u64(tal_fmt(NULL, "%s.next_revocation_number", fieldname), &next_revocation_number); + + printwire_u64(tal_fmt(NULL, "%s.next_revocation_number", fieldname), &next_revocation_number); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -1427,8 +1427,8 @@ void printwire_channel_reestablish(const char *fieldname, const u8 *cursor) printf("your_last_per_commitment_secret="); struct secret your_last_per_commitment_secret; fromwire_secret(&cursor, &plen, &your_last_per_commitment_secret); - - printwire_secret(tal_fmt(NULL, "%s.your_last_per_commitment_secret", fieldname), &your_last_per_commitment_secret); + + printwire_secret(tal_fmt(NULL, "%s.your_last_per_commitment_secret", fieldname), &your_last_per_commitment_secret); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -1436,13 +1436,13 @@ void printwire_channel_reestablish(const char *fieldname, const u8 *cursor) printf("my_current_per_commitment_point="); struct pubkey my_current_per_commitment_point; fromwire_pubkey(&cursor, &plen, &my_current_per_commitment_point); - - printwire_pubkey(tal_fmt(NULL, "%s.my_current_per_commitment_point", fieldname), &my_current_per_commitment_point); + + printwire_pubkey(tal_fmt(NULL, "%s.my_current_per_commitment_point", fieldname), &my_current_per_commitment_point); if (!cursor) { printf("**TRUNCATED**\n"); return; } - + if (plen != 0) printf("EXTRA: %s\n", tal_hexstr(NULL, cursor, plen)); @@ -1459,8 +1459,8 @@ void printwire_announcement_signatures(const char *fieldname, const u8 *cursor) printf("channel_id="); struct channel_id channel_id; fromwire_channel_id(&cursor, &plen, &channel_id); - - printwire_channel_id(tal_fmt(NULL, "%s.channel_id", fieldname), &channel_id); + + printwire_channel_id(tal_fmt(NULL, "%s.channel_id", fieldname), &channel_id); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -1468,8 +1468,8 @@ void printwire_announcement_signatures(const char *fieldname, const u8 *cursor) printf("short_channel_id="); struct short_channel_id short_channel_id; fromwire_short_channel_id(&cursor, &plen, &short_channel_id); - - printwire_short_channel_id(tal_fmt(NULL, "%s.short_channel_id", fieldname), &short_channel_id); + + printwire_short_channel_id(tal_fmt(NULL, "%s.short_channel_id", fieldname), &short_channel_id); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -1477,8 +1477,8 @@ void printwire_announcement_signatures(const char *fieldname, const u8 *cursor) printf("node_signature="); secp256k1_ecdsa_signature node_signature; fromwire_secp256k1_ecdsa_signature(&cursor, &plen, &node_signature); - - printwire_secp256k1_ecdsa_signature(tal_fmt(NULL, "%s.node_signature", fieldname), &node_signature); + + printwire_secp256k1_ecdsa_signature(tal_fmt(NULL, "%s.node_signature", fieldname), &node_signature); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -1486,13 +1486,13 @@ void printwire_announcement_signatures(const char *fieldname, const u8 *cursor) printf("bitcoin_signature="); secp256k1_ecdsa_signature bitcoin_signature; fromwire_secp256k1_ecdsa_signature(&cursor, &plen, &bitcoin_signature); - - printwire_secp256k1_ecdsa_signature(tal_fmt(NULL, "%s.bitcoin_signature", fieldname), &bitcoin_signature); + + printwire_secp256k1_ecdsa_signature(tal_fmt(NULL, "%s.bitcoin_signature", fieldname), &bitcoin_signature); if (!cursor) { printf("**TRUNCATED**\n"); return; } - + if (plen != 0) printf("EXTRA: %s\n", tal_hexstr(NULL, cursor, plen)); @@ -1509,8 +1509,8 @@ void printwire_channel_announcement(const char *fieldname, const u8 *cursor) printf("node_signature_1="); secp256k1_ecdsa_signature node_signature_1; fromwire_secp256k1_ecdsa_signature(&cursor, &plen, &node_signature_1); - - printwire_secp256k1_ecdsa_signature(tal_fmt(NULL, "%s.node_signature_1", fieldname), &node_signature_1); + + printwire_secp256k1_ecdsa_signature(tal_fmt(NULL, "%s.node_signature_1", fieldname), &node_signature_1); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -1518,8 +1518,8 @@ void printwire_channel_announcement(const char *fieldname, const u8 *cursor) printf("node_signature_2="); secp256k1_ecdsa_signature node_signature_2; fromwire_secp256k1_ecdsa_signature(&cursor, &plen, &node_signature_2); - - printwire_secp256k1_ecdsa_signature(tal_fmt(NULL, "%s.node_signature_2", fieldname), &node_signature_2); + + printwire_secp256k1_ecdsa_signature(tal_fmt(NULL, "%s.node_signature_2", fieldname), &node_signature_2); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -1527,8 +1527,8 @@ void printwire_channel_announcement(const char *fieldname, const u8 *cursor) printf("bitcoin_signature_1="); secp256k1_ecdsa_signature bitcoin_signature_1; fromwire_secp256k1_ecdsa_signature(&cursor, &plen, &bitcoin_signature_1); - - printwire_secp256k1_ecdsa_signature(tal_fmt(NULL, "%s.bitcoin_signature_1", fieldname), &bitcoin_signature_1); + + printwire_secp256k1_ecdsa_signature(tal_fmt(NULL, "%s.bitcoin_signature_1", fieldname), &bitcoin_signature_1); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -1536,8 +1536,8 @@ void printwire_channel_announcement(const char *fieldname, const u8 *cursor) printf("bitcoin_signature_2="); secp256k1_ecdsa_signature bitcoin_signature_2; fromwire_secp256k1_ecdsa_signature(&cursor, &plen, &bitcoin_signature_2); - - printwire_secp256k1_ecdsa_signature(tal_fmt(NULL, "%s.bitcoin_signature_2", fieldname), &bitcoin_signature_2); + + printwire_secp256k1_ecdsa_signature(tal_fmt(NULL, "%s.bitcoin_signature_2", fieldname), &bitcoin_signature_2); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -1557,8 +1557,8 @@ void printwire_channel_announcement(const char *fieldname, const u8 *cursor) printf("chain_hash="); struct bitcoin_blkid chain_hash; fromwire_bitcoin_blkid(&cursor, &plen, &chain_hash); - - printwire_bitcoin_blkid(tal_fmt(NULL, "%s.chain_hash", fieldname), &chain_hash); + + printwire_bitcoin_blkid(tal_fmt(NULL, "%s.chain_hash", fieldname), &chain_hash); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -1566,8 +1566,8 @@ void printwire_channel_announcement(const char *fieldname, const u8 *cursor) printf("short_channel_id="); struct short_channel_id short_channel_id; fromwire_short_channel_id(&cursor, &plen, &short_channel_id); - - printwire_short_channel_id(tal_fmt(NULL, "%s.short_channel_id", fieldname), &short_channel_id); + + printwire_short_channel_id(tal_fmt(NULL, "%s.short_channel_id", fieldname), &short_channel_id); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -1575,8 +1575,8 @@ void printwire_channel_announcement(const char *fieldname, const u8 *cursor) printf("node_id_1="); struct node_id node_id_1; fromwire_node_id(&cursor, &plen, &node_id_1); - - printwire_node_id(tal_fmt(NULL, "%s.node_id_1", fieldname), &node_id_1); + + printwire_node_id(tal_fmt(NULL, "%s.node_id_1", fieldname), &node_id_1); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -1584,8 +1584,8 @@ void printwire_channel_announcement(const char *fieldname, const u8 *cursor) printf("node_id_2="); struct node_id node_id_2; fromwire_node_id(&cursor, &plen, &node_id_2); - - printwire_node_id(tal_fmt(NULL, "%s.node_id_2", fieldname), &node_id_2); + + printwire_node_id(tal_fmt(NULL, "%s.node_id_2", fieldname), &node_id_2); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -1593,8 +1593,8 @@ void printwire_channel_announcement(const char *fieldname, const u8 *cursor) printf("bitcoin_key_1="); struct pubkey bitcoin_key_1; fromwire_pubkey(&cursor, &plen, &bitcoin_key_1); - - printwire_pubkey(tal_fmt(NULL, "%s.bitcoin_key_1", fieldname), &bitcoin_key_1); + + printwire_pubkey(tal_fmt(NULL, "%s.bitcoin_key_1", fieldname), &bitcoin_key_1); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -1602,13 +1602,13 @@ void printwire_channel_announcement(const char *fieldname, const u8 *cursor) printf("bitcoin_key_2="); struct pubkey bitcoin_key_2; fromwire_pubkey(&cursor, &plen, &bitcoin_key_2); - - printwire_pubkey(tal_fmt(NULL, "%s.bitcoin_key_2", fieldname), &bitcoin_key_2); + + printwire_pubkey(tal_fmt(NULL, "%s.bitcoin_key_2", fieldname), &bitcoin_key_2); if (!cursor) { printf("**TRUNCATED**\n"); return; } - + if (plen != 0) printf("EXTRA: %s\n", tal_hexstr(NULL, cursor, plen)); @@ -1625,8 +1625,8 @@ void printwire_node_announcement(const char *fieldname, const u8 *cursor) printf("signature="); secp256k1_ecdsa_signature signature; fromwire_secp256k1_ecdsa_signature(&cursor, &plen, &signature); - - printwire_secp256k1_ecdsa_signature(tal_fmt(NULL, "%s.signature", fieldname), &signature); + + printwire_secp256k1_ecdsa_signature(tal_fmt(NULL, "%s.signature", fieldname), &signature); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -1645,8 +1645,8 @@ void printwire_node_announcement(const char *fieldname, const u8 *cursor) } printf("timestamp="); u32 timestamp = fromwire_u32(&cursor, &plen); - - printwire_u32(tal_fmt(NULL, "%s.timestamp", fieldname), ×tamp); + + printwire_u32(tal_fmt(NULL, "%s.timestamp", fieldname), ×tamp); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -1654,8 +1654,8 @@ void printwire_node_announcement(const char *fieldname, const u8 *cursor) printf("node_id="); struct node_id node_id; fromwire_node_id(&cursor, &plen, &node_id); - - printwire_node_id(tal_fmt(NULL, "%s.node_id", fieldname), &node_id); + + printwire_node_id(tal_fmt(NULL, "%s.node_id", fieldname), &node_id); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -1686,7 +1686,7 @@ void printwire_node_announcement(const char *fieldname, const u8 *cursor) printf("**TRUNCATED**\n"); return; } - + if (plen != 0) printf("EXTRA: %s\n", tal_hexstr(NULL, cursor, plen)); @@ -1703,8 +1703,8 @@ void printwire_channel_update(const char *fieldname, const u8 *cursor) printf("signature="); secp256k1_ecdsa_signature signature; fromwire_secp256k1_ecdsa_signature(&cursor, &plen, &signature); - - printwire_secp256k1_ecdsa_signature(tal_fmt(NULL, "%s.signature", fieldname), &signature); + + printwire_secp256k1_ecdsa_signature(tal_fmt(NULL, "%s.signature", fieldname), &signature); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -1712,8 +1712,8 @@ void printwire_channel_update(const char *fieldname, const u8 *cursor) printf("chain_hash="); struct bitcoin_blkid chain_hash; fromwire_bitcoin_blkid(&cursor, &plen, &chain_hash); - - printwire_bitcoin_blkid(tal_fmt(NULL, "%s.chain_hash", fieldname), &chain_hash); + + printwire_bitcoin_blkid(tal_fmt(NULL, "%s.chain_hash", fieldname), &chain_hash); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -1721,64 +1721,64 @@ void printwire_channel_update(const char *fieldname, const u8 *cursor) printf("short_channel_id="); struct short_channel_id short_channel_id; fromwire_short_channel_id(&cursor, &plen, &short_channel_id); - - printwire_short_channel_id(tal_fmt(NULL, "%s.short_channel_id", fieldname), &short_channel_id); + + printwire_short_channel_id(tal_fmt(NULL, "%s.short_channel_id", fieldname), &short_channel_id); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("timestamp="); u32 timestamp = fromwire_u32(&cursor, &plen); - - printwire_u32(tal_fmt(NULL, "%s.timestamp", fieldname), ×tamp); + + printwire_u32(tal_fmt(NULL, "%s.timestamp", fieldname), ×tamp); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("message_flags="); u8 message_flags = fromwire_u8(&cursor, &plen); - - printwire_u8(tal_fmt(NULL, "%s.message_flags", fieldname), &message_flags); + + printwire_u8(tal_fmt(NULL, "%s.message_flags", fieldname), &message_flags); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("channel_flags="); u8 channel_flags = fromwire_u8(&cursor, &plen); - - printwire_u8(tal_fmt(NULL, "%s.channel_flags", fieldname), &channel_flags); + + printwire_u8(tal_fmt(NULL, "%s.channel_flags", fieldname), &channel_flags); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("cltv_expiry_delta="); u16 cltv_expiry_delta = fromwire_u16(&cursor, &plen); - - printwire_u16(tal_fmt(NULL, "%s.cltv_expiry_delta", fieldname), &cltv_expiry_delta); + + printwire_u16(tal_fmt(NULL, "%s.cltv_expiry_delta", fieldname), &cltv_expiry_delta); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("htlc_minimum_msat="); struct amount_msat htlc_minimum_msat = fromwire_amount_msat(&cursor, &plen); - - printwire_amount_msat(tal_fmt(NULL, "%s.htlc_minimum_msat", fieldname), &htlc_minimum_msat); + + printwire_amount_msat(tal_fmt(NULL, "%s.htlc_minimum_msat", fieldname), &htlc_minimum_msat); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("fee_base_msat="); u32 fee_base_msat = fromwire_u32(&cursor, &plen); - - printwire_u32(tal_fmt(NULL, "%s.fee_base_msat", fieldname), &fee_base_msat); + + printwire_u32(tal_fmt(NULL, "%s.fee_base_msat", fieldname), &fee_base_msat); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("fee_proportional_millionths="); u32 fee_proportional_millionths = fromwire_u32(&cursor, &plen); - - printwire_u32(tal_fmt(NULL, "%s.fee_proportional_millionths", fieldname), &fee_proportional_millionths); + + printwire_u32(tal_fmt(NULL, "%s.fee_proportional_millionths", fieldname), &fee_proportional_millionths); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -1788,13 +1788,13 @@ void printwire_channel_update(const char *fieldname, const u8 *cursor) printf("(option_channel_htlc_max):"); printf("htlc_maximum_msat="); struct amount_msat htlc_maximum_msat = fromwire_amount_msat(&cursor, &plen); - - printwire_amount_msat(tal_fmt(NULL, "%s.htlc_maximum_msat", fieldname), &htlc_maximum_msat); + + printwire_amount_msat(tal_fmt(NULL, "%s.htlc_maximum_msat", fieldname), &htlc_maximum_msat); if (!cursor) { printf("**TRUNCATED**\n"); return; } - + if (plen != 0) printf("EXTRA: %s\n", tal_hexstr(NULL, cursor, plen)); @@ -1811,8 +1811,8 @@ void printwire_query_short_channel_ids(const char *fieldname, const u8 *cursor) printf("chain_hash="); struct bitcoin_blkid chain_hash; fromwire_bitcoin_blkid(&cursor, &plen, &chain_hash); - - printwire_bitcoin_blkid(tal_fmt(NULL, "%s.chain_hash", fieldname), &chain_hash); + + printwire_bitcoin_blkid(tal_fmt(NULL, "%s.chain_hash", fieldname), &chain_hash); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -1848,21 +1848,21 @@ void printwire_reply_short_channel_ids_end(const char *fieldname, const u8 *curs printf("chain_hash="); struct bitcoin_blkid chain_hash; fromwire_bitcoin_blkid(&cursor, &plen, &chain_hash); - - printwire_bitcoin_blkid(tal_fmt(NULL, "%s.chain_hash", fieldname), &chain_hash); + + printwire_bitcoin_blkid(tal_fmt(NULL, "%s.chain_hash", fieldname), &chain_hash); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("full_information="); u8 full_information = fromwire_u8(&cursor, &plen); - - printwire_u8(tal_fmt(NULL, "%s.full_information", fieldname), &full_information); + + printwire_u8(tal_fmt(NULL, "%s.full_information", fieldname), &full_information); if (!cursor) { printf("**TRUNCATED**\n"); return; } - + if (plen != 0) printf("EXTRA: %s\n", tal_hexstr(NULL, cursor, plen)); @@ -1879,24 +1879,24 @@ void printwire_query_channel_range(const char *fieldname, const u8 *cursor) printf("chain_hash="); struct bitcoin_blkid chain_hash; fromwire_bitcoin_blkid(&cursor, &plen, &chain_hash); - - printwire_bitcoin_blkid(tal_fmt(NULL, "%s.chain_hash", fieldname), &chain_hash); + + printwire_bitcoin_blkid(tal_fmt(NULL, "%s.chain_hash", fieldname), &chain_hash); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("first_blocknum="); u32 first_blocknum = fromwire_u32(&cursor, &plen); - - printwire_u32(tal_fmt(NULL, "%s.first_blocknum", fieldname), &first_blocknum); + + printwire_u32(tal_fmt(NULL, "%s.first_blocknum", fieldname), &first_blocknum); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("number_of_blocks="); u32 number_of_blocks = fromwire_u32(&cursor, &plen); - - printwire_u32(tal_fmt(NULL, "%s.number_of_blocks", fieldname), &number_of_blocks); + + printwire_u32(tal_fmt(NULL, "%s.number_of_blocks", fieldname), &number_of_blocks); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -1920,32 +1920,32 @@ void printwire_reply_channel_range(const char *fieldname, const u8 *cursor) printf("chain_hash="); struct bitcoin_blkid chain_hash; fromwire_bitcoin_blkid(&cursor, &plen, &chain_hash); - - printwire_bitcoin_blkid(tal_fmt(NULL, "%s.chain_hash", fieldname), &chain_hash); + + printwire_bitcoin_blkid(tal_fmt(NULL, "%s.chain_hash", fieldname), &chain_hash); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("first_blocknum="); u32 first_blocknum = fromwire_u32(&cursor, &plen); - - printwire_u32(tal_fmt(NULL, "%s.first_blocknum", fieldname), &first_blocknum); + + printwire_u32(tal_fmt(NULL, "%s.first_blocknum", fieldname), &first_blocknum); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("number_of_blocks="); u32 number_of_blocks = fromwire_u32(&cursor, &plen); - - printwire_u32(tal_fmt(NULL, "%s.number_of_blocks", fieldname), &number_of_blocks); + + printwire_u32(tal_fmt(NULL, "%s.number_of_blocks", fieldname), &number_of_blocks); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("full_information="); u8 full_information = fromwire_u8(&cursor, &plen); - - printwire_u8(tal_fmt(NULL, "%s.full_information", fieldname), &full_information); + + printwire_u8(tal_fmt(NULL, "%s.full_information", fieldname), &full_information); if (!cursor) { printf("**TRUNCATED**\n"); return; @@ -1981,29 +1981,29 @@ void printwire_gossip_timestamp_filter(const char *fieldname, const u8 *cursor) printf("chain_hash="); struct bitcoin_blkid chain_hash; fromwire_bitcoin_blkid(&cursor, &plen, &chain_hash); - - printwire_bitcoin_blkid(tal_fmt(NULL, "%s.chain_hash", fieldname), &chain_hash); + + printwire_bitcoin_blkid(tal_fmt(NULL, "%s.chain_hash", fieldname), &chain_hash); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("first_timestamp="); u32 first_timestamp = fromwire_u32(&cursor, &plen); - - printwire_u32(tal_fmt(NULL, "%s.first_timestamp", fieldname), &first_timestamp); + + printwire_u32(tal_fmt(NULL, "%s.first_timestamp", fieldname), &first_timestamp); if (!cursor) { printf("**TRUNCATED**\n"); return; } printf("timestamp_range="); u32 timestamp_range = fromwire_u32(&cursor, &plen); - - printwire_u32(tal_fmt(NULL, "%s.timestamp_range", fieldname), ×tamp_range); + + printwire_u32(tal_fmt(NULL, "%s.timestamp_range", fieldname), ×tamp_range); if (!cursor) { printf("**TRUNCATED**\n"); return; } - + if (plen != 0) printf("EXTRA: %s\n", tal_hexstr(NULL, cursor, plen)); @@ -2036,5 +2036,4 @@ void printpeer_wire_tlv_message(const char *tlv_name, const u8 *msg) { printwire_tlvs(tlv_name, &msg, &plen, print_tlvs_reply_channel_range_tlvs, ARRAY_SIZE(print_tlvs_reply_channel_range_tlvs)); } } - -// SHA256STAMP:387ba235bbb8248b61a18b8fc1b7842f5ad47bbbb53cc8cf2bb2b8f872ce5a0d +// SHA256STAMP:521d619f25ebb8f49af991416c17ffbb6c9d2216cca98fe7be50824388d6bcac diff --git a/wire/peer_printgen.h b/wire/peer_printgen.h index ec1fc4d82..22ee6d38d 100644 --- a/wire/peer_printgen.h +++ b/wire/peer_printgen.h @@ -70,5 +70,4 @@ void printwire_gossip_timestamp_filter(const char *fieldname, const u8 *cursor); void printwire_channel_update_checksums(const char *fieldname, const u8 **cursor, size_t *plen); void printwire_channel_update_timestamps(const char *fieldname, const u8 **cursor, size_t *plen); #endif /* LIGHTNING_WIRE_PEER_PRINTGEN_H */ - -// SHA256STAMP:387ba235bbb8248b61a18b8fc1b7842f5ad47bbbb53cc8cf2bb2b8f872ce5a0d +// SHA256STAMP:521d619f25ebb8f49af991416c17ffbb6c9d2216cca98fe7be50824388d6bcac diff --git a/wire/peer_wiregen.c b/wire/peer_wiregen.c index 205e7c419..a4dbb2263 100644 --- a/wire/peer_wiregen.c +++ b/wire/peer_wiregen.c @@ -203,9 +203,7 @@ bool fromwire_init_tlvs(const u8 **cursor, size_t *max, struct tlv_init_tlvs *re /* BOLT #1: * - * A `varint` is a variable-length, unsigned integer encoding - * using the [BigSize](#appendix-a-bigsize-test-vectors) - * format + * The `type` is encoded using the BigSize format. */ field.numtype = fromwire_bigsize(cursor, max); @@ -303,7 +301,9 @@ bool init_tlvs_is_valid(const struct tlv_init_tlvs *record, size_t *err_index) return false; } else if (!first && f->numtype <= prev_type) { /* BOLT #1: - * - if decoded `type`s are not monotonically-increasing: + * - if decoded `type`s are not strictly-increasing + * (including situations when two or more occurrences + * of the same `type` are met): * - MUST fail to parse the `tlv_stream`. */ if (f->numtype == prev_type) @@ -351,7 +351,7 @@ static void fromwire_tlv_n1_tlv1(const u8 **cursor, size_t *plen, void *vrecord) struct tlv_n1 *r = vrecord; r->tlv1 = tal(r, u64); - + *r->tlv1 = fromwire_tu64(cursor, plen); } /* N1 MSG: tlv2 */ @@ -374,7 +374,7 @@ static void fromwire_tlv_n1_tlv2(const u8 **cursor, size_t *plen, void *vrecord) struct tlv_n1 *r = vrecord; r->tlv2 = tal(r, struct short_channel_id); - + fromwire_short_channel_id(cursor, plen, &*r->tlv2); } /* N1 MSG: tlv3 */ @@ -425,7 +425,7 @@ static void fromwire_tlv_n1_tlv4(const u8 **cursor, size_t *plen, void *vrecord) struct tlv_n1 *r = vrecord; r->tlv4 = tal(r, u16); - + *r->tlv4 = fromwire_u16(cursor, plen); } @@ -475,9 +475,7 @@ bool fromwire_n1(const u8 **cursor, size_t *max, struct tlv_n1 *record) /* BOLT #1: * - * A `varint` is a variable-length, unsigned integer encoding - * using the [BigSize](#appendix-a-bigsize-test-vectors) - * format + * The `type` is encoded using the BigSize format. */ field.numtype = fromwire_bigsize(cursor, max); @@ -575,7 +573,9 @@ bool n1_is_valid(const struct tlv_n1 *record, size_t *err_index) return false; } else if (!first && f->numtype <= prev_type) { /* BOLT #1: - * - if decoded `type`s are not monotonically-increasing: + * - if decoded `type`s are not strictly-increasing + * (including situations when two or more occurrences + * of the same `type` are met): * - MUST fail to parse the `tlv_stream`. */ if (f->numtype == prev_type) @@ -623,7 +623,7 @@ static void fromwire_tlv_n2_tlv1(const u8 **cursor, size_t *plen, void *vrecord) struct tlv_n2 *r = vrecord; r->tlv1 = tal(r, u64); - + *r->tlv1 = fromwire_tu64(cursor, plen); } /* N2 MSG: tlv2 */ @@ -646,7 +646,7 @@ static void fromwire_tlv_n2_tlv2(const u8 **cursor, size_t *plen, void *vrecord) struct tlv_n2 *r = vrecord; r->tlv2 = tal(r, u32); - + *r->tlv2 = fromwire_tu32(cursor, plen); } @@ -694,9 +694,7 @@ bool fromwire_n2(const u8 **cursor, size_t *max, struct tlv_n2 *record) /* BOLT #1: * - * A `varint` is a variable-length, unsigned integer encoding - * using the [BigSize](#appendix-a-bigsize-test-vectors) - * format + * The `type` is encoded using the BigSize format. */ field.numtype = fromwire_bigsize(cursor, max); @@ -794,7 +792,9 @@ bool n2_is_valid(const struct tlv_n2 *record, size_t *err_index) return false; } else if (!first && f->numtype <= prev_type) { /* BOLT #1: - * - if decoded `type`s are not monotonically-increasing: + * - if decoded `type`s are not strictly-increasing + * (including situations when two or more occurrences + * of the same `type` are met): * - MUST fail to parse the `tlv_stream`. */ if (f->numtype == prev_type) @@ -888,9 +888,7 @@ bool fromwire_open_channel_tlvs(const u8 **cursor, size_t *max, struct tlv_open_ /* BOLT #1: * - * A `varint` is a variable-length, unsigned integer encoding - * using the [BigSize](#appendix-a-bigsize-test-vectors) - * format + * The `type` is encoded using the BigSize format. */ field.numtype = fromwire_bigsize(cursor, max); @@ -988,7 +986,9 @@ bool open_channel_tlvs_is_valid(const struct tlv_open_channel_tlvs *record, size return false; } else if (!first && f->numtype <= prev_type) { /* BOLT #1: - * - if decoded `type`s are not monotonically-increasing: + * - if decoded `type`s are not strictly-increasing + * (including situations when two or more occurrences + * of the same `type` are met): * - MUST fail to parse the `tlv_stream`. */ if (f->numtype == prev_type) @@ -1082,9 +1082,7 @@ bool fromwire_accept_channel_tlvs(const u8 **cursor, size_t *max, struct tlv_acc /* BOLT #1: * - * A `varint` is a variable-length, unsigned integer encoding - * using the [BigSize](#appendix-a-bigsize-test-vectors) - * format + * The `type` is encoded using the BigSize format. */ field.numtype = fromwire_bigsize(cursor, max); @@ -1182,7 +1180,9 @@ bool accept_channel_tlvs_is_valid(const struct tlv_accept_channel_tlvs *record, return false; } else if (!first && f->numtype <= prev_type) { /* BOLT #1: - * - if decoded `type`s are not monotonically-increasing: + * - if decoded `type`s are not strictly-increasing + * (including situations when two or more occurrences + * of the same `type` are met): * - MUST fail to parse the `tlv_stream`. */ if (f->numtype == prev_type) @@ -1280,9 +1280,7 @@ bool fromwire_query_short_channel_ids_tlvs(const u8 **cursor, size_t *max, struc /* BOLT #1: * - * A `varint` is a variable-length, unsigned integer encoding - * using the [BigSize](#appendix-a-bigsize-test-vectors) - * format + * The `type` is encoded using the BigSize format. */ field.numtype = fromwire_bigsize(cursor, max); @@ -1380,7 +1378,9 @@ bool query_short_channel_ids_tlvs_is_valid(const struct tlv_query_short_channel_ return false; } else if (!first && f->numtype <= prev_type) { /* BOLT #1: - * - if decoded `type`s are not monotonically-increasing: + * - if decoded `type`s are not strictly-increasing + * (including situations when two or more occurrences + * of the same `type` are met): * - MUST fail to parse the `tlv_stream`. */ if (f->numtype == prev_type) @@ -1428,7 +1428,7 @@ static void fromwire_tlv_query_channel_range_tlvs_query_option(const u8 **cursor struct tlv_query_channel_range_tlvs *r = vrecord; r->query_option = tal(r, bigsize); - + *r->query_option = fromwire_bigsize(cursor, plen); } @@ -1475,9 +1475,7 @@ bool fromwire_query_channel_range_tlvs(const u8 **cursor, size_t *max, struct tl /* BOLT #1: * - * A `varint` is a variable-length, unsigned integer encoding - * using the [BigSize](#appendix-a-bigsize-test-vectors) - * format + * The `type` is encoded using the BigSize format. */ field.numtype = fromwire_bigsize(cursor, max); @@ -1575,7 +1573,9 @@ bool query_channel_range_tlvs_is_valid(const struct tlv_query_channel_range_tlvs return false; } else if (!first && f->numtype <= prev_type) { /* BOLT #1: - * - if decoded `type`s are not monotonically-increasing: + * - if decoded `type`s are not strictly-increasing + * (including situations when two or more occurrences + * of the same `type` are met): * - MUST fail to parse the `tlv_stream`. */ if (f->numtype == prev_type) @@ -1701,9 +1701,7 @@ bool fromwire_reply_channel_range_tlvs(const u8 **cursor, size_t *max, struct tl /* BOLT #1: * - * A `varint` is a variable-length, unsigned integer encoding - * using the [BigSize](#appendix-a-bigsize-test-vectors) - * format + * The `type` is encoded using the BigSize format. */ field.numtype = fromwire_bigsize(cursor, max); @@ -1801,7 +1799,9 @@ bool reply_channel_range_tlvs_is_valid(const struct tlv_reply_channel_range_tlvs return false; } else if (!first && f->numtype <= prev_type) { /* BOLT #1: - * - if decoded `type`s are not monotonically-increasing: + * - if decoded `type`s are not strictly-increasing + * (including situations when two or more occurrences + * of the same `type` are met): * - MUST fail to parse the `tlv_stream`. */ if (f->numtype == prev_type) @@ -2750,5 +2750,4 @@ bool fromwire_channel_update_option_channel_htlc_max(const void *p, secp256k1_ec *htlc_maximum_msat = fromwire_amount_msat(&cursor, &plen); return cursor != NULL; } - -// SHA256STAMP:387ba235bbb8248b61a18b8fc1b7842f5ad47bbbb53cc8cf2bb2b8f872ce5a0d +// SHA256STAMP:521d619f25ebb8f49af991416c17ffbb6c9d2216cca98fe7be50824388d6bcac diff --git a/wire/peer_wiregen.h b/wire/peer_wiregen.h index d978b4153..9d0d0018b 100644 --- a/wire/peer_wiregen.h +++ b/wire/peer_wiregen.h @@ -595,5 +595,4 @@ bool fromwire_channel_update_option_channel_htlc_max(const void *p, secp256k1_ec #endif /* LIGHTNING_WIRE_PEER_WIREGEN_H */ - -// SHA256STAMP:387ba235bbb8248b61a18b8fc1b7842f5ad47bbbb53cc8cf2bb2b8f872ce5a0d +// SHA256STAMP:521d619f25ebb8f49af991416c17ffbb6c9d2216cca98fe7be50824388d6bcac