WIP changes

Author: ddustin

channeld/channeld.c

@@ -76,13 +76,16 @@ struct peer {
 	/* What (additional) messages the HSM accepts */
 	u32 *hsm_capabilities;
 
+	/* The feerate to initiate a splice */
+	u32 feerate_splice;
+
 	/* Tolerable amounts for feerate (only relevant for fundee). */
 	u32 feerate_min, feerate_max;
 
 	/* Feerate to be used when creating penalty transactions. */
 	u32 feerate_penalty;
 
-	/* Feerate to be used when opening (or splicing) a channel. */
+	/* Feerate to be used when opening a channel. */
 	u32 feerate_opening;
 
 	/* Local next per-commit point. */
@@ -1894,9 +1897,9 @@ static void check_tx_abort(struct peer *peer, const u8 *msg, struct bitcoin_txid
 	exit(0);
 }
 
-static void splice_abort(struct peer *peer, const char *fmt, ...)
+static void splice_abort(struct peer *peer, struct inflight *inflight,
+			 const char *fmt, ...)
 {
-	struct inflight *inflight = last_inflight(peer);
 	struct bitcoin_outpoint *outpoint;
 	u8 *msg;
 	char *reason;
@@ -3337,7 +3340,8 @@ static struct amount_sat calc_balance(struct peer *peer)
 }
 
 /* Returns the total channel funding output amount if all checks pass.
- * Otherwise, exits via peer_failed_warn. */
+ * Otherwise, exits via peer_failed_warn.
+ * Note: Should only be called before adding splice to inflights. */
 static struct amount_sat check_balances(struct peer *peer,
 					enum tx_role our_role,
 					const struct wally_psbt *psbt,
@@ -3388,15 +3392,15 @@ static struct amount_sat check_balances(struct peer *peer,
 	 * additional funds are otherwise contributed. */
 	if (!amount_msat_can_add_sat_s64(in[TX_INITIATOR],
 					 peer->splicing->opener_relative)) {
-		splice_abort(peer, "Intiator is attempting to splice out"
+		splice_abort(peer, NULL, "Intiator is attempting to splice out"
 			     " %"PRId64"sat funds out of channel while only "
 			     "having %s funds attributable to them.",
 			     peer->splicing->opener_relative,
 			     fmt_amount_m_as_sat(tmpctx, in[TX_INITIATOR]));
 	}
 	if (!amount_msat_can_add_sat_s64(in[TX_ACCEPTER],
 					 peer->splicing->accepter_relative)) {
-		splice_abort(peer, "Accepter is attempting to splice out"
+		splice_abort(peer, NULL, "Accepter is attempting to splice out"
 			     " %"PRId64"sat funds out of channel while only "
 			     "having %s funds attributable to them.",
 			     peer->splicing->accepter_relative,
@@ -3452,7 +3456,7 @@ static struct amount_sat check_balances(struct peer *peer,
 	 */
 	if (!amount_msat_add_sat_s64(&funding_amount, funding_amount,
 				     peer->splicing->opener_relative))
-		splice_abort(peer, "Splice initiator did not provide enough"
+		splice_abort(peer, NULL, "Splice initiator did not provide enough"
 			     " funding, funding_amount: %s, opener_relative:"
 			     " %"PRIu64,
 			     fmt_amount_msat(tmpctx, funding_amount),
@@ -3469,7 +3473,7 @@ static struct amount_sat check_balances(struct peer *peer,
 
 	if (!amount_msat_add_sat_s64(&funding_amount, funding_amount,
 				     peer->splicing->accepter_relative))
-		splice_abort(peer, "Splice accepter did not provide enough"
+		splice_abort(peer, NULL, "Splice accepter did not provide enough"
 			     " funding");
 	if (!amount_msat_add_sat_s64(&out[TX_ACCEPTER], out[TX_ACCEPTER],
 				     peer->splicing->accepter_relative))
@@ -3486,7 +3490,7 @@ static struct amount_sat check_balances(struct peer *peer,
 							   out[TX_INITIATOR],
 							   true);
 		wire_sync_write(MASTER_FD, take(msg));
-		splice_abort(peer,
+		splice_abort(peer, NULL,
 				 "Initiator funding is less than commited"
 				 " amount. Initiator contributing %s but they"
 				 " committed to %s. Pending offered HTLC"
@@ -3513,7 +3517,7 @@ static struct amount_sat check_balances(struct peer *peer,
 							   out[TX_INITIATOR],
 							   true);
 		wire_sync_write(MASTER_FD, take(msg));
-		splice_abort(peer,
+		splice_abort(peer, NULL,
 				 "Accepter funding is less than commited"
 				 " amount. Accepter contributing %s but they"
 				 " committed to %s. Pending offered HTLC"
@@ -3543,10 +3547,10 @@ static struct amount_sat check_balances(struct peer *peer,
 					  calc_weight(TX_INITIATOR, psbt, opener));
 
 	if (opener) {
-		status_debug("User specified fee of %s. Opening feerate %"PRIu32
+		status_debug("User specified fee of %s. Splice feerate %"PRIu32
 			     " * weight %lu / 1000 = %s",
 			     fmt_amount_m_as_sat(tmpctx, initiator_fee),
-			     peer->feerate_opening,
+			     peer->feerate_splice,
 			     calc_weight(TX_INITIATOR, psbt, false),
 			     fmt_amount_sat(tmpctx, max_initiator_fee));
 	}
@@ -3556,7 +3560,7 @@ static struct amount_sat check_balances(struct peer *peer,
 		msg = towire_channeld_splice_feerate_error(NULL, initiator_fee,
 							   false);
 		wire_sync_write(MASTER_FD, take(msg));
-		splice_abort(peer,
+		splice_abort(peer, NULL,
 				 "%s fee (%s) was too low, must be at least %s",
 				 opener ? "Our" : "Your",
 				 fmt_amount_msat(tmpctx, initiator_fee),
@@ -3576,7 +3580,7 @@ static struct amount_sat check_balances(struct peer *peer,
 
 		wire_sync_write(MASTER_FD, take(msg));
 
-		splice_abort(peer,
+		splice_abort(peer, NULL,
 			     "Our own fee (%s) is too high to use without"
 			     " forcing. Opening feerate %"PRIu32
 			     " x weight %lu / 1000 = %s (max)",
@@ -3590,7 +3594,7 @@ static struct amount_sat check_balances(struct peer *peer,
 		msg = towire_channeld_splice_feerate_error(NULL, accepter_fee,
 							   false);
 		wire_sync_write(MASTER_FD, take(msg));
-		splice_abort(peer,
+		splice_abort(peer, NULL,
 			     "%s fee (%s) was too low, must be at least %s"
 			     " weight: %"PRIu64", feerate_max: %"PRIu32,
 			     opener ? "Your" : "Our",
@@ -3604,7 +3608,7 @@ static struct amount_sat check_balances(struct peer *peer,
 		msg = towire_channeld_splice_feerate_error(NULL, accepter_fee,
 							   true);
 		wire_sync_write(MASTER_FD, take(msg));
-		splice_abort(peer,
+		splice_abort(peer, NULL,
 				 "Our own fee (%s) was too high, max without"
 				 " forcing is %s.",
 				 fmt_amount_msat(tmpctx, accepter_fee),
@@ -5027,7 +5031,7 @@ static void handle_abort_req(struct peer *peer, const u8 *inmsg)
 	if (!fromwire_channeld_abort(inmsg))
 		master_badmsg(WIRE_CHANNELD_ABORT, inmsg);
 
-	splice_abort(peer, "requested by user");
+	splice_abort(peer, last_inflight(peer), "requested by user");
 }
 
 static void peer_in(struct peer *peer, const u8 *msg)
@@ -5883,7 +5887,8 @@ static void peer_reconnect(struct peer *peer,
 				    " channel, ignoring it: %s",
 				    fmt_bitcoin_outpoint(tmpctx, &peer->channel->funding));
 		else
-			splice_abort(peer, "next_funding_txid not recognized.");
+			splice_abort(peer, NULL,
+				     "next_funding_txid not recognized.");
 	}
 
 	/* BOLT #2:
@@ -6377,11 +6382,13 @@ static void handle_feerates(struct peer *peer, const u8 *inmsg)
 {
 	u32 feerate;
 
-	if (!fromwire_channeld_feerates(inmsg, &feerate,
-				       &peer->feerate_min,
-				       &peer->feerate_max,
-				       &peer->feerate_penalty,
-				       &peer->feerate_opening))
+	if (!fromwire_channeld_feerates(inmsg,
+					&feerate,
+				        &peer->feerate_min,
+				        &peer->feerate_max,
+				        &peer->feerate_penalty,
+				        &peer->feerate_opening,
+				        &peer->feerate_splice))
 		master_badmsg(WIRE_CHANNELD_FEERATES, inmsg);
 
 	/* BOLT #2:
@@ -6749,6 +6756,7 @@ static void init_channel(struct peer *peer)
 				    &lease_expiry,
 				    &conf[LOCAL], &conf[REMOTE],
 				    &fee_states,
+				    &peer->feerate_splice,
 				    &peer->feerate_min,
 				    &peer->feerate_max,
 				    &peer->feerate_penalty,

channeld/channeld_wire.csv

@@ -28,6 +28,7 @@ msgdata,channeld_init,lease_expiry,u32,
 msgdata,channeld_init,our_config,channel_config,
 msgdata,channeld_init,their_config,channel_config,
 msgdata,channeld_init,fee_states,fee_states,
+msgdata,channeld_init,feerate_splice,u32,
 msgdata,channeld_init,feerate_min,u32,
 msgdata,channeld_init,feerate_max,u32,
 msgdata,channeld_init,feerate_penalty,u32,
@@ -331,6 +332,7 @@ msgdata,channeld_feerates,min_feerate,u32,
 msgdata,channeld_feerates,max_feerate,u32,
 msgdata,channeld_feerates,penalty_feerate,u32,
 msgdata,channeld_feerates,opening_feerate,u32,
+msgdata,channeld_feerates,feerate_splice,u32,
 
 # master -> channeld: do you have a memleak?
 msgtype,channeld_dev_memleak,1033

common/splice_script.c

@@ -2777,11 +2777,13 @@ char *splice_to_string(const tal_t *ctx,
 				  result->feerate_per_kw);
 
 	if (!amount_sat_is_zero(result->in_sat))
-		tal_append_fmt(&str, "%sput %s%s into ", into_prefix,
+		tal_append_fmt(&str, "%sput %s%s %s ", into_prefix,
 			       fmt_amount_sat(ctx, result->in_sat),
-			       fee_str);
+			       fee_str,
+			       result->in_ppm ? "and" : "into");
 	if (result->in_ppm)
-		tal_append_fmt(&str, "%sput %s%s of rest into ", into_prefix,
+		tal_append_fmt(&str, "%s%s%s%s of rest into ", into_prefix,
+			       amount_sat_is_zero(result->in_sat) ? "put " : "",
 			       ppm_to_str(ctx, result->in_ppm),
 			       fee_str);
 
@@ -2807,7 +2809,9 @@ char *splice_to_string(const tal_t *ctx,
 			       fmt_amount_sat(ctx, result->out_sat),
 			       fee_str);
 	if (result->out_ppm)
-		tal_append_fmt(&str, " withdraw %s%s",
+		tal_append_fmt(&str, " %s %s%s",
+			       amount_sat_is_zero(result->out_sat)
+			       	 ? "withdraw" : "and",
 			       ppm_to_str(ctx, result->out_ppm),
 			       fee_str);
 

contrib/pyln-testing/pyln/testing/utils.py

@@ -1092,7 +1092,7 @@ def fundbalancedchannel(self, remote_node, total_capacity=FUNDAMOUNT, announce=T
             if txid == res['txid']:
                 txnum = i
 
-        return '{}x{}x{}'.format(self.bitcoin.rpc.getblockcount(), txnum, res['outnum'])
+        return '{}x{}x{}'.format(self.bitcoin.rpc.getblockcount(), txnum, res['outnum']), res['txid']
 
     def db_query(self, query):
         return self.db.query(query)
@@ -1702,7 +1702,7 @@ def get_node_id(self):
             self.next_id += 1
             return node_id
 
-    def get_nodes(self, num_nodes, opts=None):
+    def get_nodes(self, num_nodes, opts=None, allow_bad_gossip=False):
         """Start a number of nodes in parallel, each with its own options
         """
         if opts is None:
@@ -1727,7 +1727,8 @@ def get_nodes(self, num_nodes, opts=None):
             jobs.append(self.executor.submit(
                 self.get_node, options=cli_opts,
                 node_id=self.get_node_id(), **node_opts,
-                valgrind_plugins=valgrind_plugins[i]
+                valgrind_plugins=valgrind_plugins[i],
+                allow_bad_gossip=allow_bad_gossip
             ))
 
         return [j.result() for j in jobs]
@@ -1789,7 +1790,7 @@ def get_node(self, node_id=None, options=None, dbfile=None,
                 raise
         return node
 
-    def join_nodes(self, nodes, fundchannel=True, fundamount=FUNDAMOUNT, wait_for_announce=False, announce_channels=True) -> None:
+    def join_nodes(self, nodes, fundchannel=True, fundamount=FUNDAMOUNT, wait_for_announce=False, announce_channels=True, balance_channels=False) -> None:
         """Given nodes, connect them in a line, optionally funding a channel, wait_for_announce waits for channel and node announcements"""
         assert not (wait_for_announce and not announce_channels), "You've asked to wait for an announcement that's not coming. (wait_for_announce=True,announce_channels=False)"
         connections = [(nodes[i], nodes[i + 1]) for i in range(len(nodes) - 1)]
@@ -1815,10 +1816,15 @@ def join_nodes(self, nodes, fundchannel=True, fundamount=FUNDAMOUNT, wait_for_an
         sync_blockheight(bitcoind, nodes)
         txids = []
         for src, dst in connections:
-            txids.append(src.rpc.fundchannel(dst.info['id'], fundamount, announce=announce_channels)['txid'])
+            if balance_channels:
+                _, txid = src.fundbalancedchannel(remote_node=dst, total_capacity=fundamount, announce=announce_channels)
+                txids.append(txid)
+            else:
+                txids.append(src.rpc.fundchannel(dst.info['id'], fundamount, announce=announce_channels)['txid'])
 
-        # Confirm all channels and wait for them to become usable
-        bitcoind.generate_block(1, wait_for_mempool=txids)
+        if not balance_channels:
+            # Confirm all channels and wait for them to become usable
+            bitcoind.generate_block(1, wait_for_mempool=txids)
         scids = []
         for src, dst in connections:
             wait_for(lambda: src.channel_state(dst) == 'CHANNELD_NORMAL')
@@ -1846,12 +1852,12 @@ def join_nodes(self, nodes, fundchannel=True, fundamount=FUNDAMOUNT, wait_for_an
                 alias = n2.rpc.getinfo()['alias']
                 wait_for(lambda: [n.get('alias') for n in n.rpc.listnodes(n2.info['id'])['nodes']] == [alias])
 
-    def line_graph(self, num_nodes, fundchannel=True, fundamount=FUNDAMOUNT, wait_for_announce=False, opts=None, announce_channels=True):
+    def line_graph(self, num_nodes, fundchannel=True, fundamount=FUNDAMOUNT, wait_for_announce=False, opts=None, announce_channels=True, balanced=False, allow_bad_gossip=False):
         """ Create nodes, connect them and optionally fund channels.
         """
-        nodes = self.get_nodes(num_nodes, opts=opts)
+        nodes = self.get_nodes(num_nodes, opts=opts, allow_bad_gossip=allow_bad_gossip)
 
-        self.join_nodes(nodes, fundchannel, fundamount, wait_for_announce, announce_channels)
+        self.join_nodes(nodes, fundchannel, fundamount, wait_for_announce, announce_channels, balanced)
         return nodes
 
     def get_unused_port(self):

gossipd/gossmap_manage.c

@@ -703,10 +703,18 @@ void gossmap_manage_handle_get_txout_reply(struct gossmap_manage *gm, const u8 *
 	 *    - MUST ignore the message.
 	 */
 	if (tal_count(outscript) == 0) {
-		peer_warning(gm, pca->source_peer,
-			     "channel_announcement: no unspent txout %s",
-			     fmt_short_channel_id(tmpctx, scid));
-		goto bad;
+		/* Splices that happen soon after a channel open can result in
+		 * the receiving of stale channel announcement (Splice spends
+		 * the txout of the original channel).
+		 *
+		 * We used to treat this as a warning and reset the peer
+		 * connection but the spec simply says "ignore the message". So
+		 * Now we just ignore these stale channel announcements. */
+
+		status_peer_trace(pca->source_peer,
+				  "channel_announcement: no unspent txout %s",
+				  fmt_short_channel_id(tmpctx, scid));
+		goto out;
 	}
 
 	if (!tal_arr_eq(outscript, pca->scriptpubkey)) {
@@ -810,10 +818,14 @@ static const char *process_channel_update(const tal_t *ctx,
 		/* Seeker may want to ask about this. */
 		query_unknown_channel(gm->daemon, source_peer, scid);
 
-		/* Don't send them warning, it can happen. */
-		bad_gossip(source_peer,
-			   tal_fmt(tmpctx, "Unknown channel %s",
-				   fmt_short_channel_id(tmpctx, scid)));
+		/* Splices that happen soon after a channel open can result in
+		 * the receiving of stale channel announcement (Splice spends
+		 * the txout of the original channel).
+		 *
+		 * We used to record this as as bad_gossip but now we log it
+		 * without the 'bad gossip' because that triggers CI. */
+		status_peer_trace(source_peer, "gossip unknown channel: %s",
+				  fmt_short_channel_id(tmpctx, scid));
 		return NULL;
 	}
 

lightningd/chaintopology.c

@@ -712,6 +712,14 @@ static struct command_result *json_feerates(struct command *cmd,
 	if (rate)
 		json_add_num(response, "penalty",
 			     feerate_to_style(rate, *style));
+	rate = unilateral_feerate(topo, true);
+	if (rate) {
+		rate += cmd->ld->config.feerate_offset;
+		if (rate > feerate_max(cmd->ld, NULL))
+			rate = feerate_max(cmd->ld, NULL);
+		json_add_num(response, "splice",
+			     feerate_to_style(rate, *style));
+	}
 
 	json_add_u64(response, "min_acceptable",
 		     feerate_to_style(feerate_min(cmd->ld, NULL), *style));