Skip to content
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

Jump to bottom

lightningd: fix funding_locked in channel_opened notification. #5489

Merged
merged 1 commit into from
Aug 4, 2022
Merged

lightningd: fix funding_locked in channel_opened notification. #5489

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions lightningd/dual_open_control.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1631,7 +1631,7 @@ static void handle_peer_tx_sigs_sent(struct subd *dualopend,
&channel->peer->id,
&channel->funding_sats,
&channel->funding.txid,
&channel->remote_funding_locked);
channel->remote_funding_locked);

/* BOLT-f53ca2301232db780843e894f55d95d512f297f9 #2
* The receiving node: ...
Expand Down Expand Up @@ -1997,7 +1997,7 @@ static void handle_peer_tx_sigs_msg(struct subd *dualopend,
&channel->peer->id,
&channel->funding_sats,
&channel->funding.txid,
&channel->remote_funding_locked);
channel->remote_funding_locked);

/* BOLT-f53ca2301232db780843e894f55d95d512f297f9 #2
* The receiving node: ...
Expand Down
6 changes: 3 additions & 3 deletions lightningd/notification.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ static void channel_opened_notification_serialize(struct json_stream *stream,
struct node_id *node_id,
struct amount_sat *funding_sat,
struct bitcoin_txid *funding_txid,
bool *funding_locked)
bool funding_locked)
{
json_object_start(stream, "channel_opened");
json_add_node_id(stream, "id", node_id);
Expand All @@ -216,13 +216,13 @@ REGISTER_NOTIFICATION(channel_opened,

void notify_channel_opened(struct lightningd *ld, struct node_id *node_id,
struct amount_sat *funding_sat, struct bitcoin_txid *funding_txid,
bool *funding_locked)
bool funding_locked)
{
void (*serialize)(struct json_stream *,
struct node_id *,
struct amount_sat *,
struct bitcoin_txid *,
bool *) = channel_opened_notification_gen.serialize;
bool) = channel_opened_notification_gen.serialize;

struct jsonrpc_notification *n
= jsonrpc_notification_start(NULL, channel_opened_notification_gen.topic);
Expand Down
2 changes: 1 addition & 1 deletion lightningd/notification.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ void notify_invoice_creation(struct lightningd *ld, struct amount_msat *amount,

void notify_channel_opened(struct lightningd *ld, struct node_id *node_id,
struct amount_sat *funding_sat, struct bitcoin_txid *funding_txid,
bool *funding_locked);
bool funding_locked);

void notify_channel_state_changed(struct lightningd *ld,
struct node_id *peer_id,
Expand Down
2 changes: 1 addition & 1 deletion lightningd/opening_control.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ static void opening_fundee_finished(struct subd *openingd,

/* Tell plugins about the success */
notify_channel_opened(ld, &channel->peer->id, &channel->funding_sats,
&channel->funding.txid, &channel->remote_funding_locked);
&channel->funding.txid, channel->remote_funding_locked);

if (pbase)
wallet_penalty_base_add(ld->wallet, channel->dbid, pbase);
Expand Down