From 552d1825945386265569bb73afa0a4518c919f43 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Fri, 25 Oct 2024 20:28:17 -0300
Subject: [PATCH] lnwallet: fix closechannel for P2TR external addr

If the delivery address is P2TR, function InternalKeyForAddr checks its
existance in the wallet to return internal key for it in case it is a custom
taproot channel. It used to return the error returned by wallet.AddressInfo.
The error is now ignored if it is ErrAddressNotFound error. This fixes
"lncli closechannel --delivery_addr <external p2tr address" case.
---
 lnwallet/interface.go | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/lnwallet/interface.go b/lnwallet/interface.go
index 23475bcd4..9a8d9fa82 100644
--- a/lnwallet/interface.go
+++ b/lnwallet/interface.go
@@ -632,6 +632,19 @@ func InternalKeyForAddr(wallet WalletController, netParams *chaincfg.Params,
 
 	walletAddr, err := wallet.AddressInfo(addr)
 	if err != nil {
+		// If the error is that the address can't be found, it is not
+		// an error. This happens when any channel which is not a custom
+		// taproot channel is cooperatively closed to an external P2TR
+		// address. In this case there is no internal key associated
+		// with the address. Callers can use the .Option() method to get
+		// an option value.
+		var managerErr waddrmgr.ManagerError
+		if errors.As(err, &managerErr) &&
+			managerErr.ErrorCode == waddrmgr.ErrAddressNotFound {
+
+			return none, nil
+		}
+
 		return none, err
 	}