Merge pull request #7344 from Roasbeef/simple-taproot-funding-reserva…

…tion

[5/? ] - lnwallet: add taproot funding support to the internal wallet flow (reservations)

channeldb/channel.go

@@ -295,6 +295,10 @@ const (
 	// ScidAliasFeatureBit indicates that the scid-alias feature bit was
 	// negotiated during the lifetime of this channel.
 	ScidAliasFeatureBit ChannelType = 1 << 9
+
+	// SimpleTaprootFeatureBit indicates that the simple-taproot-channels
+	// feature bit was negotiated during the lifetime of the channel.
+	SimpleTaprootFeatureBit ChannelType = 1 << 10
 )
 
 // IsSingleFunder returns true if the channel type if one of the known single
@@ -360,6 +364,11 @@ func (c ChannelType) HasScidAliasFeature() bool {
 	return c&ScidAliasFeatureBit == ScidAliasFeatureBit
 }
 
+// IsTaproot returns true if the channel is using taproot features.
+func (c ChannelType) IsTaproot() bool {
+	return c&SimpleTaprootFeatureBit == SimpleTaprootFeatureBit
+}
+
 // ChannelConstraints represents a set of constraints meant to allow a node to
 // limit their exposure, enact flow control and ensure that all HTLCs are
 // economically relevant. This struct will be mirrored for both sides of the

contractcourt/chain_watcher.go

@@ -834,7 +834,7 @@ func (c *chainWatcher) handlePossibleBreach(commitSpend *chainntnfs.SpendDetail,
 
 	// Create an AnchorResolution for the breached state.
 	anchorRes, err := lnwallet.NewAnchorResolution(
-		c.cfg.chanState, commitSpend.SpendingTx,
+		c.cfg.chanState, commitSpend.SpendingTx, nil,
 	)
 	if err != nil {
 		return false, fmt.Errorf("unable to create anchor "+

lnwallet/channel.go

@@ -2588,7 +2588,6 @@ func createBreachRetribution(revokedLog *channeldb.RevocationLog,
 
 			// Read the amounts from the breach transaction.
 			theirAmt = spendTx.TxOut[theirOutpoint.Index].Value
-
 		} else {
 			// Otherwise, we check to see if the revocation log
 			// contains remote parties' output amount. Due to a
@@ -5945,7 +5944,7 @@ func NewUnilateralCloseSummary(chanState *channeldb.OpenChannel, signer input.Si
 	}
 
 	anchorResolution, err := NewAnchorResolution(
-		chanState, commitTxBroadcast,
+		chanState, commitTxBroadcast, keyRing,
 	)
 	if err != nil {
 		return nil, err
@@ -6642,7 +6641,7 @@ func NewLocalForceCloseSummary(chanState *channeldb.OpenChannel,
 	}
 
 	anchorResolution, err := NewAnchorResolution(
-		chanState, commitTx,
+		chanState, commitTx, keyRing,
 	)
 	if err != nil {
 		return nil, err
@@ -6826,7 +6825,7 @@ type AnchorResolutions struct {
 
 // NewAnchorResolutions returns a set of anchor resolutions wrapped in the
 // struct AnchorResolutions. Because we have no view on the mempool, we can
-// only blindly anchor all of these txes down. Caller needs to check the
+// only blindly anchor all of these txes down. The caller needs to check the
 // returned values against nil to decide whether there exists an anchor
 // resolution for local/remote/pending remote commitment txes.
 func (lc *LightningChannel) NewAnchorResolutions() (*AnchorResolutions,
@@ -6835,20 +6834,38 @@ func (lc *LightningChannel) NewAnchorResolutions() (*AnchorResolutions,
 	lc.Lock()
 	defer lc.Unlock()
 
-	resolutions := &AnchorResolutions{}
+	var resolutions AnchorResolutions
 
 	// Add anchor for local commitment tx, if any.
+	revocation, err := lc.channelState.RevocationProducer.AtIndex(
+		lc.currentHeight,
+	)
+	if err != nil {
+		return nil, err
+	}
+	localCommitPoint := input.ComputeCommitmentPoint(revocation[:])
+	localKeyRing := DeriveCommitmentKeys(
+		localCommitPoint, true, lc.channelState.ChanType,
+		&lc.channelState.LocalChanCfg, &lc.channelState.RemoteChanCfg,
+	)
 	localRes, err := NewAnchorResolution(
 		lc.channelState, lc.channelState.LocalCommitment.CommitTx,
+		localKeyRing,
 	)
 	if err != nil {
 		return nil, err
 	}
 	resolutions.Local = localRes
 
 	// Add anchor for remote commitment tx, if any.
+	remoteKeyRing := DeriveCommitmentKeys(
+		lc.channelState.RemoteCurrentRevocation, false,
+		lc.channelState.ChanType, &lc.channelState.LocalChanCfg,
+		&lc.channelState.RemoteChanCfg,
+	)
 	remoteRes, err := NewAnchorResolution(
 		lc.channelState, lc.channelState.RemoteCommitment.CommitTx,
+		remoteKeyRing,
 	)
 	if err != nil {
 		return nil, err
@@ -6862,23 +6879,30 @@ func (lc *LightningChannel) NewAnchorResolutions() (*AnchorResolutions,
 	}
 
 	if remotePendingCommit != nil {
+		pendingRemoteKeyRing := DeriveCommitmentKeys(
+			lc.channelState.RemoteNextRevocation, false,
+			lc.channelState.ChanType, &lc.channelState.LocalChanCfg,
+			&lc.channelState.RemoteChanCfg,
+		)
 		remotePendingRes, err := NewAnchorResolution(
 			lc.channelState,
 			remotePendingCommit.Commitment.CommitTx,
+			pendingRemoteKeyRing,
 		)
 		if err != nil {
 			return nil, err
 		}
 		resolutions.RemotePending = remotePendingRes
 	}
 
-	return resolutions, nil
+	return &resolutions, nil
 }
 
 // NewAnchorResolution returns the information that is required to sweep the
 // local anchor.
 func NewAnchorResolution(chanState *channeldb.OpenChannel,
-	commitTx *wire.MsgTx) (*AnchorResolution, error) {
+	commitTx *wire.MsgTx,
+	keyRing *CommitmentKeyRing) (*AnchorResolution, error) {
 
 	// Return nil resolution if the channel has no anchors.
 	if !chanState.ChanType.HasAnchors() {
@@ -6887,7 +6911,8 @@ func NewAnchorResolution(chanState *channeldb.OpenChannel,
 
 	// Derive our local anchor script.
 	localAnchor, _, err := CommitScriptAnchors(
-		&chanState.LocalChanCfg, &chanState.RemoteChanCfg,
+		chanState.ChanType, &chanState.LocalChanCfg,
+		&chanState.RemoteChanCfg, keyRing,
 	)
 	if err != nil {
 		return nil, err
@@ -7239,7 +7264,8 @@ func (lc *LightningChannel) generateRevocation(height uint64) (*lnwire.RevokeAnd
 
 	revocationMsg.NextRevocationKey = input.ComputeCommitmentPoint(nextCommitSecret[:])
 	revocationMsg.ChanID = lnwire.NewChanIDFromOutPoint(
-		&lc.channelState.FundingOutpoint)
+		&lc.channelState.FundingOutpoint,
+	)
 
 	return revocationMsg, nil
 }