davide/palladum-lightning
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

openingd/dualopend: don't allow peer not to send channel_type.

Browse Source 
Simplifies our logic somewhat.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2025-06-27 14:13:18 +09:30
parent 4e94a6cb2b
commit cd90576f88
2 changed files with 58 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
openingd/dualopend.c
View File

@@ -2434,30 +2434,30 @@ static void accepter_start(struct state *state, const u8 *oc2_msg)
* - if `type` is not suitable.
* - if `type` includes `option_zeroconf` and it does not trust the sender to open an unconfirmed channel.
*/
if (open_tlv->channel_type) {
state->channel_type =
channel_type_accept(state,
open_tlv->channel_type,
state->our_features);
if (!state->channel_type) {
if (state->dev_accept_any_channel_type) {
status_unusual("dev-any-channel-type: accepting %s",
fmt_featurebits(tmpctx,
open_tlv->channel_type));
state->channel_type = channel_type_from(state, open_tlv->channel_type);
} else {
negotiation_failed(state,
"Did not support channel_type [%s]",
fmt_featurebits(tmpctx,
open_tlv->channel_type));
return;
}
if (!open_tlv->channel_type) {
negotiation_failed(state,
"open_channel2 missing channel_type");
return;
}
state->channel_type =
channel_type_accept(state,
open_tlv->channel_type,
state->our_features);
if (!state->channel_type) {
if (state->dev_accept_any_channel_type) {
status_unusual("dev-any-channel-type: accepting %s",
fmt_featurebits(tmpctx,
open_tlv->channel_type));
state->channel_type = channel_type_from(state, open_tlv->channel_type);
} else {
negotiation_failed(state,
"Did not support channel_type [%s]",
fmt_featurebits(tmpctx,
open_tlv->channel_type));
return;
}
} else
state->channel_type
= default_channel_type(state,
state->our_features,
state->their_features);
}
/* Since anchor outputs are optional, we
* only support liquidity ads if those are enabled. */
@@ -3164,9 +3164,13 @@ static void opener_start(struct state *state, u8 *msg)
* `open_channel`, and they are not equal types:
* - MUST fail the channel.
*/
if (a_tlv->channel_type
&& !featurebits_eq(a_tlv->channel_type,
state->channel_type->features)) {
if (!a_tlv->channel_type) {
negotiation_failed(state,
"Missing channel_type in accept_channel2");
return;
}
if (!featurebits_eq(a_tlv->channel_type,
state->channel_type->features)) {
negotiation_failed(state,
"Return unoffered channel_type: %s",
fmt_featurebits(tmpctx,

68
openingd/openingd.c
View File

@@ -270,17 +270,12 @@ static void set_remote_upfront_shutdown(struct state *state,
/* Since we can't send OPT_SCID_ALIAS due to compat issues, intuit whether
* we really actually want it anyway, we just can't say that. */
static bool intuit_scid_alias_type(struct state *state, u8 channel_flags,
bool peer_sent_channel_type)
static bool intuit_scid_alias_type(struct state *state, u8 channel_flags)
{
/* Don't need to intuit if actually set */
if (channel_type_has(state->channel_type, OPT_SCID_ALIAS))
return false;
/* Old clients didn't send channel_type at all */
if (!peer_sent_channel_type)
return false;
/* Modern peer: no intuit hacks necessary. */
if (channel_type_has(state->channel_type, OPT_ANCHORS_ZERO_FEE_HTLC_TX))
return false;
@@ -446,14 +441,13 @@ static u8 *funder_channel_start(struct state *state, u8 channel_flags,
* `open_channel`, and they are not equal types:
* - MUST fail the channel.
*/
if (!accept_tlvs->channel_type) {
negotiation_failed(state,
"accept_channel without a channel_type");
}
/* Simple case: caller specified, don't allow any variants */
if (ctype) {
if (!accept_tlvs->channel_type) {
negotiation_failed(state,
"They replied without a channel_type");
return NULL;
}
if (!featurebits_eq(accept_tlvs->channel_type, state->channel_type->features)) {
negotiation_failed(state,
"Return unoffered channel_type: %s",
@@ -461,7 +455,7 @@ static u8 *funder_channel_start(struct state *state, u8 channel_flags,
accept_tlvs->channel_type));
return NULL;
}
} else if (accept_tlvs->channel_type) {
} else {
/* Except that v23.05 could set OPT_SCID_ALIAS in reply! */
struct channel_type *atype;
@@ -587,8 +581,7 @@ static u8 *funder_channel_start(struct state *state, u8 channel_flags,
tal_hex(tmpctx, funding_output_script));
/* Backwards/cross compat hack */
if (!ctype && intuit_scid_alias_type(state, channel_flags,
accept_tlvs->channel_type != NULL)) {
if (!ctype && intuit_scid_alias_type(state, channel_flags)) {
channel_type_set_scid_alias(state->channel_type);
}
@@ -902,7 +895,6 @@ static u8 *fundee_channel(struct state *state, const u8 *open_channel_msg)
struct tlv_accept_channel_tlvs *accept_tlvs;
struct tlv_open_channel_tlvs *open_tlvs;
struct amount_sat *reserve;
bool open_channel_had_channel_type;
/* BOLT #2:
*
@@ -943,30 +935,27 @@ static u8 *fundee_channel(struct state *state, const u8 *open_channel_msg)
* - if `type` is not suitable.
* - if `type` includes `option_zeroconf` and it does not trust the sender to open an unconfirmed channel.
*/
if (open_tlvs->channel_type) {
open_channel_had_channel_type = true;
state->channel_type = channel_type_accept(
state, open_tlvs->channel_type, state->our_features);
if (!state->channel_type) {
if (state->dev_accept_any_channel_type) {
status_unusual("dev-any-channel-type: accepting %s",
fmt_featurebits(tmpctx,
open_tlvs->channel_type));
state->channel_type = channel_type_from(state, open_tlvs->channel_type);
} else {
negotiation_failed(state,
"Did not support channel_type [%s]",
fmt_featurebits(tmpctx,
open_tlvs->channel_type));
return NULL;
}
/* option_channel_type is compulsory. */
if (!open_tlvs->channel_type) {
negotiation_failed(state,
"Did not set channel_type in open_channel message");
}
state->channel_type = channel_type_accept(
state, open_tlvs->channel_type, state->our_features);
if (!state->channel_type) {
if (state->dev_accept_any_channel_type) {
status_unusual("dev-any-channel-type: accepting %s",
fmt_featurebits(tmpctx,
open_tlvs->channel_type));
state->channel_type = channel_type_from(state, open_tlvs->channel_type);
} else {
negotiation_failed(state,
"Did not support channel_type [%s]",
fmt_featurebits(tmpctx,
open_tlvs->channel_type));
return NULL;
}
} else {
open_channel_had_channel_type = false;
state->channel_type
= default_channel_type(state,
state->our_features,
state->their_features);
}
/* BOLT #2:
@@ -1191,8 +1180,7 @@ static u8 *fundee_channel(struct state *state, const u8 *open_channel_msg)
fmt_channel_id(msg, &id_in));
/* Backwards/cross compat hack */
if (intuit_scid_alias_type(state, channel_flags,
open_channel_had_channel_type)) {
if (intuit_scid_alias_type(state, channel_flags)) {
channel_type_set_scid_alias(state->channel_type);
}