aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-19 07:04:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

common/initial_channel: use channel_type instead of individual option bools.

Browse Source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2021-09-09 14:55:23 +09:30
committed by Christian Decker
parent cb22015b2a
commit 740afb822c
12 changed files with 126 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
devtools/mkcommit.c
View File

@@ -272,6 +272,7 @@ int main(int argc, char *argv[])
struct privkey local_htlc_privkey, remote_htlc_privkey;
struct pubkey local_htlc_pubkey, remote_htlc_pubkey;
bool option_static_remotekey = false, option_anchor_outputs = false;
const struct channel_type *channel_type;
struct sha256_double hash;
u32 blockheight = 0;
@@ -394,6 +395,13 @@ int main(int argc, char *argv[])
/* FIXME: option for v2? */
derive_channel_id(&cid, &funding_txid, funding_outnum);
if (option_anchor_outputs)
channel_type = channel_type_anchor_outputs(NULL);
else if (option_static_remotekey)
channel_type = channel_type_static_remotekey(NULL);
else
channel_type = channel_type_none(NULL);
channel = new_full_channel(NULL,
&cid,
&funding_txid, funding_outnum, 1,
@@ -407,8 +415,7 @@ int main(int argc, char *argv[])
&localconfig, &remoteconfig,
&localbase, &remotebase,
&funding_localkey, &funding_remotekey,
option_static_remotekey,
option_anchor_outputs,
channel_type,
false,
fee_payer);