channeld: tell lightningd scid from announcement_signatures message.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2024-01-31 13:46:17 +10:30
parent db6f0da3b3
commit cff166b687
3 changed files with 6 additions and 2 deletions

View File

@ -660,6 +660,7 @@ static bool channel_announcement_negotiate(struct peer *peer)
* announcement to MASTER. */
wire_sync_write(MASTER_FD,
take(towire_channeld_got_announcement(NULL,
&peer->short_channel_ids[REMOTE],
&peer->announcement_node_sigs[REMOTE],
&peer->announcement_bitcoin_sigs[REMOTE])));

View File

@ -323,6 +323,7 @@ msgdata,channeld_fail_fallen_behind,remote_per_commitment_point,?pubkey,
# When we receive announcement_signatures for channel announce
msgtype,channeld_got_announcement,1017
msgdata,channeld_got_announcement,scid,short_channel_id,
msgdata,channeld_got_announcement,remote_ann_node_sig,secp256k1_ecdsa_signature,
msgdata,channeld_got_announcement,remote_ann_bitcoin_sig,secp256k1_ecdsa_signature,

Can't render this file because it has a wrong number of fields in line 15.

View File

@ -1057,10 +1057,12 @@ static void peer_got_announcement(struct channel *channel, const u8 *msg)
{
secp256k1_ecdsa_signature remote_ann_node_sig;
secp256k1_ecdsa_signature remote_ann_bitcoin_sig;
struct short_channel_id unused;
if (!fromwire_channeld_got_announcement(msg,
&remote_ann_node_sig,
&remote_ann_bitcoin_sig)) {
&unused,
&remote_ann_node_sig,
&remote_ann_bitcoin_sig)) {
channel_internal_error(channel,
"bad channel_got_announcement %s",
tal_hex(tmpctx, msg));