⚠️ Please install the to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

Attention: Patch coverage is 90.90909% with 1 line in your changes missing coverage. Please review.

Project coverage is 87.33%. Comparing base (ca51a2d) to head (7c7cb15).
Report is 620 commits behind head on master.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

@@            Coverage Diff             @@
##           master    #1832      +/-   ##
==========================================
+ Coverage   87.27%   87.33%   +0.05%     
==========================================
  Files         159      159              
  Lines       11943    11950       +7     
  Branches      471      448      -23     
==========================================
+ Hits        10423    10436      +13     
+ Misses       1520     1514       -6     

Looks like this only works on user-issued force-close command currently? I'd guess that would be the least likely occurrence, more probable case is something like we are sending HTLCs and suddenly see remote commit published.

Looks like this only works on user-issued force-close command currently? I'd guess that would be the least likely occurrence, more probable case is something like we are sending HTLCs and suddenly see remote commit published.

I agree the fix should handle all cases of channel closing.

I think the right way to fix this is here:

We should wait for the commit tx to be confirmed and then fail all these proposed HTLCs, either by modifying overriddenOutgoingHtlcs to return them or by explicitly handling them separately.

We should wait for the commit tx to be confirmed and then fail all these proposed HTLCs, either by modifying overriddenOutgoingHtlcs to return them or by explicitly handling them separately.

I disagree, because in the case of an overridden htlc, that htlc was previously committed, which is why we need to make sure that a competing commitment won the race. Here, since the htlc has not been signed, it will be overridden as soon as we enter the closing procedure.

Rebased on master.