From b8472b65ba2d0f5b0983e8e1ca399b1b95b3c893 Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Fri, 24 Feb 2017 16:22:56 +1030
Subject: [PATCH] lightningd/build_utxos: don't lockin the UTXO reservation
 until confirmed.

Unless the transaction is confirmed, the UTXOs should be released if
something happens to the peer.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---
 lightningd/build_utxos.c | 19 +++++++++++++++----
 lightningd/build_utxos.h |  2 ++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/lightningd/build_utxos.c b/lightningd/build_utxos.c
index 04cb3fec7..4e6780466 100644
--- a/lightningd/build_utxos.c
+++ b/lightningd/build_utxos.c
@@ -188,6 +188,19 @@ static void unreserve_utxo(struct lightningd *ld, const struct utxo *unres)
 	abort();
 }
 
+static void destroy_utxos(struct utxo *utxos, struct lightningd *ld)
+{
+	size_t i;
+
+	for (i = 0; i < tal_count(utxos); i++)
+		unreserve_utxo(ld, &utxos[i]);
+}
+
+void confirm_utxos(struct lightningd *ld, struct utxo *utxos)
+{
+	tal_del_destructor2(utxos, destroy_utxos, ld);
+}
+
 struct utxo *build_utxos(const tal_t *ctx,
 			 struct lightningd *ld, u64 satoshi_out,
 			 u32 feerate_per_kw, u64 dust_limit,
@@ -199,6 +212,8 @@ struct utxo *build_utxos(const tal_t *ctx,
 	/* We assume two outputs for the weight. */
 	u64 satoshi_in = 0, weight = (4 + (8 + 22) * 2 + 4) * 4;
 
+	tal_add_destructor2(utxos, destroy_utxos, ld);
+
 	list_for_each(&ld->utxos, utxo, list) {
 		u64 fee;
 
@@ -230,9 +245,5 @@ struct utxo *build_utxos(const tal_t *ctx,
 		i++;
 	}
 
-	/* Failed, unmark them all. */
-	for (i = 0; i < tal_count(utxos); i++)
-		unreserve_utxo(ld, &utxos[i]);
-
 	return tal_free(utxos);
 }
diff --git a/lightningd/build_utxos.h b/lightningd/build_utxos.h
index 03bb90124..cfa76c1d8 100644
--- a/lightningd/build_utxos.h
+++ b/lightningd/build_utxos.h
@@ -11,4 +11,6 @@ struct utxo *build_utxos(const tal_t *ctx,
 			 u32 feerate_per_kw, u64 dust_limit,
 			 u64 *change_amount, u32 *change_keyindex);
 
+/* Once we've spent them, mark them confirmed. */
+void confirm_utxos(struct lightningd *ld, struct utxo *utxos);
 #endif /* LIGHTNING_LIGHTNINGD_BUILD_UTXOS_H */