Skip to content

Swap provider to support per-channel locking #86

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
Jossec101 merged 3 commits into from
Sep 18, 2025
Merged

Swap provider to support per-channel locking #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
07e5ed4
feat: refactor swap provider to support per-channel locking
Jossec101 Sep 18, 2025
8dfb806
feat: add mutual exclusion between submarine and reverse swaps per ch…
Jossec101 Sep 18, 2025
937bd29
fix: update mock methods to return pointers for SwapStatus
Jossec101 Sep 18, 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
7 changes: 4 additions & 3 deletions liquidator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,7 @@ func performSwap(info ManageChannelLiquidityInfo, channel *lnrpc.Channel, swapAm
swapRequest := provider.SubmarineSwapRequest{
SatsAmount: swapAmount,
LastHopPubkey: channel.RemotePubkey,
ChannelId: channel.GetChanId(),
}

//Log including channel.GetChanId() and swapAmount
Expand Down Expand Up @@ -700,7 +701,7 @@ func performSwap(info ManageChannelLiquidityInfo, channel *lnrpc.Channel, swapAm
swapType := "swap"

//Add fees to counter
recordSwapFees(swapStatus, info, swapType, channel)
recordSwapFees(*swapStatus, info, swapType, channel)
}
return nil
}
Expand Down Expand Up @@ -728,7 +729,7 @@ func performReverseSwap(info ManageChannelLiquidityInfo, channel *lnrpc.Channel,
//Perform the swap
swapRequest := provider.ReverseSubmarineSwapRequest{
SatsAmount: swapAmount,
ChannelSet: []uint64{channel.GetChanId()},
ChannelId: channel.GetChanId(),
ReceiverBTCAddress: address,
}

Expand Down Expand Up @@ -790,7 +791,7 @@ func performReverseSwap(info ManageChannelLiquidityInfo, channel *lnrpc.Channel,
swapType := "rswap"

//Add fees to counter
recordSwapFees(swapStatus, info, swapType, channel)
recordSwapFees(*swapStatus, info, swapType, channel)
}
return nil
}
Expand Down
4 changes: 2 additions & 2 deletions liquidator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ func createMockProviderValidSwap(mockCtrl *gomock.Controller) *provider.MockProv
InvoiceBTCAddress: "bcrt1q6zszlnxhlq0lsmfc42nkwgqedy9kvmvmxhkvme",
}, nil).AnyTimes()

mockProvider.EXPECT().MonitorSwap(gomock.Any(), gomock.Any(), gomock.Any()).Return(looprpc.SwapStatus{
mockProvider.EXPECT().MonitorSwap(gomock.Any(), gomock.Any(), gomock.Any()).Return(&looprpc.SwapStatus{
Amt: 0,
Id: "",
IdBytes: []byte{},
Expand Down Expand Up @@ -396,7 +396,7 @@ func createMockProviderInvalidSwap(mockCtrl *gomock.Controller) *provider.MockPr
InvoiceBTCAddress: "bcrt1q6zszlnxhlq0lsmfc42nkwgqedy9kvmvmxhkvme",
}, nil).AnyTimes()

mockProviderInvalid.EXPECT().MonitorSwap(gomock.Any(), gomock.Any(), gomock.Any()).Return(looprpc.SwapStatus{
mockProviderInvalid.EXPECT().MonitorSwap(gomock.Any(), gomock.Any(), gomock.Any()).Return(&looprpc.SwapStatus{
Amt: 0,
Id: "",
IdBytes: []byte{},
Expand Down
331 changes: 2 additions & 329 deletions nodeguard/nodeguard_mock.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading