Skip to content

gossipd: check for existing channel announcement before sigcheck #8322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
endothermicdev merged 1 commit into from
Jun 10, 2025
Merged

gossipd: check for existing channel announcement before sigcheck #8322

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions gossipd/gossmap_manage.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,6 +481,12 @@ const char *gossmap_manage_channel_announcement(const tal_t *ctx,
return NULL;
}

/* Already known? */
if (gossmap_find_chan(gossmap, &scid)
|| map_get(&gm->pending_ann_map, scid)
|| map_get(&gm->early_ann_map, scid))
return NULL;

warn = sigcheck_channel_announcement(ctx, &node_id_1, &node_id_2,
&bitcoin_key_1, &bitcoin_key_2,
&node_signature_1, &node_signature_2,
Expand All @@ -489,10 +495,6 @@ const char *gossmap_manage_channel_announcement(const tal_t *ctx,
if (warn)
return warn;

/* Already known? */
if (gossmap_find_chan(gossmap, &scid))
return NULL;

pca = tal(gm, struct pending_cannounce);
pca->scriptpubkey = scriptpubkey_p2wsh(pca,
bitcoin_redeem_2of2(tmpctx,
Expand All @@ -504,9 +506,7 @@ const char *gossmap_manage_channel_announcement(const tal_t *ctx,
/* Are we supposed to add immediately without checking with lightningd?
* Unless we already got it from a peer and we're processing now!
*/
if (known_amount
&& !map_get(&gm->pending_ann_map, scid)
&& !map_get(&gm->early_ann_map, scid)) {
if (known_amount) {
/* Set with timestamp 0 (we will update once we have a channel_update) */
gossip_store_add(gm->daemon->gs, announce, 0, false,
towire_gossip_store_channel_amount(tmpctx, *known_amount));
Expand Down
Loading