fixup! lnwallet: funding revamp checkpoint

Author: guggero

lnwallet/wallet.go

@@ -1480,21 +1480,28 @@ func (l *LightningWallet) handleFundingCancelRequest(req *fundingReserveCancelMs
 // createCommitOpts is a struct that holds the options for creating a a new
 // commitment transaction.
 type createCommitOpts struct {
-	auxLeaves fn.Option[CommitAuxLeaves]
+	localAuxLeaves  fn.Option[CommitAuxLeaves]
+	remoteAuxLeaves fn.Option[CommitAuxLeaves]
 }
 
 // defaultCommitOpts returns a new createCommitOpts with default values.
 func defaultCommitOpts() createCommitOpts {
 	return createCommitOpts{}
 }
 
-// WithAuxLeaves is a functional option that can be used to set the aux leaves
-// for a new commitment transaction.
-//
-// TODO(roasbeef): local+remote  leaves
-func WithAuxLeaves(leaves fn.Option[CommitAuxLeaves]) CreateCommitOpt {
+// WithLocalAuxLeaves is a functional option that can be used to set the local
+// aux leaves for a new commitment transaction.
+func WithLocalAuxLeaves(leaves fn.Option[CommitAuxLeaves]) CreateCommitOpt {
+	return func(o *createCommitOpts) {
+		o.localAuxLeaves = leaves
+	}
+}
+
+// WithRemoteAuxLeaves is a functional option that can be used to set the remote
+// aux leaves for a new commitment transaction.
+func WithRemoteAuxLeaves(leaves fn.Option[CommitAuxLeaves]) CreateCommitOpt {
 	return func(o *createCommitOpts) {
-		o.auxLeaves = leaves
+		o.remoteAuxLeaves = leaves
 	}
 }
 
@@ -1528,7 +1535,7 @@ func CreateCommitmentTxns(localBalance, remoteBalance btcutil.Amount,
 	ourCommitTx, err := CreateCommitTx(
 		chanType, fundingTxIn, localCommitmentKeys, ourChanCfg,
 		theirChanCfg, localBalance, remoteBalance, 0, initiator,
-		leaseExpiry, options.auxLeaves,
+		leaseExpiry, options.localAuxLeaves,
 	)
 	if err != nil {
 		return nil, nil, err
@@ -1542,7 +1549,7 @@ func CreateCommitmentTxns(localBalance, remoteBalance btcutil.Amount,
 	theirCommitTx, err := CreateCommitTx(
 		chanType, fundingTxIn, remoteCommitmentKeys, theirChanCfg,
 		ourChanCfg, remoteBalance, localBalance, 0, !initiator,
-		leaseExpiry, options.auxLeaves,
+		leaseExpiry, options.remoteAuxLeaves,
 	)
 	if err != nil {
 		return nil, nil, err
@@ -1903,7 +1910,8 @@ func (l *LightningWallet) handleChanPointReady(req *continueContributionMsg) {
 		theirContribution.FirstCommitmentPoint, fundingTxIn,
 		pendingReservation.partialState.ChanType,
 		pendingReservation.partialState.IsInitiator, leaseExpiry,
-		WithAuxLeaves(pendingReservation.initAuxLeaves),
+		WithLocalAuxLeaves(pendingReservation.localInitAuxLeaves),
+		WithRemoteAuxLeaves(pendingReservation.remoteInitAuxLeaves),
 	)
 	if err != nil {
 		req.err <- err
@@ -2345,7 +2353,8 @@ func (l *LightningWallet) handleSingleFunderSigs(req *addSingleFunderSigsMsg) {
 		pendingReservation.theirContribution.FirstCommitmentPoint,
 		*fundingTxIn, chanType,
 		pendingReservation.partialState.IsInitiator, leaseExpiry,
-		WithAuxLeaves(pendingReservation.initAuxLeaves),
+		WithLocalAuxLeaves(pendingReservation.localInitAuxLeaves),
+		WithRemoteAuxLeaves(pendingReservation.remoteInitAuxLeaves),
 	)
 	if err != nil {
 		req.err <- err