From 213bdb2e0115798b135689d8956cf59550372a28 Mon Sep 17 00:00:00 2001
From: Slyghtning <hieblmi@protonmail.com>
Date: Wed, 1 Mar 2023 23:38:08 +0100
Subject: [PATCH 1/2] rpcserver: assign peer alias lookup error

---
 rpcserver.go | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/rpcserver.go b/rpcserver.go
index f45368e9f..cc8b95e06 100644
--- a/rpcserver.go
+++ b/rpcserver.go
@@ -4176,8 +4176,8 @@ func createRPCOpenChannel(r *rpcServer, dbChannel *channeldb.OpenChannel,
 	if peerAliasLookup {
 		peerAlias, err := r.server.graphDB.LookupAlias(nodePub)
 		if err != nil {
-			return nil, fmt.Errorf("unable to lookup peer "+
-				"alias: %w", err)
+			peerAlias = fmt.Sprintf("unable to lookup "+
+				"peer alias: %v", err)
 		}
 		channel.PeerAlias = peerAlias
 	}
@@ -7018,16 +7018,15 @@ func (r *rpcServer) ForwardingHistory(ctx context.Context,
 		if req.PeerAliasLookup {
 			aliasIn, err := getRemoteAlias(event.IncomingChanID)
 			if err != nil {
-				return nil, fmt.Errorf("unable to lookup peer "+
+				aliasIn = fmt.Sprintf("unable to lookup peer "+
+					"alias: %v", err)
+			}
+			aliasOut, err := getRemoteAlias(event.OutgoingChanID)
+			if err != nil {
+				aliasOut = fmt.Sprintf("unable to lookup peer"+
 					"alias: %v", err)
 			}
 			resp.ForwardingEvents[i].PeerAliasIn = aliasIn
-
-			aliasOut, err := getRemoteAlias(event.OutgoingChanID)
-			if err != nil {
-				return nil, fmt.Errorf("unable to lookup peer "+
-					"alias: %v", err)
-			}
 			resp.ForwardingEvents[i].PeerAliasOut = aliasOut
 		}
 	}

From 910e3832dc0d8c41c6eee1b1bcafbe82d53df0ff Mon Sep 17 00:00:00 2001
From: Slyghtning <hieblmi@protonmail.com>
Date: Wed, 1 Mar 2023 23:42:46 +0100
Subject: [PATCH 2/2] docs: update release notes

---
 docs/release-notes/release-notes-0.16.0.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/release-notes/release-notes-0.16.0.md b/docs/release-notes/release-notes-0.16.0.md
index e7edc0440..db8107689 100644
--- a/docs/release-notes/release-notes-0.16.0.md
+++ b/docs/release-notes/release-notes-0.16.0.md
@@ -149,6 +149,10 @@ of order is also [fixed](https://github.com/lightningnetwork/lnd/pull/7264).
   parameter is enabled by default but can be disabled with a new flag
   `--skip_peer_alias_lookup`.
 
+* Assign potential peer alias lookup errors in the [`ListChannels` and
+  `ForwardingHistory`rpcs](https://github.com/lightningnetwork/lnd/pull/7471) to
+  the rpc response.
+
 ## Wallet
 
 * [Allows Taproot public keys and tap scripts to be imported as watch-only