Skip to content
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

Jump to bottom

fix: Only consider a relevant dlc channels #1827

Merged
merged 2 commits into from
Jan 17, 2024
Merged

fix: Only consider a relevant dlc channels #1827

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
64787fb
fix: Only consider a signed dlc channel with the counterparty
holzeis Jan 17, 2024
250f3a5
fix: Only consider non-final dlc channels
holzeis Jan 17, 2024
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 coordinator/src/dlc_handler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ use diesel::r2d2::Pool;
use diesel::PgConnection;
use dlc_manager::channel::signed_channel::SignedChannel;
use dlc_manager::channel::signed_channel::SignedChannelState;
use dlc_manager::channel::Channel;
use dlc_messages::Message;
use futures::future::RemoteHandle;
use futures::FutureExt;
Expand Down Expand Up @@ -102,11 +101,13 @@ impl DlcHandler {
}

pub fn on_connect(&self, peer: PublicKey) -> Result<()> {
if let Some(Channel::Signed(SignedChannel {
let signed_dlc_channels = self.node.list_signed_dlc_channels()?;

if let Some(SignedChannel {
channel_id,
state: SignedChannelState::CollaborativeCloseOffered { .. },
..
})) = self.node.list_dlc_channels()?.first()
}) = signed_dlc_channels.iter().find(|c| c.counter_party == peer)
{
tracing::info!("Accepting pending dlc channel close offer.");
// Pending dlc channel close offer with the intend to close the dlc channel
Expand Down
21 changes: 20 additions & 1 deletion mobile/native/src/dlc_handler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,26 @@ impl DlcHandler {
}

pub fn on_connect(&self, peer: PublicKey) -> Result<()> {
if let Some(channel) = self.node.list_dlc_channels()?.first() {
let dlc_channels: Vec<Channel> = self
.node
.list_dlc_channels()?
.into_iter()
.filter(|c| {
// Filter all dlc channels that have reached a somewhat final state.
!matches!(
c,
Channel::Closed(_)
| Channel::Closing(_)
| Channel::CounterClosed(_)
| Channel::ClosedPunished(_)
| Channel::CollaborativelyClosed(_)
| Channel::FailedAccept(_)
| Channel::FailedSign(_)
)
})
.collect();

if let Some(channel) = dlc_channels.first() {
match channel {
Channel::Offered(OfferedChannel {
temporary_channel_id,
Expand Down
Loading