lnwallet: support transactions and scripts for new commitment type

This commit modifies the channel state machine to be able to derive the
proper commitment and second-level HTLC output scripts required by the
new script-enforced leased channel commitment type.

contractcourt/breacharbiter_test.go

@@ -2299,6 +2299,7 @@ func createInitChannels(revocationWindow int) (*lnwallet.LightningChannel, *lnwa
 	aliceCommitTx, bobCommitTx, err := lnwallet.CreateCommitmentTxns(
 		channelBal, channelBal, &aliceCfg, &bobCfg, aliceCommitPoint,
 		bobCommitPoint, *fundingTxIn, channeldb.SingleFunderTweaklessBit,
+		false, 0,
 	)
 	if err != nil {
 		return nil, nil, nil, err

contractcourt/chain_watcher.go

@@ -362,8 +362,13 @@ func (c *chainWatcher) handleUnknownLocalState(
 
 	// With the keys derived, we'll construct the remote script that'll be
 	// present if they have a non-dust balance on the commitment.
+	var leaseExpiry uint32
+	if c.cfg.chanState.ChanType.HasLeaseExpiration() {
+		leaseExpiry = c.cfg.chanState.ThawHeight
+	}
 	remoteScript, _, err := lnwallet.CommitScriptToRemote(
-		c.cfg.chanState.ChanType, commitKeyRing.ToRemoteKey,
+		c.cfg.chanState.ChanType, c.cfg.chanState.IsInitiator,
+		commitKeyRing.ToRemoteKey, leaseExpiry,
 	)
 	if err != nil {
 		return false, err
@@ -373,8 +378,9 @@ func (c *chainWatcher) handleUnknownLocalState(
 	// the remote party allowing them to claim this output before the CSV
 	// delay if we breach.
 	localScript, err := lnwallet.CommitScriptToSelf(
+		c.cfg.chanState.ChanType, c.cfg.chanState.IsInitiator,
 		commitKeyRing.ToLocalKey, commitKeyRing.RevocationKey,
-		uint32(c.cfg.chanState.LocalChanCfg.CsvDelay),
+		uint32(c.cfg.chanState.LocalChanCfg.CsvDelay), leaseExpiry,
 	)
 	if err != nil {
 		return false, err