From 63a1e510d99b4a408375cd756a0112851b869064 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Thu, 2 Aug 2018 16:19:56 +0930 Subject: [PATCH] lightningd: count first block of channel on exit from openingd, not start. 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 --- lightningd/opening_control.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lightningd/opening_control.c b/lightningd/opening_control.c index 85c0d9db9..f06335705 100644 --- a/lightningd/opening_control.c +++ b/lightningd/opening_control.c @@ -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,