Prepare tap channels for v1 proofs

rfq/manager_test.go

@@ -111,6 +111,7 @@ func createChannelWithCustomData(t *testing.T, id asset.ID, localBalance,
 				),
 			},
 			nil, nil, lnwallet.CommitAuxLeaves{},
+			false,
 		),
 		OpenChan: *tpchmsg.NewOpenChannel(
 			[]*tpchmsg.AssetOutput{

server.go

@@ -833,7 +833,9 @@ func (s *Server) FetchLeavesFromView(
 
 	// The aux leaf creator is fully stateless, and we don't need to wait
 	// for the server to be started before being able to use it.
-	return tapchannel.FetchLeavesFromView(s.chainParams, in)
+	return tapchannel.FetchLeavesFromView(
+		s.chainParams, in, s.cfg.AuxChanNegotiator,
+	)
 }
 
 // FetchLeavesFromCommit attempts to fetch the auxiliary leaves that
@@ -889,7 +891,9 @@ func (s *Server) ApplyHtlcView(
 
 	// The aux leaf creator is fully stateless, and we don't need to wait
 	// for the server to be started before being able to use it.
-	return tapchannel.ApplyHtlcView(s.chainParams, in)
+	return tapchannel.ApplyHtlcView(
+		s.chainParams, in, s.cfg.AuxChanNegotiator,
+	)
 }
 
 // InlineParseCustomData replaces any custom data binary blob in the given RPC

tapcfg/server.go

@@ -588,6 +588,7 @@ func genServerConfig(cfg *Config, cfgLogger btclog.Logger,
 			AssetSyncer:        addrBook,
 			FeatureBits:        lndFeatureBitsVerifier,
 			IgnoreChecker:      ignoreCheckerOpt,
+			AuxChanNegotiator:  auxChanNegotiator,
 			ErrChan:            mainErrChan,
 		},
 	)
@@ -619,6 +620,7 @@ func genServerConfig(cfg *Config, cfgLogger btclog.Logger,
 			GroupVerifier:      groupVerifier,
 			ChainBridge:        chainBridge,
 			IgnoreChecker:      ignoreCheckerOpt,
+			AuxChanNegotiator:  auxChanNegotiator,
 		},
 	)
 	auxSweeper := tapchannel.NewAuxSweeper(

tapchannel/auf_leaf_signer_test.go

@@ -111,7 +111,7 @@ func setupAuxLeafSigner(t *testing.T, numJobs int32) (*AuxLeafSigner,
 	}
 
 	com := cmsg.NewCommitment(
-		nil, nil, outgoingHtlcs, nil, lnwallet.CommitAuxLeaves{},
+		nil, nil, outgoingHtlcs, nil, lnwallet.CommitAuxLeaves{}, false,
 	)
 	cancelChan := make(chan struct{})
 

tapchannel/aux_closer.go

@@ -15,6 +15,7 @@ import (
 	"github.com/lightninglabs/taproot-assets/fn"
 	"github.com/lightninglabs/taproot-assets/proof"
 	"github.com/lightninglabs/taproot-assets/tapchannelmsg"
+	"github.com/lightninglabs/taproot-assets/tapfeatures"
 	"github.com/lightninglabs/taproot-assets/tapfreighter"
 	"github.com/lightninglabs/taproot-assets/tapgarden"
 	"github.com/lightninglabs/taproot-assets/tappsbt"
@@ -66,6 +67,11 @@ type AuxChanCloserCfg struct {
 	// IgnoreChecker is an optional function that can be used to check if
 	// a proof should be ignored.
 	IgnoreChecker lfn.Option[proof.IgnoreChecker]
+
+	// AuxChanNegotiator is responsible for producing the extra tlv blob
+	// that is encapsulated in the init and reestablish peer messages. This
+	// helps us communicate custom feature bits with our peer.
+	AuxChanNegotiator *tapfeatures.AuxChannelNegotiator
 }
 
 // assetCloseInfo houses the information we need to finalize the close of an
@@ -454,11 +460,21 @@ func (a *AuxChanCloser) AuxCloseOutputs(
 			"packets: %w", err)
 	}
 
+	features := a.cfg.AuxChanNegotiator.GetChannelFeatures(
+		lnwire.NewChanIDFromOutPoint(desc.ChanPoint),
+	)
+	supportSTXO := features.HasFeature(tapfeatures.STXOOptional)
+
+	var opts []tapsend.OutputCommitmentOption
+	if !supportSTXO {
+		opts = append(opts, tapsend.WithNoSTXOProofs())
+	}
+
 	// With the outputs prepared, we can now create the set of output
 	// commitments, then with the output index locations known, we can set
 	// the output indexes in the allocations.
 	outCommitments, err := tapsend.CreateOutputCommitments(
-		vPackets, tapsend.WithNoSTXOProofs(),
+		vPackets, opts...,
 	)
 	if err != nil {
 		return none, fmt.Errorf("unable to create output "+
@@ -733,10 +749,22 @@ func (a *AuxChanCloser) FinalizeClose(desc chancloser.AuxCloseDesc,
 				closeInfo.allocations,
 			)
 
+			features := a.cfg.AuxChanNegotiator.GetChannelFeatures(
+				lnwire.NewChanIDFromOutPoint(desc.ChanPoint),
+			)
+			supportSTXO := features.HasFeature(
+				tapfeatures.STXOOptional,
+			)
+
+			var opts []proof.GenOption
+			if !supportSTXO {
+				opts = append(opts, proof.WithNoSTXOProofs())
+			}
+
 			proofSuffix, err := tapsend.CreateProofSuffixCustom(
 				closeTx, vPkt, closeInfo.outputCommitments,
 				outIdx, closeInfo.vPackets, exclusionCreator,
-				proof.WithNoSTXOProofs(),
+				opts...,
 			)
 			if err != nil {
 				return fmt.Errorf("unable to create proof "+

tapchannel/aux_funding_controller.go

@@ -28,6 +28,7 @@ import (
 	"github.com/lightninglabs/taproot-assets/rfq"
 	cmsg "github.com/lightninglabs/taproot-assets/tapchannelmsg"
 	"github.com/lightninglabs/taproot-assets/tapdb"
+	"github.com/lightninglabs/taproot-assets/tapfeatures"
 	"github.com/lightninglabs/taproot-assets/tapfreighter"
 	"github.com/lightninglabs/taproot-assets/tapgarden"
 	"github.com/lightninglabs/taproot-assets/tappsbt"
@@ -41,6 +42,7 @@ import (
 	"github.com/lightningnetwork/lnd/lnwallet/chainfee"
 	"github.com/lightningnetwork/lnd/lnwire"
 	"github.com/lightningnetwork/lnd/msgmux"
+	"github.com/lightningnetwork/lnd/routing/route"
 )
 
 const (
@@ -269,6 +271,11 @@ type FundingControllerCfg struct {
 	// a proof should be ignored.
 	IgnoreChecker lfn.Option[proof.IgnoreChecker]
 
+	// AuxChanNegotiator is responsible for producing the extra tlv blob
+	// that is encapsulated in the init and reestablish peer messages. This
+	// helps us communicate custom feature bits with our peer.
+	AuxChanNegotiator *tapfeatures.AuxChannelNegotiator
+
 	// ErrChan is used to report errors back to the main server.
 	ErrChan chan<- error
 }
@@ -419,6 +426,8 @@ type pendingAssetFunding struct {
 
 	initiator bool
 
+	stxo bool
+
 	amt uint64
 
 	pushAmt btcutil.Amount
@@ -462,14 +471,32 @@ func (p *pendingAssetFunding) assetOutputs() []*cmsg.AssetOutput {
 }
 
 // addToFundingCommitment adds a new asset to the funding commitment.
-func (p *pendingAssetFunding) addToFundingCommitment(a *asset.Asset) error {
+func (p *pendingAssetFunding) addToFundingCommitment(a *asset.Asset,
+	stxo bool) error {
+
 	newCommitment, err := commitment.FromAssets(
 		fn.Ptr(commitment.TapCommitmentV2), a,
 	)
 	if err != nil {
 		return fmt.Errorf("unable to create commitment: %w", err)
 	}
 
+	// If our peer supports STXO we go ahead and append the
+	// appropriate alt leaves to the VOutput.
+	if stxo {
+		altLeaves, err := asset.CollectSTXO(a)
+		if err != nil {
+			return err
+		}
+
+		err = newCommitment.MergeAltLeaves(altLeaves)
+		if err != nil {
+			return err
+		}
+
+		p.stxo = stxo
+	}
+
 	newCommitment, err = commitment.TrimSplitWitnesses(
 		&newCommitment.Version, newCommitment,
 	)
@@ -524,7 +551,8 @@ func (p *pendingAssetFunding) addInputProofChunk(
 func newCommitBlobAndLeaves(pendingFunding *pendingAssetFunding,
 	lndOpenChan lnwallet.AuxChanState, assetOpenChan *cmsg.OpenChannel,
 	keyRing lntypes.Dual[lnwallet.CommitmentKeyRing],
-	whoseCommit lntypes.ChannelParty) ([]byte, lnwallet.CommitAuxLeaves,
+	whoseCommit lntypes.ChannelParty,
+	stxo bool) ([]byte, lnwallet.CommitAuxLeaves,
 	error) {
 
 	chanAssets := assetOpenChan.FundedAssets.Val.Outputs
@@ -559,6 +587,7 @@ func newCommitBlobAndLeaves(pendingFunding *pendingAssetFunding,
 	// needs the sum of the remote+local assets, so we'll populate that.
 	fakePrevState := cmsg.NewCommitment(
 		localAssets, remoteAssets, nil, nil, lnwallet.CommitAuxLeaves{},
+		stxo,
 	)
 
 	// Just like above, we don't have a real HTLC view here, so we'll pass
@@ -571,6 +600,7 @@ func newCommitBlobAndLeaves(pendingFunding *pendingAssetFunding,
 		fakePrevState, lndOpenChan, assetOpenChan, whoseCommit,
 		localSatBalance, remoteSatBalance, fakeView,
 		pendingFunding.chainParams, keyRing.GetForParty(whoseCommit),
+		stxo,
 	)
 	if err != nil {
 		return nil, lnwallet.CommitAuxLeaves{}, err
@@ -613,12 +643,14 @@ func (p *pendingAssetFunding) toAuxFundingDesc(req *bindFundingReq,
 	// This will be the information for the very first state (state 0).
 	localCommitBlob, localAuxLeaves, err := newCommitBlobAndLeaves(
 		p, req.openChan, openChanDesc, req.keyRing, lntypes.Local,
+		p.stxo,
 	)
 	if err != nil {
 		return nil, err
 	}
 	remoteCommitBlob, remoteAuxLeaves, err := newCommitBlobAndLeaves(
 		p, req.openChan, openChanDesc, req.keyRing, lntypes.Remote,
+		p.stxo,
 	)
 	if err != nil {
 		return nil, err
@@ -1086,14 +1118,19 @@ func (f *FundingController) signAllVPackets(ctx context.Context,
 // complete, but unsigned PSBT packet that can be used to create out asset
 // channel.
 func (f *FundingController) anchorVPackets(fundedPkt *tapsend.FundedPsbt,
-	allPackets []*tappsbt.VPacket) ([]*proof.Proof, error) {
+	allPackets []*tappsbt.VPacket, stxo bool) ([]*proof.Proof, error) {
 
 	log.Infof("Anchoring funding vPackets to funding PSBT")
 
+	var opts []tapsend.OutputCommitmentOption
+	if !stxo {
+		opts = append(opts, tapsend.WithNoSTXOProofs())
+	}
+
 	// Given the set of vPackets we've created, we'll now merge them all to
 	// create a map from output index to final tap commitment.
 	outputCommitments, err := tapsend.CreateOutputCommitments(
-		allPackets, tapsend.WithNoSTXOProofs(),
+		allPackets, opts...,
 	)
 	if err != nil {
 		return nil, fmt.Errorf("unable to create new output "+
@@ -1122,11 +1159,16 @@ func (f *FundingController) anchorVPackets(fundedPkt *tapsend.FundedPsbt,
 	for idx := range allPackets {
 		vPkt := allPackets[idx]
 
+		var opts []proof.GenOption
+		if !stxo {
+			opts = append(opts, proof.WithNoSTXOProofs())
+		}
+
 		for vOutIdx := range vPkt.Outputs {
 			proofSuffix, err := tapsend.CreateProofSuffix(
 				fundedPkt.Pkt.UnsignedTx, fundedPkt.Pkt.Outputs,
 				vPkt, outputCommitments, vOutIdx, allPackets,
-				proof.WithNoSTXOProofs(),
+				opts...,
 			)
 			if err != nil {
 				return nil, fmt.Errorf("unable to create "+
@@ -1219,7 +1261,8 @@ func (f *FundingController) sendAssetFundingCreated(ctx context.Context,
 // ultimately broadcasting the funding transaction.
 func (f *FundingController) completeChannelFunding(ctx context.Context,
 	fundingState *pendingAssetFunding,
-	fundedVpkt *tapfreighter.FundedVPacket) (*wire.OutPoint, error) {
+	fundedVpkt *tapfreighter.FundedVPacket,
+	stxoEnabled bool) (*wire.OutPoint, error) {
 
 	log.Debugf("Finalizing funding vPackets and PSBT...")
 
@@ -1330,7 +1373,7 @@ func (f *FundingController) completeChannelFunding(ctx context.Context,
 	// PSBT. This'll update all the pkScripts for our funding output and
 	// change.
 	fundingOutputProofs, err := f.anchorVPackets(
-		finalFundedPsbt, signedPkts,
+		finalFundedPsbt, signedPkts, stxoEnabled,
 	)
 	if err != nil {
 		return nil, fmt.Errorf("unable to anchor vPackets: %w", err)
@@ -1545,11 +1588,17 @@ func (f *FundingController) processFundingMsg(ctx context.Context,
 				"proof: %w", err)
 		}
 
+		features := f.cfg.AuxChanNegotiator.GetPeerFeatures(
+			route.Vertex(msg.PeerPub.SerializeCompressed()),
+		)
+
+		supportSTXO := features.HasFeature(tapfeatures.STXOOptional)
+
 		// If we reached this point, then the asset output and all
 		// inputs are valid, so we'll store the funding asset
 		// commitment.
 		err = assetFunding.addToFundingCommitment(
-			&assetProof.AssetOutput.Val,
+			&assetProof.AssetOutput.Val, supportSTXO,
 		)
 		if err != nil {
 			return tempPID, fmt.Errorf("unable to create "+
@@ -1738,6 +1787,15 @@ func (f *FundingController) processFundingReq(fundingFlows fundingFlowIndex,
 			maxNumAssetIDs)
 	}
 
+	// Now let's see if we should be using STXOs for this channel funding.
+	features := f.cfg.AuxChanNegotiator.GetPeerFeatures(
+		route.Vertex(fundReq.PeerPub.SerializeCompressed()),
+	)
+
+	supportSTXO := features.HasFeature(tapfeatures.STXOOptional)
+
+	fundingState.stxo = supportSTXO
+
 	// Now that we know the final funding asset root along with the splits,
 	// we can derive the tapscript root that'll be used alongside the
 	// internal key (which we'll only learn from lnd later as we finalize
@@ -1750,7 +1808,7 @@ func (f *FundingController) processFundingReq(fundingFlows fundingFlowIndex,
 		}
 
 		err = fundingState.addToFundingCommitment(
-			fundingOut.Asset.Copy(),
+			fundingOut.Asset.Copy(), supportSTXO,
 		)
 		if err != nil {
 			return fmt.Errorf("unable to add asset to funding "+
@@ -1814,7 +1872,7 @@ func (f *FundingController) processFundingReq(fundingFlows fundingFlowIndex,
 		}
 
 		chanPoint, err := f.completeChannelFunding(
-			fundReq.ctx, fundingState, fundingVpkt,
+			fundReq.ctx, fundingState, fundingVpkt, supportSTXO,
 		)
 		if err != nil {
 			// If anything went wrong during the funding process,