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

lightningd: pass signed tx through to close callback.

Browse Source 
Thread the signed tx through so close's JSON return contains that,
rather than the unsigned channel->last_tx.

We have to split the "get cmd_id" from "resolve the close commands" though;
and of course, as before, we don't actually print the txids of multiple
transactions even though we may have multi in flight due to splice!

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Changelog-Fixed: JSON-RPC: `close` returns a `tx` field with witness data populated (i.e. signed).
Fixes: #6440
This commit is contained in:
Rusty Russell
2023-07-31 21:03:22 +09:30
parent d90a185188
commit e981a4f14a
6 changed files with 60 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lightningd/peer_control.c
View File

@@ -287,17 +287,18 @@ static bool commit_tx_send_finished(struct channel *channel,
return false;
}
static void sign_and_send_last(struct lightningd *ld,
struct channel *channel,
const char *cmd_id,
const struct bitcoin_tx *last_tx,
const struct bitcoin_signature *last_sig)
static struct bitcoin_tx *sign_and_send_last(const tal_t *ctx,
struct lightningd *ld,
struct channel *channel,
const char *cmd_id,
const struct bitcoin_tx *last_tx,
const struct bitcoin_signature *last_sig)
{
struct bitcoin_txid txid;
struct anchor_details *adet;
struct bitcoin_tx *tx;
tx = sign_last_tx(tmpctx, channel, last_tx, last_sig);
tx = sign_last_tx(ctx, channel, last_tx, last_sig);
bitcoin_txid(tx, &txid);
wallet_transaction_add(ld->wallet, tx->wtx, 0, 0);
@@ -308,6 +309,8 @@ static void sign_and_send_last(struct lightningd *ld,
* if they beat us to the broadcast). */
broadcast_tx(ld->topology, channel, tx, cmd_id, false, 0,
commit_tx_send_finished, commit_tx_boost, take(adet));
return tx;
}
void drop_to_chain(struct lightningd *ld, struct channel *channel,
@@ -317,7 +320,7 @@ void drop_to_chain(struct lightningd *ld, struct channel *channel,
const char *cmd_id;
/* If this was triggered by a close command, get a copy of the cmd id */
cmd_id = resolve_close_command(tmpctx, ld, channel, cooperative);
cmd_id = cmd_id_from_close_command(tmpctx, ld, channel);
/* BOLT #2:
*
@@ -335,15 +338,19 @@ void drop_to_chain(struct lightningd *ld, struct channel *channel,
"Cannot broadcast our commitment tx:"
" it's invalid! (ancient channel?)");
} else {
struct bitcoin_tx *tx;
/* We need to drop *every* commitment transaction to chain */
if (!cooperative && !list_empty(&channel->inflights)) {
list_for_each(&channel->inflights, inflight, list)
sign_and_send_last(ld, channel, cmd_id,
inflight->last_tx,
&inflight->last_sig);
tx = sign_and_send_last(tmpctx, ld, channel, cmd_id,
inflight->last_tx,
&inflight->last_sig);
} else
sign_and_send_last(ld, channel, cmd_id, channel->last_tx,
&channel->last_sig);
tx = sign_and_send_last(tmpctx, ld, channel, cmd_id, channel->last_tx,
&channel->last_sig);
resolve_close_command(ld, channel, cooperative, tx);
}
}