aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-01-30 11:14:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

channel: remove psbt and remote_tx_sigs

Browse Source 
We just added this, but we've migrated them to the "inflight" struct
instead, as they actually pertain to an single inflight open attempt
This commit is contained in:
niftynei
2021-01-19 18:45:36 -06:00
committed by Rusty Russell
parent e15de71375
commit 4baa10ef68
9 changed files with 244 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lightningd/channel.c
View File

@@ -205,7 +205,6 @@ struct channel *new_channel(struct peer *peer, u64 dbid,
struct amount_msat push,
struct amount_sat our_funds,
bool remote_funding_locked,
bool remote_tx_sigs,
/* NULL or stolen */
struct short_channel_id *scid,
struct channel_id *cid,
@@ -238,7 +237,6 @@ struct channel *new_channel(struct peer *peer, u64 dbid,
const u8 *remote_upfront_shutdown_script,
bool option_static_remotekey,
bool option_anchor_outputs,
struct wally_psbt *psbt STEALS,
enum side closer,
enum state_change reason)
{
@@ -282,7 +280,6 @@ struct channel *new_channel(struct peer *peer, u64 dbid,
channel->push = push;
channel->our_funds = our_funds;
channel->remote_funding_locked = remote_funding_locked;
channel->remote_tx_sigs = remote_tx_sigs;
channel->scid = tal_steal(channel, scid);
channel->cid = *cid;
channel->our_msat = our_msat;
@@ -326,12 +323,6 @@ struct channel *new_channel(struct peer *peer, u64 dbid,
channel->option_anchor_outputs = option_anchor_outputs;
channel->forgets = tal_arr(channel, struct command *, 0);
/* If we're already locked in, we no longer need the PSBT */
if (!remote_funding_locked && psbt)
channel->psbt = tal_steal(channel, psbt);
else
channel->psbt = tal_free(psbt);
list_add_tail(&peer->channels, &channel->list);
channel->rr_number = peer->ld->rr_counter++;
tal_add_destructor(channel, destroy_channel);

6
lightningd/channel.h
View File

@@ -100,7 +100,6 @@ struct channel {
struct amount_msat push;
bool remote_funding_locked;
bool remote_tx_sigs;
/* Channel if locked locally. */
struct short_channel_id *scid;
@@ -180,9 +179,6 @@ struct channel {
/* Our position in the round-robin list. */
u64 rr_number;
/* PSBT, for v2 channels. Saved until it's sent */
struct wally_psbt *psbt;
/* the one that initiated a bilateral close, NUM_SIDES if unknown. */
enum side closer;
@@ -213,7 +209,6 @@ struct channel *new_channel(struct peer *peer, u64 dbid,
struct amount_msat push,
struct amount_sat our_funds,
bool remote_funding_locked,
bool remote_tx_sigs,
/* NULL or stolen */
struct short_channel_id *scid STEALS,
struct channel_id *cid,
@@ -246,7 +241,6 @@ struct channel *new_channel(struct peer *peer, u64 dbid,
const u8 *remote_upfront_shutdown_script STEALS,
bool option_static_remotekey,
bool option_anchor_outputs,
struct wally_psbt *psbt STEALS,
enum side closer,
enum state_change reason);

56
lightningd/dual_open_control.c
View File

@@ -46,10 +46,7 @@ static void handle_signed_psbt(struct lightningd *ld,
struct commit_rcvd *rcvd)
{
/* Now that we've got the signed PSBT, save it */
rcvd->channel->psbt =
tal_steal(rcvd->channel,
cast_const(struct wally_psbt *, psbt));
wallet_channel_save(ld->wallet, rcvd->channel);
// FIXME: save psbt ?
channel_watch_funding(ld, rcvd->channel);
@@ -737,7 +734,6 @@ wallet_commit_channel(struct lightningd *ld,
false, /* !remote_funding_locked */
false, /* !remote_tx_sigs */
NULL, /* no scid yet */
cid,
/* The three arguments below are msatoshi_to_us,
* msatoshi_to_us_min, and msatoshi_to_us_max.
* Because, this is a newly-funded channel,
@@ -768,7 +764,6 @@ wallet_commit_channel(struct lightningd *ld,
remote_upfront_shutdown_script,
option_static_remotekey,
option_anchor_outputs,
NULL,
NUM_SIDES, /* closer not yet known */
opener == LOCAL ? REASON_USER : REASON_REMOTE);
@@ -1124,8 +1119,7 @@ static void opener_commit_received(struct subd *dualopend,
json_add_hex_talarr(response, "close_to",
uc->fc->our_upfront_shutdown_script);
/* Now that we've got the final PSBT, save it */
channel->psbt = tal_steal(channel, psbt);
wallet_channel_save(uc->fc->cmd->ld->wallet, channel);
// FIXME: update channel->psbt
was_pending(command_success(uc->fc->cmd, response));
@@ -1290,6 +1284,8 @@ static void handle_peer_tx_sigs_sent(struct subd *dualopend,
{
struct channel *channel = dualopend->channel;
const struct wally_tx *wtx;
/* FIXME: psbt? */
struct wally_psbt *psbt = NULL;
if (!fromwire_dualopend_tx_sigs_sent(msg)) {
channel_internal_error(channel,
@@ -1298,15 +1294,15 @@ static void handle_peer_tx_sigs_sent(struct subd *dualopend,
return;
}
if (psbt_finalize(cast_const(struct wally_psbt *, channel->psbt))) {
wtx = psbt_final_tx(NULL, channel->psbt);
if (psbt_finalize(cast_const(struct wally_psbt *, psbt))) {
wtx = psbt_final_tx(NULL, psbt);
if (!wtx) {
channel_internal_error(channel,
"Unable to extract final tx"
" from PSBT %s",
type_to_string(tmpctx,
struct wally_psbt,
channel->psbt));
psbt));
return;
}
@@ -1431,7 +1427,6 @@ void dualopen_tell_depth(struct subd *dualopend,
channel->funding_outnum = inf->funding->outnum;
channel->funding = inf->funding->total_funds;
channel->our_funds = inf->funding->our_funds;
channel->psbt = clone_psbt(channel, inf->funding_psbt);
channel->last_tx = tal_steal(channel, inf->last_tx);
channel->last_sig = inf->last_sig;
@@ -1542,6 +1537,7 @@ static void handle_peer_tx_sigs_msg(struct subd *dualopend,
const struct wally_tx *wtx;
struct lightningd *ld = dualopend->ld;
struct channel *channel = dualopend->channel;
struct wally_psbt *chan_psbt = NULL;
if (!fromwire_dualopend_funding_sigs(tmpctx, msg, &psbt)) {
channel_internal_error(channel,
@@ -1553,31 +1549,31 @@ static void handle_peer_tx_sigs_msg(struct subd *dualopend,
/* Save that we've gotten their sigs. Sometimes
* the peer doesn't send any sigs (no inputs), otherwise
* we could just check the PSBT was finalized */
channel->remote_tx_sigs = true;
// FIXME: inflight->remote_tx_sigs = true;
tal_wally_start();
if (wally_psbt_combine(channel->psbt, psbt) != WALLY_OK) {
if (wally_psbt_combine(chan_psbt, psbt) != WALLY_OK) {
channel_internal_error(channel,
"Unable to combine PSBTs: %s, %s",
type_to_string(tmpctx,
struct wally_psbt,
channel->psbt),
chan_psbt),
type_to_string(tmpctx,
struct wally_psbt,
psbt));
tal_wally_end(channel->psbt);
tal_wally_end(chan_psbt);
return;
}
tal_wally_end(channel->psbt);
tal_wally_end(chan_psbt);
if (psbt_finalize(cast_const(struct wally_psbt *, channel->psbt))) {
wtx = psbt_final_tx(NULL, channel->psbt);
if (psbt_finalize(cast_const(struct wally_psbt *, chan_psbt))) {
wtx = psbt_final_tx(NULL, chan_psbt);
if (!wtx) {
channel_internal_error(channel,
"Unable to extract final tx"
" from PSBT %s",
type_to_string(tmpctx,
struct wally_psbt,
channel->psbt));
chan_psbt));
return;
}
send_funding_tx(channel, take(wtx));
@@ -1601,8 +1597,7 @@ static void handle_peer_tx_sigs_msg(struct subd *dualopend,
wallet_channel_save(ld->wallet, channel);
/* Send notification with peer's signed PSBT */
notify_openchannel_peer_sigs(ld, &channel->cid,
channel->psbt);
notify_openchannel_peer_sigs(ld, &channel->cid, chan_psbt);
}
static void handle_validate_rbf(struct subd *dualopend,
@@ -1726,7 +1721,9 @@ json_openchannel_signed(struct command *cmd,
if (!channel)
return command_fail(cmd, FUNDING_UNKNOWN_CHANNEL,
"Unknown channel");
if (channel->psbt && psbt_is_finalized(channel->psbt))
/* FIXME: use inflight? */
struct wally_psbt *chan_psbt = NULL;
if (chan_psbt && psbt_is_finalized(chan_psbt))
return command_fail(cmd, LIGHTNINGD,
"Already have a finalized PSBT for "
"this channel");
@@ -1758,24 +1755,23 @@ json_openchannel_signed(struct command *cmd,
/* Now that we've got the signed PSBT, save it */
tal_wally_start();
if (wally_psbt_combine(cast_const(struct wally_psbt *,
channel->psbt),
if (wally_psbt_combine(cast_const(struct wally_psbt *, chan_psbt),
psbt) != WALLY_OK) {
tal_wally_end(tal_free(channel->psbt));
tal_wally_end(tal_free(psbt));
return command_fail(cmd, FUNDING_PSBT_INVALID,
"Failed adding sigs");
}
/* Make memleak happy, (otherwise cleaned up with `cmd`) */
tal_free(psbt);
tal_wally_end(tal_steal(channel, channel->psbt));
tal_wally_end(tal_steal(channel, chan_psbt));
wallet_channel_save(cmd->ld->wallet, channel);
channel_watch_funding(cmd->ld, channel);
/* Send our tx_sigs to the peer */
subd_send_msg(channel->owner,
take(towire_dualopend_send_tx_sigs(NULL, channel->psbt)));
take(towire_dualopend_send_tx_sigs(NULL, chan_psbt)));
channel->openchannel_signed_cmd = tal_steal(channel, cmd);
return command_still_pending(cmd);
@@ -2223,7 +2219,7 @@ void peer_restart_dualopend(struct peer *peer,
channel->our_msat,
&channel->channel_info.theirbase,
&channel->channel_info.remote_per_commit,
channel->psbt,
NULL, /* FIXME! */
channel->opener,
channel->scid != NULL,
channel->remote_funding_locked,
@@ -2231,7 +2227,7 @@ void peer_restart_dualopend(struct peer *peer,
channel->shutdown_scriptpubkey[REMOTE] != NULL,
channel->shutdown_scriptpubkey[LOCAL],
channel->remote_upfront_shutdown_script,
channel->remote_tx_sigs,
false, /* FIXME! */
channel->fee_states,
channel->channel_flags,
send_msg);

2
lightningd/opening_control.c
View File

@@ -176,7 +176,6 @@ wallet_commit_channel(struct lightningd *ld,
push,
local_funding,
false, /* !remote_funding_locked */
false, /* !remote_tx_sigs */
NULL, /* no scid yet */
cid,
/* The three arguments below are msatoshi_to_us,
@@ -210,7 +209,6 @@ wallet_commit_channel(struct lightningd *ld,
remote_upfront_shutdown_script,
option_static_remotekey,
option_anchor_outputs,
NULL,
NUM_SIDES, /* closer not yet known */
uc->fc ? REASON_USER : REASON_REMOTE);