mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2024-11-20 02:27:51 +01:00
Code Issues Projects Releases Wiki Activity

dualopend: don't use final channel_id for accepter_start2

Browse Source 
The other side doesn't know it until *after* it parses this msg.  We
add a quick hack to still allow old nodes to work (for now!).

This also fixes a bug (spotted by @niftynei) where any errors we sent
before accepter_start2 would have the new (unknowable!) channel_id
rather than the temp one.

Authored-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
niftynei 2021-04-20 16:42:52 -05:00 committed by Rusty Russell
parent 69cc9201de
commit 382264e207
1 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
openingd/dualopend.c
View File

@ -1896,8 +1896,8 @@ static void accepter_start(struct state *state, const u8 *oc2_msg)
{ {
struct bitcoin_blkid chain_hash; struct bitcoin_blkid chain_hash;
struct tlv_opening_tlvs *open_tlv; struct tlv_opening_tlvs *open_tlv;
struct channel_id cid, full_cid;
char *err_reason; char *err_reason;
struct channel_id tmp_chan_id;
u8 *msg; u8 *msg;
struct amount_sat total; struct amount_sat total;
enum dualopend_wire msg_type; enum dualopend_wire msg_type;
@ -1907,7 +1907,7 @@ static void accepter_start(struct state *state, const u8 *oc2_msg)
open_tlv = tlv_opening_tlvs_new(tmpctx); open_tlv = tlv_opening_tlvs_new(tmpctx);
if (!fromwire_open_channel2(oc2_msg, &chain_hash, if (!fromwire_open_channel2(oc2_msg, &chain_hash,
&state->channel_id, /* Temporary! */ &cid,
&tx_state->feerate_per_kw_funding, &tx_state->feerate_per_kw_funding,
&state->feerate_per_kw_commitment, &state->feerate_per_kw_commitment,
&tx_state->opener_funding, &tx_state->opener_funding,
@ -1939,21 +1939,15 @@ static void accepter_start(struct state *state, const u8 *oc2_msg)
* `open_channel2`), a temporary `channel_id` should be found * `open_channel2`), a temporary `channel_id` should be found
* by using a zeroed out basepoint for the unknown peer. * by using a zeroed out basepoint for the unknown peer.
*/ */
derive_tmp_channel_id(&tmp_chan_id, derive_tmp_channel_id(&state->channel_id, /* Temporary! */
&state->their_points.revocation); &state->their_points.revocation);
if (!channel_id_eq(&state->channel_id, &tmp_chan_id)) if (!channel_id_eq(&state->channel_id, &cid))
negotiation_failed(state, "open_channel2 channel_id incorrect." negotiation_failed(state, "open_channel2 channel_id incorrect."
" Expected %s, received %s", " Expected %s, received %s",
type_to_string(tmpctx, struct channel_id, type_to_string(tmpctx, struct channel_id,
&tmp_chan_id), &state->channel_id),
type_to_string(tmpctx, struct channel_id, type_to_string(tmpctx, struct channel_id,
&state->channel_id)); &cid));
/* Everything's ok. Let's figure out the actual channel_id now */
derive_channel_id_v2(&state->channel_id,
&state->our_points.revocation,
&state->their_points.revocation);
/* Save feerate on the state as well */ /* Save feerate on the state as well */
state->feerate_per_kw_funding = tx_state->feerate_per_kw_funding; state->feerate_per_kw_funding = tx_state->feerate_per_kw_funding;
@ -1990,8 +1984,12 @@ static void accepter_start(struct state *state, const u8 *oc2_msg)
return; return;
} }
/* We send the 'real' channel id over to lightningd */
derive_channel_id_v2(&full_cid,
&state->our_points.revocation,
&state->their_points.revocation);
msg = towire_dualopend_got_offer(NULL, msg = towire_dualopend_got_offer(NULL,
&state->channel_id, &full_cid,
tx_state->opener_funding, tx_state->opener_funding,
tx_state->remoteconf.dust_limit, tx_state->remoteconf.dust_limit,
tx_state->remoteconf.max_htlc_value_in_flight, tx_state->remoteconf.max_htlc_value_in_flight,
@ -2010,7 +2008,6 @@ static void accepter_start(struct state *state, const u8 *oc2_msg)
if ((msg_type = fromwire_peektype(msg)) == WIRE_DUALOPEND_FAIL) { if ((msg_type = fromwire_peektype(msg)) == WIRE_DUALOPEND_FAIL) {
if (!fromwire_dualopend_fail(msg, msg, &err_reason)) if (!fromwire_dualopend_fail(msg, msg, &err_reason))
master_badmsg(msg_type, msg); master_badmsg(msg_type, msg);
open_err_warn(state, "%s", err_reason); open_err_warn(state, "%s", err_reason);
return; return;
} }
@ -2105,6 +2102,11 @@ static void accepter_start(struct state *state, const u8 *oc2_msg)
&state->first_per_commitment_point[LOCAL], &state->first_per_commitment_point[LOCAL],
a_tlv); a_tlv);
/* Everything's ok. Let's figure out the actual channel_id now */
derive_channel_id_v2(&state->channel_id,
&state->our_points.revocation,
&state->their_points.revocation);
sync_crypto_write(state->pps, msg); sync_crypto_write(state->pps, msg);
peer_billboard(false, "channel open: accept sent, waiting for reply"); peer_billboard(false, "channel open: accept sent, waiting for reply");
@ -2479,6 +2481,23 @@ static void opener_start(struct state *state, u8 *msg)
open_err_fatal(state, "Parsing accept_channel2 %s", open_err_fatal(state, "Parsing accept_channel2 %s",
tal_hex(msg, msg)); tal_hex(msg, msg));
if (!channel_id_eq(&cid, &state->channel_id)) {
struct channel_id future_chan_id;
/* FIXME: v0.10.0 actually replied with the complete channel id here,
* so we need to accept it for now */
derive_channel_id_v2(&future_chan_id,
&state->our_points.revocation,
&state->their_points.revocation);
if (!channel_id_eq(&cid, &future_chan_id)) {
peer_failed_err(state->pps, &cid,
"accept_channel2 ids don't match: "
"expected %s, got %s",
type_to_string(msg, struct channel_id,
&state->channel_id),
type_to_string(msg, struct channel_id, &cid));
}
}
if (a_tlv->option_upfront_shutdown_script) { if (a_tlv->option_upfront_shutdown_script) {
state->upfront_shutdown_script[REMOTE] state->upfront_shutdown_script[REMOTE]
= tal_steal(state, = tal_steal(state,
@ -2492,14 +2511,6 @@ static void opener_start(struct state *state, u8 *msg)
&state->our_points.revocation, &state->our_points.revocation,
&state->their_points.revocation); &state->their_points.revocation);
if (!channel_id_eq(&cid, &state->channel_id))
peer_failed_err(state->pps, &cid,
"accept_channel2 ids don't match: "
"expected %s, got %s",
type_to_string(msg, struct channel_id,
&state->channel_id),
type_to_string(msg, struct channel_id, &cid));
/* Check that total funding doesn't overflow */ /* Check that total funding doesn't overflow */
if (!amount_sat_add(&total, tx_state->opener_funding, if (!amount_sat_add(&total, tx_state->opener_funding,
tx_state->accepter_funding)) tx_state->accepter_funding))