tapchannel: update signSweepVpackets to be 2nd level HTLC aware

In this commit, we update `signSweepVpackets` to be 2nd level HTLC
aware. If we have an auxSigDesc, then that means we're spending a 2nd
level HTLC txn. To spend this properly, we'll need to insert the remote
party's signature at the proper location, as it's a 2-of-2 multi-sig.

Author: Roasbeef

tapchannel/aux_sweeper.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"math"
 	"net/url"
+	"slices"
 	"sync"
 	"sync/atomic"
 
@@ -327,12 +328,14 @@ func (a *AuxSweeper) createSweepVpackets(sweepInputs []*cmsg.AssetOutput,
 // signSweepVpackets attempts to sign the vPackets specified using the passed
 // sign desc and script tree.
 func (a *AuxSweeper) signSweepVpackets(vPackets []*tappsbt.VPacket,
-	signDesc input.SignDescriptor, tapscriptDesc tapscriptSweepDesc) error {
+	signDesc input.SignDescriptor, tapTweak, ctrlBlock []byte,
+	auxSigDesc lfn.Option[lnwallet.AuxSigDesc],
+	secondLevelSigIndex lfn.Option[uint32]) error {
 
 	// Before we sign below, we also need to generate the tapscript With
 	// the vPackets prepared, we can now sign the output asset we'll create
 	// at a later step.
-	for _, vPacket := range vPackets {
+	for vPktIndex, vPacket := range vPackets {
 		if len(vPacket.Inputs) != 1 {
 			return fmt.Errorf("expected single input, got %v",
 				len(vPacket.Inputs))
@@ -348,12 +351,12 @@ func (a *AuxSweeper) signSweepVpackets(vPackets []*tappsbt.VPacket,
 		// signature.
 		signingKey, leafToSign := applySignDescToVIn(
 			signDesc, vIn, &a.cfg.ChainParams,
-			tapscriptDesc.scriptTree.TapTweak(),
+			tapTweak,
 		)
 
 		// In this case, the witness isn't special, so we'll set the
 		// control block now for it.
-		ctrlBlock := tapscriptDesc.ctrlBlockBytes
+		ctrlBlock := ctrlBlock
 		vIn.TaprootLeafScript[0].ControlBlock = ctrlBlock
 
 		log.Debugf("signing vPacket for input=%v",
@@ -378,6 +381,50 @@ func (a *AuxSweeper) signSweepVpackets(vPackets []*tappsbt.VPacket,
 			return fmt.Errorf("error signing virtual packet, " +
 				"got no sig")
 		}
+
+		// At this point, the witness looks like: <sig> <witnessScript>
+		// <ctrlBlock>. This is a second level transaction, so we have
+		// another signature that we need to add to the witness this
+		// additional signature for the multi-sig.
+		err = lfn.MapOptionZ(
+			auxSigDesc,
+			func(aux lnwallet.AuxSigDesc) error {
+				assetSigs, err := cmsg.DecodeAssetSigListRecord(
+					aux.AuxSig,
+				)
+				if err != nil {
+					return fmt.Errorf("error "+
+						"decoding asset sig list "+
+						"record: %w", err)
+				}
+				auxSig := assetSigs.Sigs[vPktIndex]
+
+				// With the sig obtained, we'll now insert the
+				// signature at the specified index.
+				sigIndex, err := secondLevelSigIndex.UnwrapOrErr( //nolint:lll
+					fmt.Errorf("no sig index"),
+				)
+				if err != nil {
+					return err
+				}
+
+				auxSigBytes := append(
+					auxSig.Sig.Val.RawBytes(),
+					byte(auxSig.SigHashType.Val),
+				)
+
+				newAsset := vPacket.Outputs[0].Asset
+
+				prevWitness := newAsset.PrevWitnesses[0].TxWitness //nolint:lll
+				prevWitness = slices.Insert(
+					prevWitness, int(sigIndex), auxSigBytes,
+				)
+				return newAsset.UpdateTxWitness(0, prevWitness)
+			},
+		)
+		if err != nil {
+			return err
+		}
 	}
 
 	return nil
@@ -400,7 +447,10 @@ func (a *AuxSweeper) createAndSignSweepVpackets(
 	signPkts := func(vPkts []*tappsbt.VPacket,
 		desc tapscriptSweepDesc) lfn.Result[[]*tappsbt.VPacket] {
 
-		err := a.signSweepVpackets(vPkts, resReq.SignDesc, desc)
+		err := a.signSweepVpackets(
+			vPkts, resReq.SignDesc, nil, nil,
+			lfn.None[lnwallet.AuxSigDesc](), lfn.None[uint32](),
+		)
 		if err != nil {
 			return lfn.Err[returnType](err)
 		}