tapchannel: support stxo on aux sweeper

Author: GeorgeTsagk

tapchannel/aux_sweeper.go

@@ -1582,6 +1582,8 @@ func (a *AuxSweeper) importCommitTx(req lnwallet.ResolutionReq,
 		}
 	}
 
+	supportSTXO := commitState.STXO.Val
+
 	// We can now add the witness for the OP_TRUE spend of the commitment
 	// output to the vPackets.
 	vPackets := maps.Values(vPktsByAssetID)
@@ -1590,8 +1592,13 @@ func (a *AuxSweeper) importCommitTx(req lnwallet.ResolutionReq,
 			"packets: %w", err)
 	}
 
+	var opts []tapsend.OutputCommitmentOption
+	if !supportSTXO {
+		opts = append(opts, tapsend.WithNoSTXOProofs())
+	}
+
 	outCommitments, err := tapsend.CreateOutputCommitments(
-		vPackets, tapsend.WithNoSTXOProofs(),
+		vPackets, opts...,
 	)
 	if err != nil {
 		return fmt.Errorf("unable to create output "+
@@ -1609,10 +1616,14 @@ func (a *AuxSweeper) importCommitTx(req lnwallet.ResolutionReq,
 	for idx := range vPackets {
 		vPkt := vPackets[idx]
 		for outIdx := range vPkt.Outputs {
+			var opts []proof.GenOption
+			if !supportSTXO {
+				opts = append(opts, proof.WithNoSTXOProofs())
+			}
+
 			proofSuffix, err := tapsend.CreateProofSuffixCustom(
 				req.CommitTx, vPkt, outCommitments, outIdx,
-				vPackets, exclusionCreator,
-				proof.WithNoSTXOProofs(),
+				vPackets, exclusionCreator, opts...,
 			)
 			if err != nil {
 				return fmt.Errorf("unable to create "+
@@ -2222,9 +2233,7 @@ func (a *AuxSweeper) sweepContracts(inputs []input.Input,
 
 	// Now that we have our set of resolutions, we'll make a new commitment
 	// out of all the vPackets contained.
-	outCommitments, err := tapsend.CreateOutputCommitments(
-		directPkts, tapsend.WithNoSTXOProofs(),
-	)
+	outCommitments, err := tapsend.CreateOutputCommitments(directPkts)
 	if err != nil {
 		return lfn.Errf[returnType]("unable to create "+
 			"output commitments: %w", err)
@@ -2405,9 +2414,7 @@ func (a *AuxSweeper) registerAndBroadcastSweep(req *sweep.BumpRequest,
 	}
 
 	// Now that we have our vPkts, we'll re-create the output commitments.
-	outCommitments, err := tapsend.CreateOutputCommitments(
-		vPkts.allPkts(), tapsend.WithNoSTXOProofs(),
-	)
+	outCommitments, err := tapsend.CreateOutputCommitments(vPkts.allPkts())
 	if err != nil {
 		return fmt.Errorf("unable to create output "+
 			"commitments: %w", err)
@@ -2451,7 +2458,7 @@ func (a *AuxSweeper) registerAndBroadcastSweep(req *sweep.BumpRequest,
 
 			proofSuffix, err := tapsend.CreateProofSuffixCustom(
 				sweepTx, vPkt, outCommitments, outIdx, allVpkts,
-				exclusionCreator, proof.WithNoSTXOProofs(),
+				exclusionCreator,
 			)
 			if err != nil {
 				return fmt.Errorf("unable to create proof "+

tapchannel/commitment.go

@@ -651,7 +651,7 @@ func GenerateCommitmentAllocations(prevState *cmsg.Commitment,
 	// Next, we can convert the allocations to auxiliary leaves and from
 	// those construct our Commitment struct that will in the end also hold
 	// our proof suffixes.
-	newCommitment, err := ToCommitment(allocations, vPackets)
+	newCommitment, err := ToCommitment(allocations, vPackets, stxo)
 	if err != nil {
 		return nil, nil, fmt.Errorf("unable to convert to commitment: "+
 			"%w", err)
@@ -1155,7 +1155,7 @@ func LeavesFromTapscriptScriptTree(
 
 // ToCommitment converts the allocations to a Commitment struct.
 func ToCommitment(allocations []*tapsend.Allocation,
-	vPackets []*tappsbt.VPacket) (*cmsg.Commitment, error) {
+	vPackets []*tappsbt.VPacket, stxo bool) (*cmsg.Commitment, error) {
 
 	var (
 		localAssets   []*cmsg.AssetOutput
@@ -1278,7 +1278,7 @@ func ToCommitment(allocations []*tapsend.Allocation,
 
 	return cmsg.NewCommitment(
 		localAssets, remoteAssets, outgoingHtlcs, incomingHtlcs,
-		auxLeaves, false,
+		auxLeaves, stxo,
 	), nil
 }