mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-01-19 05:44:12 +01:00
Code Issues Projects Releases Wiki Activity

zeroconf: Add channel_type variant support

Browse Source 
If zeroconf was negotiated we'll add it to the basic channel
type. Similarly we'll accept it if it was negotiated too.
This commit is contained in:
Christian Decker 2022-04-19 12:49:32 +02:00
parent a07797c166
commit d115d01105
1 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
common/channel_type.c
View File

@ -108,9 +108,21 @@ struct channel_type *channel_type_accept(const tal_t *ctx,
const struct feature_set *our_features, const struct feature_set *our_features,
const u8 *their_features) const u8 *their_features)
{ {
struct channel_type *ctype; struct channel_type *ctype, proposed;
static const size_t feats[] = { OPT_ANCHOR_OUTPUTS, /* Need to copy since we're going to blank variant bits for equality. */
OPT_STATIC_REMOTEKEY }; proposed.features = tal_dup_talarr(tmpctx, u8, t);
static const size_t feats[] = {
OPT_ANCHOR_OUTPUTS,
OPT_STATIC_REMOTEKEY,
OPT_ZEROCONF,
};
/* The basic channel_types can have any number of the
* following optional bits. */
static const size_t variants[] = {
OPT_ZEROCONF,
};
for (size_t i = 0; i < ARRAY_SIZE(feats); i++) { for (size_t i = 0; i < ARRAY_SIZE(feats); i++) {
size_t f = feats[i]; size_t f = feats[i];
@ -128,15 +140,22 @@ struct channel_type *channel_type_accept(const tal_t *ctx,
} }
} }
/* Blank variants so we can just check for equality. */
for (size_t i = 0; i< ARRAY_SIZE(variants); i++)
featurebits_unset(&proposed.features, variants[i]);
/* Otherwise, just needs to be a known channel type. */ /* Otherwise, just needs to be a known channel type. */
ctype = channel_type_none(tmpctx); if (channel_type_eq(&proposed, channel_type_none(tmpctx)) ||
if (featurebits_eq(t, ctype->features)) channel_type_eq(&proposed,
return tal_steal(ctx, ctype); channel_type_static_remotekey(tmpctx)) ||
ctype = channel_type_static_remotekey(tmpctx); channel_type_eq(&proposed, channel_type_anchor_outputs(tmpctx))) {
if (featurebits_eq(t, ctype->features)) /* At this point we know it matches, and maybe has
return tal_steal(ctx, ctype); * a couple of extra options. So let's just reply
ctype = channel_type_anchor_outputs(tmpctx); * with their proposal. */
if (featurebits_eq(t, ctype->features)) ctype = tal(ctx, struct channel_type);
return tal_steal(ctx, ctype); ctype->features = tal_dup_talarr(ctx, u8, t);
return ctype;
}
return NULL; return NULL;
} }