lightningd: rename anchor_confirms to funding_confirms.

Calling the funding tx an anchor is pre-spec terminology, which is now
confusing; let's rename the variable.

Signed-off-by: Rusty Russell <[email protected]>

Author: rustyrussell

lightningd/dual_open_control.c

@@ -4122,7 +4122,7 @@ bool peer_start_dualopend(struct peer *peer,
 	 *       funding transaction.
 	 */
 	/* FIXME: We should override this to 0 in the openchannel2 hook of we want zeroconf*/
-	channel->minimum_depth = peer->ld->config.anchor_confirms;
+	channel->minimum_depth = peer->ld->config.funding_confirms;
 
 	msg = towire_dualopend_init(NULL, chainparams,
 				    peer->ld->our_features,

lightningd/lightningd.h

@@ -21,8 +21,8 @@ struct config {
 	/* How long do we let them lock up our funds? (blocks: 2016 by spec) */
 	u32 max_htlc_cltv;
 
-	/* How many confirms until we consider an anchor "settled". */
-	u32 anchor_confirms;
+	/* How many confirms until we consider a funding tx "settled". */
+	u32 funding_confirms;
 
 	/* Minimum CLTV to subtract from incoming HTLCs to outgoing */
 	u32 cltv_expiry_delta;

lightningd/opening_common.c

@@ -62,7 +62,7 @@ new_uncommitted_channel(struct peer *peer)
 	 *       funding transaction.
 	 */
 	 /* We override this in openchannel hook if we want zeroconf */
-	uc->minimum_depth = ld->config.anchor_confirms;
+	uc->minimum_depth = ld->config.funding_confirms;
 
 	/* Use default 1% reserve if not otherwise specified. If this
 	 * is not-NULL it will be used by openingd as absolute value

lightningd/opening_control.c

@@ -1294,7 +1294,7 @@ static struct command_result *json_fundchannel_start(struct command *cmd,
 	}
 
 	if (!mindepth)
-		mindepth = tal_dup(cmd, u32, &cmd->ld->config.anchor_confirms);
+		mindepth = tal_dup(cmd, u32, &cmd->ld->config.funding_confirms);
 
 	if (push_msat && amount_msat_greater_sat(*push_msat, *amount))
 		return command_fail(cmd, FUND_CANNOT_AFFORD,

lightningd/options.c

@@ -957,7 +957,7 @@ static const struct config testnet_config = {
 	.max_htlc_cltv = 2016,
 
 	/* We're fairly trusting, under normal circumstances. */
-	.anchor_confirms = 1,
+	.funding_confirms = 1,
 
 	/* Testnet blockspace is free. */
 	.max_concurrent_htlcs = 483,
@@ -1025,7 +1025,7 @@ static const struct config mainnet_config = {
 	.max_htlc_cltv = 2016,
 
 	/* We're fairly trusting, under normal circumstances. */
-	.anchor_confirms = 3,
+	.funding_confirms = 3,
 
 	/* While up to 483 htlcs are possible we do 30 by default (as eclair does) to save blockspace */
 	.max_concurrent_htlcs = 30,
@@ -1099,8 +1099,8 @@ static void check_config(struct lightningd *ld)
 	if (ld->config.max_concurrent_htlcs < 1 || ld->config.max_concurrent_htlcs > 483)
 		fatal("--max-concurrent-htlcs value must be between 1 and 483 it is: %u",
 		      ld->config.max_concurrent_htlcs);
-	if (ld->config.anchor_confirms == 0)
-		fatal("anchor-confirms must be greater than zero");
+	if (ld->config.funding_confirms == 0)
+		fatal("funding-confirms must be greater than zero");
 
 	if (ld->always_use_proxy && !ld->proxyaddr)
 		fatal("--always-use-proxy needs --proxy");
@@ -1497,7 +1497,7 @@ static void register_opts(struct lightningd *ld)
 	opt_register_arg("--max-locktime-blocks", opt_set_max_htlc_cltv, NULL,
 			 ld, opt_hidden);
 	clnopt_witharg("--funding-confirms", OPT_SHOWINT, opt_set_u32, opt_show_u32,
-			 &ld->config.anchor_confirms,
+			 &ld->config.funding_confirms,
 			 "Confirmations required for funding transaction");
 	clnopt_witharg("--require-confirmed-inputs", OPT_SHOWBOOL,
 		       opt_set_bool_arg, opt_show_bool,