lnwallet: add support for taproot chans to createHtlcRetribution

As these are revoked HTLCs, we need to set the taptweak since the
revocation case is just a keyspend.

lnwallet/channel.go

@@ -2583,18 +2583,30 @@ func createHtlcRetribution(chanState *channeldb.OpenChannel,
 		return emptyRetribution, err
 	}
 
-	return HtlcRetribution{
+	signDesc := input.SignDescriptor{
-		SignDesc: input.SignDescriptor{
+		KeyDesc: chanState.LocalChanCfg.
-			KeyDesc: chanState.LocalChanCfg.
+			RevocationBasePoint,
-				RevocationBasePoint,
+		DoubleTweak:   commitmentSecret,
-			DoubleTweak:   commitmentSecret,
+		WitnessScript: scriptInfo.WitnessScript,
-			WitnessScript: scriptInfo.WitnessScript,
+		Output: &wire.TxOut{
-			Output: &wire.TxOut{
+			PkScript: scriptInfo.PkScript,
-				PkScript: scriptInfo.PkScript,
+			Value:    int64(htlc.Amt),
-				Value:    int64(htlc.Amt),
-			},
-			HashType: txscript.SigHashAll,
 		},
+		HashType: txscript.SigHashAll,
+	}
+
+	// For taproot HTLC outputs, we need to set the sign method to key
+	// spend, and also set the tap tweak root needed to derive the proper
+	// private key.
+	if chanState.ChanType.IsTaproot() {
+		signDesc.SignMethod = input.TaprootKeySpendSignMethod
+
+		tapscriptRoot := scriptInfo.ScriptTree.RootNode.TapHash()
+		signDesc.TapTweak = tapscriptRoot[:]
+	}
+
+	return HtlcRetribution{
+		SignDesc: signDesc,
 		OutPoint: wire.OutPoint{
 			Hash:  commitHash,
 			Index: uint32(htlc.OutputIndex),