mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-02-22 22:45:27 +01:00
Code Issues Projects Releases Wiki Activity

lightningd: make sure channels always have a local alias.

Browse source 
If we pull and old channel from the database, it might not.

Fixes: https://github.com/ElementsProject/lightning/issues/7645
Changelog-Fixes: lightningd: crash when starting channeld for older channel with no local alias.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2024-09-13 12:08:33 +09:30
parent 2bd9c2285a
commit c5fc1b55d8
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lightningd/channel.c
View file

@ -513,6 +513,11 @@ struct channel *new_channel(struct peer *peer, u64 dbid,
channel->remote_channel_ready = remote_channel_ready; channel->remote_channel_ready = remote_channel_ready;
channel->scid = tal_steal(channel, scid); channel->scid = tal_steal(channel, scid);
channel->alias[LOCAL] = tal_dup_or_null(channel, struct short_channel_id, alias_local); channel->alias[LOCAL] = tal_dup_or_null(channel, struct short_channel_id, alias_local);
/* We always make sure this is set (historical channels from db might not) */
if (!channel->alias[LOCAL]) {
channel->alias[LOCAL] = tal(channel, struct short_channel_id);
randombytes_buf(channel->alias[LOCAL], sizeof(struct short_channel_id));
}
channel->alias[REMOTE] = tal_steal(channel, alias_remote); /* Haven't gotten one yet. */ channel->alias[REMOTE] = tal_steal(channel, alias_remote); /* Haven't gotten one yet. */
channel->cid = *cid; channel->cid = *cid;
channel->our_msat = our_msat; channel->our_msat = our_msat;

7
lightningd/opening_control.c
View file

@ -28,7 +28,6 @@
#include <lightningd/plugin_hook.h> #include <lightningd/plugin_hook.h>
#include <lightningd/subd.h> #include <lightningd/subd.h>
#include <openingd/openingd_wiregen.h> #include <openingd/openingd_wiregen.h>
#include <sodium/randombytes.h>
#include <wally_psbt.h> #include <wally_psbt.h>
void json_add_uncommitted_channel(struct command *cmd, void json_add_uncommitted_channel(struct command *cmd,
@ -108,7 +107,6 @@ wallet_commit_channel(struct lightningd *ld,
s64 final_key_idx; s64 final_key_idx;
u64 static_remotekey_start; u64 static_remotekey_start;
u32 lease_start_blockheight = 0; /* No leases on v1 */ u32 lease_start_blockheight = 0; /* No leases on v1 */
struct short_channel_id local_alias;
struct timeabs timestamp; struct timeabs timestamp;
bool any_active = peer_any_channel(uc->peer, channel_state_wants_peercomms, NULL); bool any_active = peer_any_channel(uc->peer, channel_state_wants_peercomms, NULL);
@ -158,9 +156,6 @@ wallet_commit_channel(struct lightningd *ld,
else else
static_remotekey_start = 0x7FFFFFFFFFFFFFFF; static_remotekey_start = 0x7FFFFFFFFFFFFFFF;
/* This won't clash, we don't even bother checking */
randombytes_buf(&local_alias, sizeof(local_alias));
channel = new_channel(uc->peer, uc->dbid, channel = new_channel(uc->peer, uc->dbid,
NULL, /* No shachain yet */ NULL, /* No shachain yet */
CHANNELD_AWAITING_LOCKIN, CHANNELD_AWAITING_LOCKIN,
@ -178,7 +173,7 @@ wallet_commit_channel(struct lightningd *ld,
local_funding, local_funding,
false, /* !remote_channel_ready */ false, /* !remote_channel_ready */
NULL, /* no scid yet */ NULL, /* no scid yet */
&local_alias, NULL, /* assign random local alias */
NULL, /* They haven't told us an alias yet */ NULL, /* They haven't told us an alias yet */
cid, cid,
/* The three arguments below are msatoshi_to_us, /* The three arguments below are msatoshi_to_us,