mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-03-26 20:30:59 +01:00
Code Issues Projects Releases Wiki Activity

lightningd: clean up signing of last_tx.

Browse source 
Return a copy, don't sign in place then remove the signature after.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2023-07-31 21:02:22 +09:30
parent 673d81adde
commit d90a185188
1 changed files with 24 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
lightningd/peer_control.c
View file

@ -226,22 +226,23 @@ u8 *p2tr_for_keyidx(const tal_t *ctx, struct lightningd *ld, u64 keyidx)
return scriptpubkey_p2tr(ctx, &shutdownkey); return scriptpubkey_p2tr(ctx, &shutdownkey);
} }
static void sign_last_tx(struct channel *channel, static struct bitcoin_tx *sign_last_tx(const tal_t *ctx,
struct bitcoin_tx *last_tx, const struct channel *channel,
struct bitcoin_signature *last_sig) const struct bitcoin_tx *last_tx,
const struct bitcoin_signature *last_sig)
{ {
struct lightningd *ld = channel->peer->ld; struct lightningd *ld = channel->peer->ld;
struct bitcoin_signature sig; struct bitcoin_signature sig;
const u8 *msg; const u8 *msg;
u8 **witness; u8 **witness;
u64 commit_index = channel->next_index[LOCAL] - 1; u64 commit_index = channel->next_index[LOCAL] - 1;
struct bitcoin_tx *tx = clone_bitcoin_tx(ctx, last_tx);
assert(!last_tx->wtx->inputs[0].witness); assert(!tx->wtx->inputs[0].witness);
msg = towire_hsmd_sign_commitment_tx(NULL, msg = towire_hsmd_sign_commitment_tx(NULL,
&channel->peer->id, &channel->peer->id,
channel->dbid, channel->dbid,
last_tx, tx,
&channel->channel_info &channel->channel_info
.remote_fundingkey, .remote_fundingkey,
commit_index); commit_index);
@ -252,16 +253,12 @@ static void sign_last_tx(struct channel *channel,
tal_hex(tmpctx, msg)); tal_hex(tmpctx, msg));
witness = witness =
bitcoin_witness_2of2(last_tx, last_sig, bitcoin_witness_2of2(tx, last_sig,
&sig, &channel->channel_info.remote_fundingkey, &sig, &channel->channel_info.remote_fundingkey,
&channel->local_funding_pubkey); &channel->local_funding_pubkey);
bitcoin_tx_input_set_witness(last_tx, 0, take(witness)); bitcoin_tx_input_set_witness(tx, 0, take(witness));
} return tx;
static void remove_sig(struct bitcoin_tx *signed_tx)
{
bitcoin_tx_input_set_witness(signed_tx, 0, NULL);
} }
bool invalid_last_tx(const struct bitcoin_tx *tx) bool invalid_last_tx(const struct bitcoin_tx *tx)
@ -293,25 +290,24 @@ static bool commit_tx_send_finished(struct channel *channel,
static void sign_and_send_last(struct lightningd *ld, static void sign_and_send_last(struct lightningd *ld,
struct channel *channel, struct channel *channel,
const char *cmd_id, const char *cmd_id,
struct bitcoin_tx *last_tx, const struct bitcoin_tx *last_tx,
struct bitcoin_signature *last_sig) const struct bitcoin_signature *last_sig)
{ {
struct bitcoin_txid txid; struct bitcoin_txid txid;
struct anchor_details *adet; struct anchor_details *adet;
struct bitcoin_tx *tx;
sign_last_tx(channel, last_tx, last_sig); tx = sign_last_tx(tmpctx, channel, last_tx, last_sig);
bitcoin_txid(last_tx, &txid); bitcoin_txid(tx, &txid);
wallet_transaction_add(ld->wallet, last_tx->wtx, 0, 0); wallet_transaction_add(ld->wallet, tx->wtx, 0, 0);
/* Remember anchor information for commit_tx_boost */ /* Remember anchor information for commit_tx_boost */
adet = create_anchor_details(NULL, channel, last_tx); adet = create_anchor_details(NULL, channel, tx);
/* Keep broadcasting until we say stop (can fail due to dup, /* Keep broadcasting until we say stop (can fail due to dup,
* if they beat us to the broadcast). */ * if they beat us to the broadcast). */
broadcast_tx(ld->topology, channel, last_tx, cmd_id, false, 0, broadcast_tx(ld->topology, channel, tx, cmd_id, false, 0,
commit_tx_send_finished, commit_tx_boost, take(adet)); commit_tx_send_finished, commit_tx_boost, take(adet));
remove_sig(last_tx);
} }
void drop_to_chain(struct lightningd *ld, struct channel *channel, void drop_to_chain(struct lightningd *ld, struct channel *channel,
@ -2909,6 +2905,7 @@ static struct command_result *json_sign_last_tx(struct command *cmd,
struct peer *peer; struct peer *peer;
struct json_stream *response; struct json_stream *response;
struct channel *channel; struct channel *channel;
struct bitcoin_tx *tx;
bool more_than_one; bool more_than_one;
if (!param(cmd, buffer, params, if (!param(cmd, buffer, params,
@ -2931,9 +2928,8 @@ static struct command_result *json_sign_last_tx(struct command *cmd,
log_debug(channel->log, "dev-sign-last-tx: signing tx with %zu outputs", log_debug(channel->log, "dev-sign-last-tx: signing tx with %zu outputs",
channel->last_tx->wtx->num_outputs); channel->last_tx->wtx->num_outputs);
sign_last_tx(channel, channel->last_tx, &channel->last_sig); tx = sign_last_tx(cmd, channel, channel->last_tx, &channel->last_sig);
json_add_tx(response, "tx", channel->last_tx); json_add_tx(response, "tx", tx);
remove_sig(channel->last_tx);
/* If we've got inflights, return them */ /* If we've got inflights, return them */
if (!list_empty(&channel->inflights)) { if (!list_empty(&channel->inflights)) {
@ -2941,13 +2937,12 @@ static struct command_result *json_sign_last_tx(struct command *cmd,
json_array_start(response, "inflights"); json_array_start(response, "inflights");
list_for_each(&channel->inflights, inflight, list) { list_for_each(&channel->inflights, inflight, list) {
sign_last_tx(channel, inflight->last_tx, tx = sign_last_tx(cmd, channel, inflight->last_tx,
&inflight->last_sig); &inflight->last_sig);
json_object_start(response, NULL); json_object_start(response, NULL);
json_add_txid(response, "funding_txid", json_add_txid(response, "funding_txid",
&inflight->funding->outpoint.txid); &inflight->funding->outpoint.txid);
remove_sig(inflight->last_tx); json_add_tx(response, "tx", tx);
json_add_tx(response, "tx", channel->last_tx);
json_object_end(response); json_object_end(response);
} }
json_array_end(response); json_array_end(response);