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

channel_id: save to database, dont derive from funding_txid

Browse Source 
v2 channel open uses a different method to derive the channel_id, so now
we save it to the database so that we dont have to remember how to
derive it for each.

includes a migration for existing channels
This commit is contained in:
niftynei
2020-09-09 16:50:53 +09:30
committed by Rusty Russell
parent b2170cf3f4
commit 864f2f3e21
33 changed files with 564 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
devtools/mkcommit.c
View File

@@ -18,6 +18,7 @@
#include <ccan/tal/str/str.h>
#include <channeld/full_channel.h>
#include <common/amount.h>
#include <common/channel_id.h>
#include <common/derive_basepoints.h>
#include <common/fee_states.h>
#include <common/htlc_wire.h>
@@ -250,6 +251,7 @@ int main(int argc, char *argv[])
struct pubkey funding_localkey, funding_remotekey;
u64 commitnum;
struct amount_sat funding_amount;
struct channel_id cid;
struct bitcoin_txid funding_txid;
unsigned int funding_outnum;
u32 feerate_per_kw;
@@ -386,7 +388,11 @@ int main(int argc, char *argv[])
&remote, &remoteseed,
&remotebase, &funding_remotekey, commitnum);
/* FIXME: option for v2? */
derive_channel_id(&cid, &funding_txid, funding_outnum);
channel = new_full_channel(NULL,
&cid,
&funding_txid, funding_outnum, 1,
funding_amount,
local_msat,