mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-02-21 14:24:09 +01:00
Code Issues Projects Releases Wiki Activity

inflights: use ctx for making new ones

Browse source 
Also convert everything to an array thingy
This commit is contained in:
niftynei 2023-05-11 17:07:32 -05:00 • committed by Rusty Russell
parent 95b3943ffe
commit dd871d9e26
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
channeld/channeld.c
View file

@ -1894,7 +1894,7 @@ static void send_revocation(struct peer *peer,
/* Calling `handle_peer_commit_sig` with a `commit_index` of 0 and /* Calling `handle_peer_commit_sig` with a `commit_index` of 0 and
* `changed_htlcs` of NULL will process the message, then read & process coming * `changed_htlcs` of NULL will process the message, then read & process coming
* consecutive commitment messages equal to the number of inflight splices. * consecutive commitment messages equal to the number of inflight splices.
* *
* Returns the last commitsig received. When splicing this is the * Returns the last commitsig received. When splicing this is the
* newest splice commit sig. */ * newest splice commit sig. */
@ -2986,7 +2986,7 @@ static struct amount_sat check_balances(struct peer *peer,
if (!amount_msat_sub_sat(&out[TX_ACCEPTER], out[TX_ACCEPTER], if (!amount_msat_sub_sat(&out[TX_ACCEPTER], out[TX_ACCEPTER],
amount_sat((u64)-peer->splice->accepter_relative))) amount_sat((u64)-peer->splice->accepter_relative)))
peer_failed_warn(peer->pps, &peer->channel_id, peer_failed_warn(peer->pps, &peer->channel_id,
"Unable to sub accepter funding from out amnt."); "Unable to sub accepter funding from out amnt.");
} }
if (amount_msat_less(in[TX_INITIATOR], out[TX_INITIATOR])) { if (amount_msat_less(in[TX_INITIATOR], out[TX_INITIATOR])) {
@ -3801,7 +3801,7 @@ static void splice_initiator_user_finalized(struct peer *peer)
new_inflight->last_tx = tal_steal(peer, their_commit->tx); new_inflight->last_tx = tal_steal(peer, their_commit->tx);
new_inflight->last_sig = their_commit->commit_signature; new_inflight->last_sig = their_commit->commit_signature;
outmsg = towire_channeld_update_inflight(NULL, ictx->current_psbt, outmsg = towire_channeld_update_inflight(NULL, ictx->current_psbt,
their_commit->tx, their_commit->tx,
&their_commit->commit_signature); &their_commit->commit_signature);

8
lightningd/channel_control.c
View file

@ -1391,15 +1391,19 @@ bool peer_start_channeld(struct channel *channel,
curr_blockheight = last_height; curr_blockheight = last_height;
} }
inflights = tal_arr(tmpctx, struct inflight*, 0); inflights = tal_arr(tmpctx, struct inflight *, 0);
list_for_each(&channel->inflights, inflight, list) { list_for_each(&channel->inflights, inflight, list) {
struct inflight *infcopy = tal(inflights, struct inflight); struct inflight *infcopy = tal(inflights, struct inflight);
infcopy->outpoint = inflight->funding->outpoint; infcopy->outpoint = inflight->funding->outpoint;
infcopy->amnt = inflight->funding->total_funds; infcopy->amnt = inflight->funding->total_funds;
infcopy->splice_amnt = inflight->funding->splice_amnt; infcopy->splice_amnt = inflight->funding->splice_amnt;
infcopy->last_tx = inflight->last_tx; infcopy->last_tx = tal_dup(infcopy, struct bitcoin_tx, inflight->last_tx);
infcopy->last_sig = inflight->last_sig; infcopy->last_sig = inflight->last_sig;
infcopy->i_am_initiator = inflight->i_am_initiator; infcopy->i_am_initiator = inflight->i_am_initiator;
tal_wally_start();
wally_psbt_clone_alloc(inflight->funding_psbt, 0, &infcopy->psbt);
tal_wally_end_onto(infcopy, infcopy->psbt, struct wally_psbt);
tal_arr_expand(&inflights, infcopy); tal_arr_expand(&inflights, infcopy);
} }

1
tools/generate-wire.py
View file

@ -249,6 +249,7 @@ class Type(FieldSet):
'wally_psbt', 'wally_psbt',
'wally_tx', 'wally_tx',
'scb_chan', 'scb_chan',
'inflight',
] ]
# Some BOLT types are re-typed based on their field name # Some BOLT types are re-typed based on their field name