tapchannel: parameterize stxo for commitments

We change the commitment related generations to now include stxo proofs
if the setting allows so. Previously we would always exclude stxo
proofs, but now we add them if both parties understand & expect them.

Author: GeorgeTsagk

tapchannel/aux_funding_controller.go

@@ -571,6 +571,7 @@ func newCommitBlobAndLeaves(pendingFunding *pendingAssetFunding,
 		fakePrevState, lndOpenChan, assetOpenChan, whoseCommit,
 		localSatBalance, remoteSatBalance, fakeView,
 		pendingFunding.chainParams, keyRing.GetForParty(whoseCommit),
+		false,
 	)
 	if err != nil {
 		return nil, lnwallet.CommitAuxLeaves{}, err

tapchannel/aux_leaf_creator.go

@@ -53,7 +53,7 @@ func FetchLeavesFromView(chainParams *address.ChainParams,
 	allocations, newCommitment, err := GenerateCommitmentAllocations(
 		prevState, in.ChannelState, chanAssetState, in.WhoseCommit,
 		in.OurBalance, in.TheirBalance, in.UnfilteredView, chainParams,
-		in.KeyRing,
+		in.KeyRing, false,
 	)
 	if err != nil {
 		return lfn.Err[returnType](fmt.Errorf("unable to generate "+
@@ -129,7 +129,7 @@ func FetchLeavesFromCommit(chainParams *address.ChainParams,
 			leaf, err := CreateSecondLevelHtlcTx(
 				chanState, com.CommitTx, htlc.Amt.ToSatoshis(),
 				keys, chainParams, htlcOutputs, cltvTimeout,
-				htlc.HtlcIndex,
+				htlc.HtlcIndex, false,
 			)
 			if err != nil {
 				return lfn.Err[returnType](fmt.Errorf("unable "+
@@ -170,7 +170,7 @@ func FetchLeavesFromCommit(chainParams *address.ChainParams,
 			leaf, err := CreateSecondLevelHtlcTx(
 				chanState, com.CommitTx, htlc.Amt.ToSatoshis(),
 				keys, chainParams, htlcOutputs, cltvTimeout,
-				htlc.HtlcIndex,
+				htlc.HtlcIndex, false,
 			)
 			if err != nil {
 				return lfn.Err[returnType](fmt.Errorf("unable "+
@@ -251,7 +251,7 @@ func ApplyHtlcView(chainParams *address.ChainParams,
 	_, newCommitment, err := GenerateCommitmentAllocations(
 		prevState, in.ChannelState, chanAssetState, in.WhoseCommit,
 		in.OurBalance, in.TheirBalance, in.UnfilteredView, chainParams,
-		in.KeyRing,
+		in.KeyRing, false,
 	)
 	if err != nil {
 		return lfn.Err[returnType](fmt.Errorf("unable to generate "+

tapchannel/commitment.go

@@ -497,7 +497,7 @@ func GenerateCommitmentAllocations(prevState *cmsg.Commitment,
 	whoseCommit lntypes.ChannelParty, ourBalance,
 	theirBalance lnwire.MilliSatoshi, originalView lnwallet.AuxHtlcView,
 	chainParams *address.ChainParams,
-	keys lnwallet.CommitmentKeyRing) ([]*tapsend.Allocation,
+	keys lnwallet.CommitmentKeyRing, stxo bool) ([]*tapsend.Allocation,
 	*cmsg.Commitment, error) {
 
 	log.Tracef("Generating allocations, whoseCommit=%v, ourBalance=%d, "+
@@ -589,8 +589,18 @@ func GenerateCommitmentAllocations(prevState *cmsg.Commitment,
 			"packets: %w", err)
 	}
 
+	var (
+		opts      []tapsend.OutputCommitmentOption
+		proofOpts []proof.GenOption
+	)
+
+	if !stxo {
+		opts = append(opts, tapsend.WithNoSTXOProofs())
+		proofOpts = append(proofOpts, proof.WithNoSTXOProofs())
+	}
+
 	outCommitments, err := tapsend.CreateOutputCommitments(
-		vPackets, tapsend.WithNoSTXOProofs(),
+		vPackets, opts...,
 	)
 	if err != nil {
 		return nil, nil, fmt.Errorf("unable to create output "+
@@ -626,7 +636,7 @@ func GenerateCommitmentAllocations(prevState *cmsg.Commitment,
 				fakeCommitTx, vPkt, outCommitments, outIdx,
 				vPackets, tapsend.NonAssetExclusionProofs(
 					allocations,
-				), proof.WithNoSTXOProofs(),
+				), proofOpts...,
 			)
 			if err != nil {
 				return nil, nil, fmt.Errorf("unable to create "+
@@ -1432,7 +1442,7 @@ func CreateSecondLevelHtlcTx(chanState lnwallet.AuxChanState,
 	commitTx *wire.MsgTx, htlcAmt btcutil.Amount,
 	keys lnwallet.CommitmentKeyRing, chainParams *address.ChainParams,
 	htlcOutputs []*cmsg.AssetOutput, htlcTimeout fn.Option[uint32],
-	htlcIndex uint64) (input.AuxTapLeaf, error) {
+	htlcIndex uint64, stxo bool) (input.AuxTapLeaf, error) {
 
 	none := input.NoneTapLeaf()
 
@@ -1445,8 +1455,13 @@ func CreateSecondLevelHtlcTx(chanState lnwallet.AuxChanState,
 			"packets: %w", err)
 	}
 
+	var opts []tapsend.OutputCommitmentOption
+	if !stxo {
+		opts = append(opts, tapsend.WithNoSTXOProofs())
+	}
+
 	outCommitments, err := tapsend.CreateOutputCommitments(
-		vPackets, tapsend.WithNoSTXOProofs(),
+		vPackets, opts...,
 	)
 	if err != nil {
 		return none, fmt.Errorf("unable to create output commitments: "+