davide/palladum-lightning
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

BOLT: update to version which requires option_channel_htlc_max.

Browse Source 
We will now simply reject old-style ones as invalid.  Turns out the
only trace we could find is a channel between two nodes unconnected to
the rest of the network.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Changelog-Changed: Protocol: We now require all channel_update messages include htlc_maximum_msat (as per latest BOLTs)
This commit is contained in:
Rusty Russell
2022-09-14 13:20:31 +09:30
parent daa5269ea2
commit 253b25522b
14 changed files with 80 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
wire/test/run-peer-wire.c
View File

@@ -133,18 +133,6 @@ struct msg_revoke_and_ack {
struct pubkey next_per_commitment_point;
};
struct msg_channel_update {
secp256k1_ecdsa_signature signature;
u32 timestamp;
u8 message_flags;
u8 channel_flags;
u16 expiry;
struct amount_msat htlc_minimum_msat;
u32 fee_base_msat;
u32 fee_proportional_millionths;
struct bitcoin_blkid chain_hash;
struct short_channel_id short_channel_id;
};
struct msg_channel_update_opt_htlc_max {
secp256k1_ecdsa_signature signature;
u32 timestamp;
u8 message_flags;
@@ -406,25 +394,9 @@ static struct msg_node_announcement *fromwire_struct_node_announcement(const tal
}
static void *towire_struct_channel_update(const tal_t *ctx,
const struct msg_channel_update *s)
const struct msg_channel_update *s)
{
return towire_channel_update(ctx,
&s->signature,
&s->chain_hash,
&s->short_channel_id,
s->timestamp,
s->message_flags,
s->channel_flags,
s->expiry,
s->htlc_minimum_msat,
s->fee_base_msat,
s->fee_proportional_millionths);
}
static void *towire_struct_channel_update_opt_htlc_max(const tal_t *ctx,
const struct msg_channel_update_opt_htlc_max *s)
{
return towire_channel_update_option_channel_htlc_max(ctx,
&s->signature,
&s->chain_hash,
&s->short_channel_id,
@@ -437,31 +409,13 @@ static void *towire_struct_channel_update_opt_htlc_max(const tal_t *ctx,
s->fee_proportional_millionths,
s->htlc_maximum_msat);
}
static struct msg_channel_update *fromwire_struct_channel_update(const tal_t *ctx, const void *p)
static struct msg_channel_update
*fromwire_struct_channel_update(const tal_t *ctx, const void *p)
{
struct msg_channel_update *s = tal(ctx, struct msg_channel_update);
if (fromwire_channel_update(p,
&s->signature,
&s->chain_hash,
&s->short_channel_id,
&s->timestamp,
&s->message_flags,
&s->channel_flags,
&s->expiry,
&s->htlc_minimum_msat,
&s->fee_base_msat,
&s->fee_proportional_millionths))
return s;
return tal_free(s);
}
static struct msg_channel_update_opt_htlc_max
*fromwire_struct_channel_update_opt_htlc_max(const tal_t *ctx, const void *p)
{
struct msg_channel_update_opt_htlc_max *s = tal(ctx, struct msg_channel_update_opt_htlc_max);
if (fromwire_channel_update_option_channel_htlc_max(p,
&s->signature,
&s->chain_hash,
&s->short_channel_id,
@@ -938,13 +892,6 @@ static bool channel_update_eq(const struct msg_channel_update *a,
short_channel_id_eq(&a->short_channel_id, &b->short_channel_id);
}
static bool channel_update_opt_htlc_max_eq(const struct msg_channel_update_opt_htlc_max *a,
const struct msg_channel_update_opt_htlc_max *b)
{
return eq_upto(a, b, short_channel_id) &&
short_channel_id_eq(&a->short_channel_id, &b->short_channel_id);
}
static bool accept_channel_eq(const struct msg_accept_channel *a,
const struct msg_accept_channel *b)
{
@@ -1024,7 +971,6 @@ int main(int argc, char *argv[])
struct msg_revoke_and_ack raa, *raa2;
struct msg_open_channel oc, *oc2;
struct msg_channel_update cu, *cu2;
struct msg_channel_update_opt_htlc_max cu_opt_htlc_max, *cu_opt_htlc_max2;
struct msg_accept_channel ac, *ac2;
struct msg_update_add_htlc uah, *uah2;
struct msg_node_announcement na, *na2;
@@ -1185,13 +1131,6 @@ int main(int argc, char *argv[])
assert(channel_update_eq(&cu, cu2));
test_corruption(&cu, cu2, channel_update);
memset(&cu_opt_htlc_max, 2, sizeof(cu_opt_htlc_max));
msg = towire_struct_channel_update_opt_htlc_max(ctx, &cu_opt_htlc_max);
cu_opt_htlc_max2 = fromwire_struct_channel_update_opt_htlc_max(ctx, msg);
assert(channel_update_opt_htlc_max_eq(&cu_opt_htlc_max, cu_opt_htlc_max2));
test_corruption(&cu_opt_htlc_max, cu_opt_htlc_max2, channel_update_opt_htlc_max);
memset(&ac, 2, sizeof(ac));
set_pubkey(&ac.funding_pubkey);
set_pubkey(&ac.revocation_basepoint);