Handle WeResumedDelayedFundingLocked msg in applyEvent

Sending a funding_locked message after having already received one and
processing all events returned by executeCommand will now put the
channel into Normal state, rather than WaitForFundingLocked.

Author: canndrew

src/DotNetLightning.Core/Channel/Channel.fs

@@ -701,6 +701,28 @@ module Channel =
         | state, cmd ->
             undefinedStateAndCmdPair state cmd
 
+    let bothFundingLocked c (msg: FundingLocked) (s: WaitForFundingLockedData): Channel =
+        let feeBase = ChannelHelpers.getOurFeeBaseMSat c.FeeEstimator s.InitialFeeRatePerKw s.Commitments.LocalParams.IsFunder
+        let channelUpdate = ChannelHelpers.makeChannelUpdate (c.Network.GenesisHashRev,
+                                                       c.LocalNodeSecret,
+                                                       c.RemoteNodeId,
+                                                       s.ShortChannelId,
+                                                       s.Commitments.LocalParams.ToSelfDelay,
+                                                       s.Commitments.RemoteParams.HTLCMinimumMSat,
+                                                       feeBase,
+                                                       c.Config.ChannelOptions.FeeProportionalMillionths,
+                                                       true,
+                                                       None)
+        let nextState = { NormalData.Buried = false;
+                          Commitments = s.Commitments
+                          ShortChannelId = s.ShortChannelId
+                          ChannelAnnouncement = None
+                          ChannelUpdate = channelUpdate
+                          LocalShutdown = None
+                          RemoteShutdown = None
+                          ChannelId = msg.ChannelId }
+        { c with State = ChannelState.Normal nextState }
+
     let applyEvent c (e: ChannelEvent): Channel =
         match e, c.State with
         | NewOutboundChannelStarted(_, data), WaitForInitInternal ->
@@ -727,28 +749,11 @@ module Channel =
         | TheySentFundingLocked msg, WaitForFundingConfirmed s ->
             { c with State = WaitForFundingConfirmed({ s with Deferred = Some(msg) }) }
         | TheySentFundingLocked msg, WaitForFundingLocked s ->
-            let feeBase = ChannelHelpers.getOurFeeBaseMSat c.FeeEstimator s.InitialFeeRatePerKw s.Commitments.LocalParams.IsFunder
-            let channelUpdate = ChannelHelpers.makeChannelUpdate (c.Network.GenesisHashRev,
-                                                           c.LocalNodeSecret,
-                                                           c.RemoteNodeId,
-                                                           s.ShortChannelId,
-                                                           s.Commitments.LocalParams.ToSelfDelay,
-                                                           s.Commitments.RemoteParams.HTLCMinimumMSat,
-                                                           feeBase,
-                                                           c.Config.ChannelOptions.FeeProportionalMillionths,
-                                                           true,
-                                                           None)
-            let nextState = { NormalData.Buried = false;
-                              Commitments = s.Commitments
-                              ShortChannelId = s.ShortChannelId
-                              ChannelAnnouncement = None
-                              ChannelUpdate = channelUpdate
-                              LocalShutdown = None
-                              RemoteShutdown = None
-                              ChannelId = msg.ChannelId }
-            { c with State = ChannelState.Normal nextState }
+            bothFundingLocked c msg s
         | WeSentFundingLocked msg, WaitForFundingLocked prevState ->
             { c with State = WaitForFundingLocked { prevState with OurMessage = msg; HaveWeSentFundingLocked = true } }
+        | WeResumedDelayedFundingLocked msg, WaitForFundingLocked s ->
+            bothFundingLocked c msg s
         | BothFundingLocked data, WaitForFundingSigned _s ->
             { c with State = ChannelState.Normal data }
         | BothFundingLocked data, WaitForFundingLocked _s ->

src/DotNetLightning.Infrastructure/ActorManagers/ChannelManager.fs

@@ -163,8 +163,10 @@ type ChannelManager(log: ILogger<ChannelManager>,
             match e.ChannelEvent with
             | ChannelEvent.WeAcceptedAcceptChannel (nextMsg, _) ->
                 this.FundingTxs.TryAdd(nextMsg.FundingTxId, (e.NodeId, None)) |> ignore
+            (*
             | WeResumedDelayedFundingLocked theirFundingSigned ->
                 do! (this.Actors.[e.NodeId] :> IActor<_>).Put(ChannelCommand.ApplyFundingLocked theirFundingSigned)
+            *)
             | _ -> ()
         }
         vt.AsTask() |> Async.AwaitTask