RBF: Final part

channeld/channeld.c

@@ -1875,7 +1875,6 @@ static void peer_in(struct peer *peer, const u8 *msg)
 		return;
 	case WIRE_INIT_RBF:
 	case WIRE_ACK_RBF:
-	case WIRE_FAIL_RBF:
 	case WIRE_BLACKLIST_PODLE:
 #endif
 		break;

gossipd/gossipd.c

@@ -768,7 +768,6 @@ static struct io_plan *peer_msg_in(struct io_conn *conn,
 	case WIRE_ACCEPT_CHANNEL2:
 	case WIRE_INIT_RBF:
 	case WIRE_ACK_RBF:
-	case WIRE_FAIL_RBF:
 	case WIRE_BLACKLIST_PODLE:
 #endif
 		status_broken("peer %s: relayed unexpected msg of type %s",

lightningd/channel.c

@@ -715,6 +715,47 @@ void channel_fail_forget(struct channel *channel, const char *fmt, ...)
 	tal_free(why);
 }
 
+struct channel_inflight *
+channel_current_inflight(const struct channel *channel)
+{
+	struct channel_inflight *inflight;
+	/* The last inflight should always be the one in progress */
+	inflight = list_tail(&channel->inflights,
+			     struct channel_inflight,
+			     list);
+	if (inflight)
+		assert(bitcoin_txid_eq(&channel->funding_txid,
+				       &inflight->funding->txid));
+	return inflight;
+}
+
+u32 channel_last_funding_feerate(const struct channel *channel)
+{
+	struct channel_inflight *inflight;
+	inflight = channel_current_inflight(channel);
+	if (!inflight)
+		return 0;
+	return inflight->funding->feerate;
+}
+
+void channel_cleanup_commands(struct channel *channel, const char *why)
+{
+	if (channel->open_attempt) {
+		struct open_attempt *oa = channel->open_attempt;
+		if (oa->cmd)
+			was_pending(command_fail(oa->cmd, LIGHTNINGD,
+						 "%s", why));
+		notify_channel_open_failed(channel->peer->ld, &channel->cid);
+		channel->open_attempt = tal_free(channel->open_attempt);
+	}
+
+	if (channel->openchannel_signed_cmd) {
+		was_pending(command_fail(channel->openchannel_signed_cmd,
+					 LIGHTNINGD, "%s", why));
+		channel->openchannel_signed_cmd = NULL;
+	}
+}
+
 void channel_internal_error(struct channel *channel, const char *fmt, ...)
 {
 	va_list ap;
@@ -724,9 +765,18 @@ void channel_internal_error(struct channel *channel, const char *fmt, ...)
 	why = tal_vfmt(channel, fmt, ap);
 	va_end(ap);
 
-	log_broken(channel->log, "Peer internal error %s: %s",
+	log_broken(channel->log, "Internal error %s: %s",
 		   channel_state_name(channel), why);
 
+	channel_cleanup_commands(channel, why);
+
+	if (channel_unsaved(channel)) {
+		subd_release_channel(channel->owner, channel);
+		delete_channel(channel);
+		tal_free(why);
+		return;
+	}
+
 	/* Don't expose internal error causes to remove unless doing dev */
 #if DEVELOPER
 	channel_fail_permanent(channel, REASON_LOCAL, "Internal error: %s", why);

lightningd/channel.h

@@ -286,6 +286,13 @@ new_inflight(struct channel *channel,
 struct channel_inflight *channel_inflight_find(struct channel *channel,
 					       const struct bitcoin_txid *txid);
 
+/* What's the most recent inflight for this channel? */
+struct channel_inflight *
+channel_current_inflight(const struct channel *channel);
+
+/* What's the last feerate used for a funding tx on this channel? */
+u32 channel_last_funding_feerate(const struct channel *channel);
+
 void delete_channel(struct channel *channel STEALS);
 
 const char *channel_state_name(const struct channel *channel);
@@ -311,6 +318,9 @@ void channel_fail_forget(struct channel *channel, const char *fmt, ...);
 /* Permanent error, but due to internal problems, not peer. */
 void channel_internal_error(struct channel *channel, const char *fmt, ...);
 
+/* Clean up any in-progress commands for a channel */
+void channel_cleanup_commands(struct channel *channel, const char *why);
+
 void channel_set_state(struct channel *channel,
 		       enum channel_state old_state,
 		       enum channel_state state,

lightningd/connect_control.c

@@ -283,14 +283,16 @@ static void peer_please_disconnect(struct lightningd *ld, const u8 *msg)
 	c = active_channel_by_id(ld, &id, &uc);
 	if (uc)
 		kill_uncommitted_channel(uc, "Reconnected");
-	else if (c)
+	else if (c) {
+		channel_cleanup_commands(c, "Reconnected");
 		channel_fail_reconnect(c, "Reconnected");
+	}
 #if EXPERIMENTAL_FEATURES
 	else {
 		/* v2 has unsaved channels, not uncommitted_chans */
 		c = unsaved_channel_by_id(ld, &id);
 		if (c)
-			kill_unsaved_channel(c, "Reconnected");
+			channel_close_conn(c, "Reconnected");
 	}
 #endif /* EXPERIMENTAL_FEATURES */
 }