From 3681ba6d8ba625d7201634c2d0f1005815bf63da Mon Sep 17 00:00:00 2001
From: Olaoluwa Osuntokun <laolu32@gmail.com>
Date: Mon, 17 Mar 2025 16:18:19 -0500
Subject: [PATCH] peer: for RBF state machine block req if RBF iterating is
 outstanding

This fixes an issue in the itests in the restart case. We'd see an error
like:
```
2025-03-12 23:41:10.754 [ERR] PFSM state_machine.go:661: FSM(rbf_chan_closer(2f20725d9004f7fda7ef280f77dd8d419fd6669bda1a5231dd58d6f6597066e0:0)): Unable to apply event err="invalid state transition: received *chancloser.SendOfferEvent while in ClosingNegotiation(local=LocalOfferSent(proposed_fee=0.00000193 BTC), remote=ClosePending(txid=07229915459cb439bdb8ad4f5bf112dc6f42fca0192ea16a7d6dd05e607b92ae, party=Remote, fee_rate=1 sat/vb))"
```

We resolve this by waiting to send in the new request unil the old one
has been completed.
---
 lntest/harness.go |  1 +
 peer/brontide.go  | 62 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+)

diff --git a/lntest/harness.go b/lntest/harness.go
index ffbedea9f..c43cdfd45 100644
--- a/lntest/harness.go
+++ b/lntest/harness.go
@@ -1333,6 +1333,7 @@ func (h *HarnessTest) CloseChannelAssertPending(hn *node.HarnessNode,
 		notifyRate := pendingClose.ClosePending.FeePerVbyte
 		if closeOpts.localTxOnly &&
 			notifyRate != int64(closeReq.SatPerVbyte) {
+
 			continue
 		}
 
diff --git a/peer/brontide.go b/peer/brontide.go
index 29fe0576f..a7081c685 100644
--- a/peer/brontide.go
+++ b/peer/brontide.go
@@ -3981,6 +3981,57 @@ func newRPCShutdownInit(req *htlcswitch.ChanClose) shutdownInit {
 	)
 }
 
+// waitUntilRbfCoastClear waits until the RBF co-op close state machine has
+// advanced to a terminal state before attempting another fee bump.
+func waitUntilRbfCoastClear(ctx context.Context,
+	rbfCloser *chancloser.RbfChanCloser) error {
+
+	coopCloseStates := rbfCloser.RegisterStateEvents()
+	newStateChan := coopCloseStates.NewItemCreated.ChanOut()
+	defer rbfCloser.RemoveStateSub(coopCloseStates)
+
+	isTerminalState := func(newState chancloser.RbfState) bool {
+		// If we're not in the negotiation sub-state, then we aren't at
+		// the terminal state yet.
+		state, ok := newState.(*chancloser.ClosingNegotiation)
+		if !ok {
+			return false
+		}
+
+		localState := state.PeerState.GetForParty(lntypes.Local)
+
+		// If this isn't the close pending state, we aren't at the
+		// terminal state yet.
+		_, ok = localState.(*chancloser.ClosePending)
+
+		return ok
+	}
+
+	// Before we enter the subscription loop below, check to see if we're
+	// already in the terminal state.
+	rbfState, err := rbfCloser.CurrentState()
+	if err != nil {
+		return err
+	}
+	if isTerminalState(rbfState) {
+		return nil
+	}
+
+	peerLog.Debugf("Waiting for RBF iteration to complete...")
+
+	for {
+		select {
+		case newState := <-newStateChan:
+			if isTerminalState(newState) {
+				return nil
+			}
+
+		case <-ctx.Done():
+			return fmt.Errorf("context canceled")
+		}
+	}
+}
+
 // startRbfChanCloser kicks off the co-op close process using the new RBF based
 // co-op close protocol. This is called when we're the one that's initiating
 // the cooperative channel close.
@@ -4070,6 +4121,17 @@ func (p *Brontide) startRbfChanCloser(shutdown shutdownInit,
 		// the prior fee rate), or we've sent an offer, then we'll
 		// trigger a new offer event.
 		case *chancloser.ClosingNegotiation:
+			// Before we send the event below, we'll wait until
+			// we're in a semi-terminal state.
+			err := waitUntilRbfCoastClear(ctx, rbfCloser)
+			if err != nil {
+				peerLog.Warnf("ChannelPoint(%v): unable to "+
+					"wait for coast to clear: %v",
+					chanPoint, err)
+
+				return
+			}
+
 			event := chancloser.ProtocolEvent(
 				&chancloser.SendOfferEvent{
 					TargetFeeRate: feeRate,