Skip to content

staticaddr: minor fixes #956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hieblmi merged 2 commits into from
Jun 23, 2025
Merged

staticaddr: minor fixes #956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3963bad
staticaddr: remove duplicate deposit finalize method
hieblmi Jun 13, 2025
d526192
staticaddr: thread-safe loop-in recovery
hieblmi Jun 13, 2025
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
15 changes: 0 additions & 15 deletions staticaddr/deposit/actions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,21 +137,6 @@ func (f *FSM) WaitForExpirySweepAction(ctx context.Context,
}
}

// SweptExpiredDepositAction is the final action of the FSM. It signals to the
// manager that the deposit has been swept and the FSM can be removed. It also
// ends the state machine main loop by cancelling its context.
func (f *FSM) SweptExpiredDepositAction(ctx context.Context,
_ fsm.EventContext) fsm.EventType {

select {
case <-ctx.Done():
return fsm.OnError

case f.finalizedDepositChan <- f.deposit.OutPoint:
return fsm.NoOp
}
}

// FinalizeDepositAction is the final action after a withdrawal. It signals to
// the manager that the deposit has been swept and the FSM can be removed.
func (f *FSM) FinalizeDepositAction(ctx context.Context,
Expand Down
2 changes: 1 addition & 1 deletion staticaddr/deposit/fsm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ func (f *FSM) DepositStatesV0() fsm.States {
Transitions: fsm.Transitions{
OnExpiry: Expired,
},
Action: f.SweptExpiredDepositAction,
Action: f.FinalizeDepositAction,
},
Withdrawing: fsm.State{
Transitions: fsm.Transitions{
Expand Down
7 changes: 3 additions & 4 deletions staticaddr/loopin/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,16 +473,15 @@ func (m *Manager) recoverLoopIns(ctx context.Context) error {
}

// Send the OnRecover event to the state machine.
swapHash := loopIn.SwapHash
go func() {
err = fsm.SendEvent(ctx, OnRecover, nil)
go func(fsm *FSM, swapHash lntypes.Hash) {
err := fsm.SendEvent(ctx, OnRecover, nil)
if err != nil {
log.Errorf("Error sending OnStart event: %v",
err)
}

m.activeLoopIns[swapHash] = fsm
}()
}(fsm, loopIn.SwapHash)

@starius starius Jun 20, 2025

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this needed? fsm and swapHash are a local variable and they can't change outside of the goroutine.

@hieblmi hieblmi Jun 23, 2025

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

loopIn is a iteration variable which might change before the goroutine launches, so this is needed.

}

return nil
Expand Down