Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions staticaddr/loopin/actions.go
Original file line number Diff line number Diff line change
Expand Up @@ -575,6 +575,10 @@ func (f *FSM) MonitorInvoiceAndHtlcTxAction(ctx context.Context,
f.Errorf("htlc tx conf chan error, re-registering: "+
"%v", err)

// A previous confirmation may no longer be valid if the
// subscription failed, so reset and wait for a fresh one.
htlcConfirmed = false

// Re-register for htlc confirmation.
htlcConfChan, htlcErrConfChan, err = registerHtlcConf()
if err != nil {
Expand Down Expand Up @@ -695,6 +699,8 @@ func (f *FSM) MonitorInvoiceAndHtlcTxAction(ctx context.Context,
case err = <-invoiceErrChan:
f.Errorf("invoice subscription error: %v", err)

return f.HandleError(err)

case <-ctx.Done():
return f.HandleError(ctx.Err())
}
Expand Down
Loading
Loading