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

hook: adds channel_id and commitnum to commitment_revocation

Browse source 
If commitment_revocation hook is not being used for a whatchtower but
something else, the channel_id is missing.

Changelog-Added: addes channel_id and commitnum to commitment_revocation hook
This commit is contained in:
Michael Schmoock 2021-09-03 16:24:46 +02:00 • committed by Rusty Russell
parent 7e43109e33
commit 1db0ec8b75
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lightningd/peer_htlcs.c
View file

@ -2048,8 +2048,9 @@ struct commitment_revocation_payload {
struct bitcoin_txid commitment_txid; struct bitcoin_txid commitment_txid;
const struct bitcoin_tx *penalty_tx; const struct bitcoin_tx *penalty_tx;
struct wallet *wallet; struct wallet *wallet;
u64 channel_id; u64 channel_dbid;
u64 commitnum; u64 commitnum;
struct channel_id channel_id;
}; };
static void commitment_revocation_hook_serialize( static void commitment_revocation_hook_serialize(
@ -2058,11 +2059,13 @@ static void commitment_revocation_hook_serialize(
{ {
json_add_txid(stream, "commitment_txid", &payload->commitment_txid); json_add_txid(stream, "commitment_txid", &payload->commitment_txid);
json_add_tx(stream, "penalty_tx", payload->penalty_tx); json_add_tx(stream, "penalty_tx", payload->penalty_tx);
json_add_channel_id(stream, "channel_id", &payload->channel_id);
json_add_u64(stream, "commitnum", payload->commitnum);
} }
static void static void
commitment_revocation_hook_cb(struct commitment_revocation_payload *p STEALS){ commitment_revocation_hook_cb(struct commitment_revocation_payload *p STEALS){
wallet_penalty_base_delete(p->wallet, p->channel_id, p->commitnum); wallet_penalty_base_delete(p->wallet, p->channel_dbid, p->commitnum);
} }
static bool static bool
@ -2209,8 +2212,9 @@ void peer_got_revoke(struct channel *channel, const u8 *msg)
payload->commitment_txid = pbase->txid; payload->commitment_txid = pbase->txid;
payload->penalty_tx = tal_steal(payload, penalty_tx); payload->penalty_tx = tal_steal(payload, penalty_tx);
payload->wallet = ld->wallet; payload->wallet = ld->wallet;
payload->channel_id = channel->dbid; payload->channel_dbid = channel->dbid;
payload->commitnum = pbase->commitment_num; payload->commitnum = pbase->commitment_num;
payload->channel_id = channel->cid;
plugin_hook_call_commitment_revocation(ld, payload); plugin_hook_call_commitment_revocation(ld, payload);
} }