From f22cba9de1f49a39786269fa949f7be861ff653b Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Wed, 31 Jan 2024 19:51:37 -0800 Subject: [PATCH] peer: conditionally create new RBF chan closer --- peer/brontide.go | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/peer/brontide.go b/peer/brontide.go index 559d4fd5a..ef509ae33 100644 --- a/peer/brontide.go +++ b/peer/brontide.go @@ -457,6 +457,12 @@ func makeNegotiateCloser(chanCloser *chancloser.ChanCloser) chanCloserFsm { ) } +func makeRbfCloser(rbfCloser *chancloser.RbfChanCloser) chanCloserFsm { + return fn.NewRight[*chancloser.ChanCloser]( + rbfCloser, + ) +} + // Brontide is an active peer on the Lightning Network. This struct is responsible // for managing any channel state related to this peer. To do so, it has // several helper goroutines to handle events such as HTLC timeouts, new @@ -3586,6 +3592,8 @@ func (p *Brontide) initRbfChanCloser( chanCloser := protofsm.NewStateMachine(protoCfg) + p.activeChanCloses[chanID] = makeRbfCloser(&chanCloser) + // Now that we've created the channel state machine, we'll register for // a hook to be sent once the channel has been flushed. link.OnFlushedOnce(func() { @@ -3652,7 +3660,14 @@ func (p *Brontide) handleLocalCloseReq(req *htlcswitch.ChanClose) { // out this channel on-chain, so we execute the cooperative channel // closure workflow. case contractcourt.CloseRegular: - err := p.initNegotiateChanCloser(req, channel) + var err error + switch { + case p.rbfCoopCloseAllowed(): + err = p.initAndStartRbfChanCloser(req, channel) + default: + err = p.initNegotiateChanCloser(req, channel) + } + if err != nil { p.log.Errorf(err.Error()) req.Err <- err