From 3c651f19a8a3f4bd6dce1d61ae1c48b84d82131e Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Fri, 27 Jul 2018 06:54:37 +0930
Subject: [PATCH] channeld: send correct channel_update when reporting failure.

The master tells us the short_channel_id of the outgoing channel, and
channeld is supposed to get the corresponding channel_update from gossipd.
Instead, it got the channel_update for the *local* channel and ignored
that one.
---
 channeld/channel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/channeld/channel.c b/channeld/channel.c
index 924754835..b976e1609 100644
--- a/channeld/channel.c
+++ b/channeld/channel.c
@@ -1745,7 +1745,7 @@ static void send_fail_or_fulfill(struct peer *peer, const struct htlc *h)
 		if (h->failcode) {
 			/* Local failure, make a message. */
 			u8 *failmsg = make_failmsg(tmpctx, peer, h, h->failcode,
-						   &peer->short_channel_ids[LOCAL]);
+						   h->failed_scid);
 			onion = create_onionreply(tmpctx, h->shared_secret,
 						  failmsg);
 		} else /* Remote failure, just forward. */