@@ -1585,6 +1585,8 @@ func (a *AuxSweeper) importCommitTx(req lnwallet.ResolutionReq,
15851585 }
15861586 }
15871587
1588+ supportSTXO := commitState .STXO .Val
1589+
15881590 // We can now add the witness for the OP_TRUE spend of the commitment
15891591 // output to the vPackets.
15901592 vPackets := maps .Values (vPktsByAssetID )
@@ -1593,8 +1595,18 @@ func (a *AuxSweeper) importCommitTx(req lnwallet.ResolutionReq,
15931595 "packets: %w" , err )
15941596 }
15951597
1598+ var (
1599+ opts []tapsend.OutputCommitmentOption
1600+ proofOpts []proof.GenOption
1601+ )
1602+
1603+ if ! supportSTXO {
1604+ opts = append (opts , tapsend .WithNoSTXOProofs ())
1605+ proofOpts = append (proofOpts , proof .WithNoSTXOProofs ())
1606+ }
1607+
15961608 outCommitments , err := tapsend .CreateOutputCommitments (
1597- vPackets , tapsend . WithNoSTXOProofs () ,
1609+ vPackets , opts ... ,
15981610 )
15991611 if err != nil {
16001612 return fmt .Errorf ("unable to create output " +
@@ -1614,8 +1626,7 @@ func (a *AuxSweeper) importCommitTx(req lnwallet.ResolutionReq,
16141626 for outIdx := range vPkt .Outputs {
16151627 proofSuffix , err := tapsend .CreateProofSuffixCustom (
16161628 req .CommitTx , vPkt , outCommitments , outIdx ,
1617- vPackets , exclusionCreator ,
1618- proof .WithNoSTXOProofs (),
1629+ vPackets , exclusionCreator , proofOpts ... ,
16191630 )
16201631 if err != nil {
16211632 return fmt .Errorf ("unable to create " +
@@ -2225,9 +2236,7 @@ func (a *AuxSweeper) sweepContracts(inputs []input.Input,
22252236
22262237 // Now that we have our set of resolutions, we'll make a new commitment
22272238 // out of all the vPackets contained.
2228- outCommitments , err := tapsend .CreateOutputCommitments (
2229- directPkts , tapsend .WithNoSTXOProofs (),
2230- )
2239+ outCommitments , err := tapsend .CreateOutputCommitments (directPkts )
22312240 if err != nil {
22322241 return lfn .Errf [returnType ]("unable to create " +
22332242 "output commitments: %w" , err )
@@ -2408,9 +2417,7 @@ func (a *AuxSweeper) registerAndBroadcastSweep(req *sweep.BumpRequest,
24082417 }
24092418
24102419 // Now that we have our vPkts, we'll re-create the output commitments.
2411- outCommitments , err := tapsend .CreateOutputCommitments (
2412- vPkts .allPkts (), tapsend .WithNoSTXOProofs (),
2413- )
2420+ outCommitments , err := tapsend .CreateOutputCommitments (vPkts .allPkts ())
24142421 if err != nil {
24152422 return fmt .Errorf ("unable to create output " +
24162423 "commitments: %w" , err )
@@ -2454,7 +2461,7 @@ func (a *AuxSweeper) registerAndBroadcastSweep(req *sweep.BumpRequest,
24542461
24552462 proofSuffix , err := tapsend .CreateProofSuffixCustom (
24562463 sweepTx , vPkt , outCommitments , outIdx , allVpkts ,
2457- exclusionCreator , proof . WithNoSTXOProofs (),
2464+ exclusionCreator ,
24582465 )
24592466 if err != nil {
24602467 return fmt .Errorf ("unable to create proof " +
0 commit comments