Dual-funding: handle failures

contrib/pyln-client/pyln/client/lightning.py

@@ -1101,6 +1101,13 @@ def openchannel_bump(self, channel_id, amount, initialpsbt):
         }
         return self.call("openchannel_bump", payload)
 
+    def openchannel_abort(self, channel_id):
+        """ Abort a channel open """
+        payload = {
+            "channel_id": channel_id,
+        }
+        return self.call("openchannel_abort", payload)
+
     def paystatus(self, bolt11=None):
         """Detail status of attempts to pay {bolt11} or any."""
         payload = {

doc/Makefile

@@ -49,6 +49,7 @@ MANPAGES := doc/lightning-cli.1 \
 	doc/lightning-notifications.7 \
 	doc/lightning-offer.7 \
 	doc/lightning-offerout.7 \
+	doc/lightning-openchannel_abort.7 \
 	doc/lightning-openchannel_bump.7 \
 	doc/lightning-openchannel_init.7 \
 	doc/lightning-openchannel_signed.7 \

doc/index.rst

@@ -29,6 +29,9 @@ c-lightning Documentation
    :maxdepth: 1
    :caption: Manpages
 
+<<<<<<< HEAD
+=======
+>>>>>>> df: add openchannel_abort command
    lightning-addgossip <lightning-addgossip.7.md>
    lightning-autocleaninvoice <lightning-autocleaninvoice.7.md>
    lightning-check <lightning-check.7.md>
@@ -78,6 +81,7 @@ c-lightning Documentation
    lightning-notifications <lightning-notifications.7.md>
    lightning-offer <lightning-offer.7.md>
    lightning-offerout <lightning-offerout.7.md>
+   lightning-openchannel_abort <lightning-openchannel_abort.7.md>
    lightning-openchannel_bump <lightning-openchannel_bump.7.md>
    lightning-openchannel_init <lightning-openchannel_init.7.md>
    lightning-openchannel_signed <lightning-openchannel_signed.7.md>

doc/lightning-fundchannel_cancel.7.md

@@ -46,8 +46,10 @@ Lisa Neigut <<[email protected]>> is mainly responsible.
 SEE ALSO
 --------
 
-lightning-connect(7), lightning-fundchannel(7),
+lightning-connect(7), lightning-fundchannel(7), lightning-multifundchannel(7),
 lightning-fundchannel\_start(7), lightning-fundchannel\_complete(7)
+lightning-openchannel\_init(7), lightning-openchannel\_update(7),
+lightning-openchannel\_signed(7), lightning-openchannel\_abort(7)
 
 RESOURCES
 ---------

doc/lightning-fundchannel_complete.7.md

@@ -49,7 +49,8 @@ SEE ALSO
 lightning-connect(7), lightning-fundchannel(7), lightning-multifundchannel(7),
 lightning-fundchannel\_start(7), lightning-fundchannel\_cancel(7),
 lightning-openchannel\_init(7), lightning-openchannel\_update(7),
-lightning-openchannel\_signed(7), lightning-openchannel\_bump(7)
+lightning-openchannel\_signed(7), lightning-openchannel\_bump(7),
+lightning-openchannel\_abort(7)
 
 RESOURCES
 ---------

doc/lightning-fundchannel_start.7.md

@@ -64,10 +64,11 @@ Lisa Neigut <<[email protected]>> is mainly responsible.
 SEE ALSO
 --------
 
-lightning-connect(7), lightning-fundchannel(7),
+lightning-connect(7), lightning-fundchannel(7), lightning-multifundchannel(7),
 lightning-fundchannel\_complete(7), lightning-fundchannel\_cancel(7)
 lightning-openchannel\_init(7), lightning-openchannel\_update(7),
-lightning-openchannel\_signed(7), lightning-openchannel\_bump(7)
+lightning-openchannel\_signed(7), lightning-openchannel\_bump(7),
+lightning-openchannel\_abort(7)
 
 RESOURCES
 ---------

doc/lightning-openchannel_abort.7.md

@@ -0,0 +1,52 @@
+lightning-openchannel\_abort -- Command to abort a channel to a peer
+=====================================================================
+
+SYNOPSIS
+--------
+
+**openchannel_abort** *channel_id*
+
+DESCRIPTION
+-----------
+
+`openchannel_init` is a low level RPC command which initiates a channel
+open with a specified peer. It uses the openchannel protocol
+which allows for interactive transaction construction.
+
+*channel_id* is id of this channel.
+
+
+RETURN VALUE
+------------
+
+On success, returns the *channel_id* for this channel; an boolean indicating
+if the channel has been successfully canceled, *channel_canceled*;
+a reason for the cancellation, *reason*.
+
+On error the returned object will contain `code` and `message` properties,
+with `code` being one of the following:
+
+- -32602: If the given parameters are wrong.
+- -1: Catchall nonspecific error.
+- 305: Peer is not connected.
+- 311: Unknown channel id.
+- 312: Channel in an invalid state
+
+SEE ALSO
+--------
+
+lightning-openchannel\_init(7), lightning-openchannel\_update(7),
+lightning-openchannel\_signed(7), lightning-openchannel\_bump(7),
+lightning-fundchannel\_start(7), lightning-fundchannel\_complete(7),
+lightning-fundchannel(7), lightning-fundpsbt(7), lightning-utxopsbt(7),
+lightning-multifundchannel(7)
+
+AUTHOR
+------
+
+@niftynei <<[email protected]>> is mainly responsible.
+
+RESOURCES
+---------
+
+Main web site: <https://github.com/ElementsProject/lightning>

doc/lightning-openchannel_init.7.md

@@ -70,7 +70,8 @@ SEE ALSO
 --------
 
 lightning-openchannel\_update(7), lightning-openchannel\_signed(7),
-lightning-openchannel\_bump(7) lightning-fundchannel\_start(7),
+lightning-openchannel\_abort(7), lightning-openchannel\_bump(7),
+lightning-fundchannel\_start(7),
 lightning-fundchannel\_complete(7), lightning-fundchannel(7),
 lightning-fundpsbt(7), lightning-utxopsbt(7), lightning-multifundchannel(7)
 

doc/lightning-openchannel_signed.7.md

@@ -46,11 +46,11 @@ with `code` being one of the following:
 SEE ALSO
 --------
 
-=======
 lightning-openchannel\_init(7), lightning-openchannel\_update(7),
-lightning-openchannel\_bump(7), lightning-fundchannel\_start(7),
-lightning-fundchannel\_complete(7), lightning-fundchannel(7),
-lightning-fundpsbt(7), lightning-utxopsbt(7), lightning-multifundchannel(7)
+lightning-openchannel\_abort(7), lightning-openchannel\_bump(7),
+lightning-fundchannel\_start(7), lightning-fundchannel\_complete(7),
+lightning-fundchannel(7), lightning-fundpsbt(7),
+lightning-utxopsbt(7), lightning-multifundchannel(7)
 
 AUTHOR
 ------

doc/lightning-openchannel_update.7.md

@@ -53,9 +53,10 @@ SEE ALSO
 --------
 
 lightning-openchannel\_init(7), lightning-openchannel\_signed(7),
-lightning-openchannel\_bump(7), lightning-fundchannel\_start(7),
-lightning-fundchannel\_complete(7), lightning-fundchannel(7),
-lightning-fundpsbt(7), lightning-utxopsbt(7), lightning-multifundchannel(7)
+lightning-openchannel\_bump(7), lightning-openchannel\_abort(7), 
+lightning-fundchannel\_start(7), lightning-fundchannel\_complete(7),
+lightning-fundchannel(7), lightning-fundpsbt(7), lightning-utxopsbt(7),
+lightning-multifundchannel(7)
 
 AUTHOR
 ------

lightningd/channel.c

@@ -5,6 +5,7 @@
 #include <common/closing_fee.h>
 #include <common/fee_states.h>
 #include <common/json_command.h>
+#include <common/json_helpers.h>
 #include <common/jsonrpc_errors.h>
 #include <common/utils.h>
 #include <common/wire_error.h>
@@ -194,6 +195,7 @@ struct open_attempt *new_channel_open_attempt(struct channel *channel)
 	oa->role = channel->opener == LOCAL ? TX_INITIATOR : TX_ACCEPTER;
 	oa->our_upfront_shutdown_script = NULL;
 	oa->cmd = NULL;
+	oa->aborted = false;
 
 	return oa;
 }
@@ -742,9 +744,22 @@ 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));
+		if (oa->cmd) {
+			/* If we requested this be aborted, it's a success */
+			if (oa->aborted) {
+				struct json_stream *response;
+				response = json_stream_success(oa->cmd);
+				json_add_channel_id(response,
+						    "channel_id",
+						    &channel->cid);
+				json_add_bool(response, "channel_canceled",
+					      list_empty(&channel->inflights));
+				json_add_string(response, "reason", why);
+				was_pending(command_success(oa->cmd, response));
+			} else
+				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);
 	}

lightningd/channel.h

@@ -51,6 +51,7 @@ struct open_attempt {
 	struct channel *channel;
 	struct channel_config our_config;
 	enum tx_role role;
+	bool aborted;
 
 	/* On funding_channel struct */
 	struct command *cmd;