aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-02-12 01:24:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

lightningd: count first block of channel on exit from openingd, not start.

Browse Source 
It's only used so we can timeout being fundee after a few hundred
blocks, but when openingd is started for idle connections, the
difference can be huge.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2018-08-02 16:19:56 +09:30
parent 15542a01eb
commit 63a1e510d9
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lightningd/opening_control.c
View File

@@ -52,10 +52,6 @@ struct uncommitted_channel {
/* Public key for funding tx. */
struct pubkey local_funding_pubkey;
/* Blockheight at creation, scans for funding confirmations
* will start here */
u32 first_blocknum;
/* These are *not* filled in by new_uncommitted_channel: */
/* Minimum funding depth (if funder == REMOTE). */
@@ -247,7 +243,9 @@ wallet_commit_channel(struct lightningd *ld,
NULL, /* No remote_shutdown_scriptpubkey yet */
final_key_idx, false,
NULL, /* No commit sent yet */
uc->first_blocknum,
/* If we're fundee, could be a little before this
* in theory, but it's only used for timing out. */
get_block_height(ld->topology),
feerate, feerate,
/* We are connected */
true,
@@ -624,7 +622,6 @@ new_uncommitted_channel(struct lightningd *ld,
tal_free(idname);
uc->fc = fc;
uc->first_blocknum = get_block_height(ld->topology);
uc->our_config.id = 0;
get_channel_basepoints(ld, &uc->peer->id, uc->dbid,