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

channeld: On funding_locked, remember either alias or real scid

Browse Source
This commit is contained in:
Christian Decker
2022-04-26 14:39:30 +02:00
parent cf51edd95b
commit 3e57d6f9d0
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
channeld/channeld.c
View File

@@ -3235,8 +3235,14 @@ static void handle_funding_depth(struct peer *peer, const u8 *msg)
} else {
peer->depth_togo = 0;
assert(scid);
peer->short_channel_ids[LOCAL] = *scid;
/* If we know an actual short_channel_id prefer to use
* that, otherwise fill in the alias. From channeld's
* point of view switching from zeroconf to an actual
* funding scid is just a reorg. */
if (scid)
peer->short_channel_ids[LOCAL] = *scid;
else if (alias_local)
peer->short_channel_ids[LOCAL] = *alias_local;
if (!peer->funding_locked[LOCAL]) {
status_debug("funding_locked: sending commit index"