LSPS2ServiceHandler API: Avoid explictly dropping locks#4124

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
tnull merged 1 commit into from
Sep 25, 2025
Merged

LSPS2ServiceHandler API: Avoid explictly dropping locks #4124

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
181 changes: 88 additions & 93 deletions lightning-liquidity/src/lsps2/service.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -771,16 +771,14 @@ where
/// [`ChannelManager::create_channel`]: lightning::ln::channelmanager::ChannelManager::create_channel
/// [`ChannelManager::get_intercept_scid`]: lightning::ln::channelmanager::ChannelManager::get_intercept_scid
/// [`LSPS2ServiceEvent::BuyRequest`]: crate::lsps2::event::LSPS2ServiceEvent::BuyRequest
#[allow(clippy::await_holding_lock)]
pub async fn invoice_parameters_generated(
&self, counterparty_node_id: &PublicKey, request_id: LSPSRequestId, intercept_scid: u64,
cltv_expiry_delta: u32, client_trusts_lsp: bool, user_channel_id: u128,
) -> Result<(), APIError> {
let mut message_queue_notifier = self.pending_messages.notifier();
let mut should_persist = false;

let outer_state_lock = self.per_peer_state.read().unwrap();
match outer_state_lock.get(counterparty_node_id) {
match self.per_peer_state.read().unwrap().get(counterparty_node_id) {
Some(inner_state_lock) => {
let mut peer_state_lock = inner_state_lock.lock().unwrap();

Expand DownExpand Up@@ -827,8 +825,6 @@ where
},
};

drop(outer_state_lock);

if should_persist {
self.persist_peer_state(*counterparty_node_id).await.map_err(|e| {
APIError::APIMisuseError {
Expand All@@ -855,16 +851,16 @@ where
///
/// [`Event::HTLCIntercepted`]: lightning::events::Event::HTLCIntercepted
/// [`LSPS2ServiceEvent::OpenChannel`]: crate::lsps2::event::LSPS2ServiceEvent::OpenChannel
#[allow(clippy::await_holding_lock)]
pub async fn htlc_intercepted(
&self, intercept_scid: u64, intercept_id: InterceptId, expected_outbound_amount_msat: u64,
payment_hash: PaymentHash,
) -> Result<(), APIError> {
let event_queue_notifier = self.pending_events.notifier();
let mut should_persist = None;

let peer_by_intercept_scid = self.peer_by_intercept_scid.read().unwrap();
if let Some(counterparty_node_id) = peer_by_intercept_scid.get(&intercept_scid) {
if let Some(counterparty_node_id) =
self.peer_by_intercept_scid.read().unwrap().get(&intercept_scid)
{
let outer_state_lock = self.per_peer_state.read().unwrap();
match outer_state_lock.get(counterparty_node_id) {
Some(inner_state_lock) => {
Expand DownExpand Up@@ -939,8 +935,6 @@ where
}
}

drop(peer_by_intercept_scid);

if let Some(counterparty_node_id) = should_persist {
self.persist_peer_state(counterparty_node_id).await.map_err(|e| {
APIError::APIMisuseError {
Expand DownExpand Up@@ -1131,55 +1125,57 @@ where
/// open, as it only affects the local LSPS2 state and doesn't affect any channels that
/// might already exist on-chain. Any pending channel open attempts must be managed
/// separately.
#[allow(clippy::await_holding_lock)]
pub async fn channel_open_abandoned(
&self, counterparty_node_id: &PublicKey, user_channel_id: u128,
) -> Result<(), APIError> {
let outer_state_lock = self.per_peer_state.read().unwrap();
let inner_state_lock =
outer_state_lock.get(counterparty_node_id).ok_or_else(|| APIError::APIMisuseError {
err: format!("No counterparty state for: {}", counterparty_node_id),
})?;
let mut peer_state = inner_state_lock.lock().unwrap();

let intercept_scid = peer_state
.intercept_scid_by_user_channel_id
.get(&user_channel_id)
.copied()
.ok_or_else(|| APIError::APIMisuseError {
err: format!("Could not find a channel with user_channel_id {}", user_channel_id),
{
let outer_state_lock = self.per_peer_state.read().unwrap();
let inner_state_lock = outer_state_lock.get(counterparty_node_id).ok_or_else(|| {
APIError::APIMisuseError {
err: format!("No counterparty state for: {}", counterparty_node_id),
}
})?;
let mut peer_state = inner_state_lock.lock().unwrap();

let jit_channel = peer_state
.outbound_channels_by_intercept_scid
.get(&intercept_scid)
.ok_or_else(|| APIError::APIMisuseError {
let intercept_scid = peer_state
.intercept_scid_by_user_channel_id
.get(&user_channel_id)
.copied()
.ok_or_else(|| APIError::APIMisuseError {
err: format!(
"Could not find a channel with user_channel_id {}",
user_channel_id
),
})?;

let jit_channel = peer_state
.outbound_channels_by_intercept_scid
.get(&intercept_scid)
.ok_or_else(|| APIError::APIMisuseError {
err: format!(
"Failed to map intercept_scid {} for user_channel_id {} to a channel.",
intercept_scid, user_channel_id,
),
})?;

let is_pending = matches!(
jit_channel.state,
OutboundJITChannelState::PendingInitialPayment { .. }
| OutboundJITChannelState::PendingChannelOpen { .. }
);

if !is_pending {
return Err(APIError::APIMisuseError {
err: "Cannot abandon channel open after channel creation or payment forwarding"
.to_string(),
});
}
let is_pending = matches!(
jit_channel.state,
OutboundJITChannelState::PendingInitialPayment { .. }
| OutboundJITChannelState::PendingChannelOpen { .. }
);

peer_state.intercept_scid_by_user_channel_id.remove(&user_channel_id);
peer_state.outbound_channels_by_intercept_scid.remove(&intercept_scid);
peer_state.intercept_scid_by_channel_id.retain(|_, &mut scid| scid != intercept_scid);
peer_state.needs_persist |= true;
if !is_pending {
return Err(APIError::APIMisuseError {
err: "Cannot abandon channel open after channel creation or payment forwarding"
.to_string(),
});
}

drop(peer_state);
drop(outer_state_lock);
peer_state.intercept_scid_by_user_channel_id.remove(&user_channel_id);
peer_state.outbound_channels_by_intercept_scid.remove(&intercept_scid);
peer_state.intercept_scid_by_channel_id.retain(|_, &mut scid| scid != intercept_scid);
peer_state.needs_persist |= true;
}

self.persist_peer_state(*counterparty_node_id).await.map_err(|e| {
APIError::APIMisuseError {
Expand All@@ -1197,62 +1193,63 @@ where
/// state so that the payer may try the payment again.
///
/// [`LSPS2ServiceEvent::OpenChannel`]: crate::lsps2::event::LSPS2ServiceEvent::OpenChannel
#[allow(clippy::await_holding_lock)]
pub async fn channel_open_failed(
&self, counterparty_node_id: &PublicKey, user_channel_id: u128,
) -> Result<(), APIError> {
let outer_state_lock = self.per_peer_state.read().unwrap();
{
let outer_state_lock = self.per_peer_state.read().unwrap();

let inner_state_lock =
outer_state_lock.get(counterparty_node_id).ok_or_else(|| APIError::APIMisuseError {
err: format!("No counterparty state for: {}", counterparty_node_id),
let inner_state_lock = outer_state_lock.get(counterparty_node_id).ok_or_else(|| {
APIError::APIMisuseError {
err: format!("No counterparty state for: {}", counterparty_node_id),
}
})?;

let mut peer_state = inner_state_lock.lock().unwrap();
let mut peer_state = inner_state_lock.lock().unwrap();

let intercept_scid = peer_state
.intercept_scid_by_user_channel_id
.get(&user_channel_id)
.copied()
.ok_or_else(|| APIError::APIMisuseError {
err: format!("Could not find a channel with user_channel_id {}", user_channel_id),
})?;
let intercept_scid = peer_state
.intercept_scid_by_user_channel_id
.get(&user_channel_id)
.copied()
.ok_or_else(|| APIError::APIMisuseError {
err: format!(
"Could not find a channel with user_channel_id {}",
user_channel_id
),
})?;

let jit_channel = peer_state
.outbound_channels_by_intercept_scid
.get_mut(&intercept_scid)
.ok_or_else(|| APIError::APIMisuseError {
err: format!(
"Failed to map intercept_scid {} for user_channel_id {} to a channel.",
intercept_scid, user_channel_id,
),
})?;
let jit_channel = peer_state
.outbound_channels_by_intercept_scid
.get_mut(&intercept_scid)
.ok_or_else(|| APIError::APIMisuseError {
err: format!(
"Failed to map intercept_scid {} for user_channel_id {} to a channel.",
intercept_scid, user_channel_id,
),
})?;

if let OutboundJITChannelState::PendingChannelOpen { payment_queue, .. } =
&mut jit_channel.state
{
let intercepted_htlcs = payment_queue.clear();
for htlc in intercepted_htlcs {
self.channel_manager.get_cm().fail_htlc_backwards_with_reason(
&htlc.payment_hash,
FailureCode::TemporaryNodeFailure,
);
}

if let OutboundJITChannelState::PendingChannelOpen { payment_queue, .. } =
&mut jit_channel.state
{
let intercepted_htlcs = payment_queue.clear();
for htlc in intercepted_htlcs {
self.channel_manager.get_cm().fail_htlc_backwards_with_reason(
&htlc.payment_hash,
FailureCode::TemporaryNodeFailure,
);
jit_channel.state = OutboundJITChannelState::PendingInitialPayment {
payment_queue: PaymentQueue::new(),
};
} else {
return Err(APIError::APIMisuseError {
err: "Channel is not in the PendingChannelOpen state.".to_string(),
});
}

jit_channel.state = OutboundJITChannelState::PendingInitialPayment {
payment_queue: PaymentQueue::new(),
};
} else {
return Err(APIError::APIMisuseError {
err: "Channel is not in the PendingChannelOpen state.".to_string(),
});
peer_state.needs_persist |= true;
}

peer_state.needs_persist |= true;

drop(peer_state);
drop(outer_state_lock);

self.persist_peer_state(*counterparty_node_id).await.map_err(|e| {
APIError::APIMisuseError {
err: format!("Failed to persist peer state for {}: {}", counterparty_node_id, e),
Expand All@@ -1268,7 +1265,6 @@ where
/// we need to forward a payment over otherwise it will be ignored.
///
/// [`Event::ChannelReady`]: lightning::events::Event::ChannelReady
#[allow(clippy::await_holding_lock)]
pub async fn channel_ready(
&self, user_channel_id: u128, channel_id: &ChannelId, counterparty_node_id: &PublicKey,
) -> Result<(), APIError> {
Expand All@@ -1277,8 +1273,7 @@ where
let mut peer_by_channel_id = self.peer_by_channel_id.write().unwrap();
peer_by_channel_id.insert(*channel_id, *counterparty_node_id);
}
let outer_state_lock = self.per_peer_state.read().unwrap();
match outer_state_lock.get(counterparty_node_id) {
match self.per_peer_state.read().unwrap().get(counterparty_node_id) {
Some(inner_state_lock) => {
let mut peer_state = inner_state_lock.lock().unwrap();
if let Some(intercept_scid) =
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
LSPS2ServiceHandler API: Avoid explictly dropping locks#4124

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

tnull
merged 1 commit into

from

Sep 25, 2025
 Merged

LSPS2ServiceHandler API: Avoid explictly dropping locks
#4124
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


181 changes: 88 additions & 93 deletions
lightning-liquidity/src/lsps2/service.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -771,16 +771,14 @@ where
	/// [`ChannelManager::create_channel`]: lightning::ln::channelmanager::ChannelManager::create_channel
	/// [`ChannelManager::get_intercept_scid`]: lightning::ln::channelmanager::ChannelManager::get_intercept_scid
	/// [`LSPS2ServiceEvent::BuyRequest`]: crate::lsps2::event::LSPS2ServiceEvent::BuyRequest
	#[allow(clippy::await_holding_lock)]
	pub async fn invoice_parameters_generated(
 &self, counterparty_node_id: &PublicKey, request_id: LSPSRequestId, intercept_scid: u64,
 cltv_expiry_delta: u32, client_trusts_lsp: bool, user_channel_id: u128,
	) -> Result<(), APIError> {
 let mut message_queue_notifier = self.pending_messages.notifier();
 let mut should_persist = false;

 let outer_state_lock = self.per_peer_state.read().unwrap();
 match outer_state_lock.get(counterparty_node_id) {
 match self.per_peer_state.read().unwrap().get(counterparty_node_id) {
 Some(inner_state_lock) => {
 let mut peer_state_lock = inner_state_lock.lock().unwrap();

Expand DownExpand Up@@ -827,8 +825,6 @@ where
 },
 };

 drop(outer_state_lock);

 if should_persist {
 self.persist_peer_state(*counterparty_node_id).await.map_err(|e| {
 APIError::APIMisuseError {
Expand All@@ -855,16 +851,16 @@ where
	///
	/// [`Event::HTLCIntercepted`]: lightning::events::Event::HTLCIntercepted
	/// [`LSPS2ServiceEvent::OpenChannel`]: crate::lsps2::event::LSPS2ServiceEvent::OpenChannel
	#[allow(clippy::await_holding_lock)]
	pub async fn htlc_intercepted(
 &self, intercept_scid: u64, intercept_id: InterceptId, expected_outbound_amount_msat: u64,
 payment_hash: PaymentHash,
	) -> Result<(), APIError> {
 let event_queue_notifier = self.pending_events.notifier();
 let mut should_persist = None;

 let peer_by_intercept_scid = self.peer_by_intercept_scid.read().unwrap();
 if let Some(counterparty_node_id) = peer_by_intercept_scid.get(&intercept_scid) {
 if let Some(counterparty_node_id) =
 self.peer_by_intercept_scid.read().unwrap().get(&intercept_scid)
 {
 let outer_state_lock = self.per_peer_state.read().unwrap();
 match outer_state_lock.get(counterparty_node_id) {
 Some(inner_state_lock) => {
Expand DownExpand Up@@ -939,8 +935,6 @@ where
 }
 }

 drop(peer_by_intercept_scid);

 if let Some(counterparty_node_id) = should_persist {
 self.persist_peer_state(counterparty_node_id).await.map_err(|e| {
 APIError::APIMisuseError {
Expand DownExpand Up@@ -1131,55 +1125,57 @@ where
	/// open, as it only affects the local LSPS2 state and doesn't affect any channels that
	/// might already exist on-chain. Any pending channel open attempts must be managed
	/// separately.
	#[allow(clippy::await_holding_lock)]
	pub async fn channel_open_abandoned(
 &self, counterparty_node_id: &PublicKey, user_channel_id: u128,
	) -> Result<(), APIError> {
 let outer_state_lock = self.per_peer_state.read().unwrap();
 let inner_state_lock =
 outer_state_lock.get(counterparty_node_id).ok_or_else(|| APIError::APIMisuseError {
 err: format!("No counterparty state for: {}", counterparty_node_id),
 })?;
 let mut peer_state = inner_state_lock.lock().unwrap();

 let intercept_scid = peer_state
 .intercept_scid_by_user_channel_id
 .get(&user_channel_id)
 .copied()
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!("Could not find a channel with user_channel_id {}", user_channel_id),
 {
 let outer_state_lock = self.per_peer_state.read().unwrap();
 let inner_state_lock = outer_state_lock.get(counterparty_node_id).ok_or_else(|| {
 APIError::APIMisuseError {
 err: format!("No counterparty state for: {}", counterparty_node_id),
 }
 })?;
 let mut peer_state = inner_state_lock.lock().unwrap();

 let jit_channel = peer_state
 .outbound_channels_by_intercept_scid
 .get(&intercept_scid)
 .ok_or_else(|| APIError::APIMisuseError {
 let intercept_scid = peer_state
 .intercept_scid_by_user_channel_id
 .get(&user_channel_id)
 .copied()
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!(
 "Could not find a channel with user_channel_id {}",
 user_channel_id
 ),
 })?;

 let jit_channel = peer_state
 .outbound_channels_by_intercept_scid
 .get(&intercept_scid)
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!(
 "Failed to map intercept_scid {} for user_channel_id {} to a channel.",
 intercept_scid, user_channel_id,
 ),
 })?;

 let is_pending = matches!(
 jit_channel.state,
 OutboundJITChannelState::PendingInitialPayment { .. }
 | OutboundJITChannelState::PendingChannelOpen { .. }
 );

 if !is_pending {
 return Err(APIError::APIMisuseError {
 err: "Cannot abandon channel open after channel creation or payment forwarding"
 .to_string(),
 });
 }
 let is_pending = matches!(
 jit_channel.state,
 OutboundJITChannelState::PendingInitialPayment { .. }
 | OutboundJITChannelState::PendingChannelOpen { .. }
 );

 peer_state.intercept_scid_by_user_channel_id.remove(&user_channel_id);
 peer_state.outbound_channels_by_intercept_scid.remove(&intercept_scid);
 peer_state.intercept_scid_by_channel_id.retain(|_, &mut scid| scid != intercept_scid);
 peer_state.needs_persist |= true;
 if !is_pending {
 return Err(APIError::APIMisuseError {
 err: "Cannot abandon channel open after channel creation or payment forwarding"
 .to_string(),
 });
 }

 drop(peer_state);
 drop(outer_state_lock);
 peer_state.intercept_scid_by_user_channel_id.remove(&user_channel_id);
 peer_state.outbound_channels_by_intercept_scid.remove(&intercept_scid);
 peer_state.intercept_scid_by_channel_id.retain(|_, &mut scid| scid != intercept_scid);
 peer_state.needs_persist |= true;
 }

 self.persist_peer_state(*counterparty_node_id).await.map_err(|e| {
 APIError::APIMisuseError {
Expand All@@ -1197,62 +1193,63 @@ where
	/// state so that the payer may try the payment again.
	///
	/// [`LSPS2ServiceEvent::OpenChannel`]: crate::lsps2::event::LSPS2ServiceEvent::OpenChannel
	#[allow(clippy::await_holding_lock)]
	pub async fn channel_open_failed(
 &self, counterparty_node_id: &PublicKey, user_channel_id: u128,
	) -> Result<(), APIError> {
 let outer_state_lock = self.per_peer_state.read().unwrap();
 {
 let outer_state_lock = self.per_peer_state.read().unwrap();

 let inner_state_lock =
 outer_state_lock.get(counterparty_node_id).ok_or_else(|| APIError::APIMisuseError {
 err: format!("No counterparty state for: {}", counterparty_node_id),
 let inner_state_lock = outer_state_lock.get(counterparty_node_id).ok_or_else(|| {
 APIError::APIMisuseError {
 err: format!("No counterparty state for: {}", counterparty_node_id),
 }
 })?;

 let mut peer_state = inner_state_lock.lock().unwrap();
let mut peer_state = inner_state_lock.lock().unwrap();

 let intercept_scid = peer_state
 .intercept_scid_by_user_channel_id
 .get(&user_channel_id)
 .copied()
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!("Could not find a channel with user_channel_id {}", user_channel_id),
 })?;
 let intercept_scid = peer_state
 .intercept_scid_by_user_channel_id
 .get(&user_channel_id)
 .copied()
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!(
 "Could not find a channel with user_channel_id {}",
 user_channel_id
 ),
 })?;

 let jit_channel = peer_state
 .outbound_channels_by_intercept_scid
 .get_mut(&intercept_scid)
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!(
 "Failed to map intercept_scid {} for user_channel_id {} to a channel.",
 intercept_scid, user_channel_id,
 ),
 })?;
 let jit_channel = peer_state
 .outbound_channels_by_intercept_scid
 .get_mut(&intercept_scid)
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!(
 "Failed to map intercept_scid {} for user_channel_id {} to a channel.",
 intercept_scid, user_channel_id,
 ),
 })?;

 if let OutboundJITChannelState::PendingChannelOpen { payment_queue, .. } =
 &mut jit_channel.state
 {
 let intercepted_htlcs = payment_queue.clear();
 for htlc in intercepted_htlcs {
 self.channel_manager.get_cm().fail_htlc_backwards_with_reason(
 &htlc.payment_hash,
 FailureCode::TemporaryNodeFailure,
 );
 }

 if let OutboundJITChannelState::PendingChannelOpen { payment_queue, .. } =
 &mut jit_channel.state
 {
 let intercepted_htlcs = payment_queue.clear();
 for htlc in intercepted_htlcs {
 self.channel_manager.get_cm().fail_htlc_backwards_with_reason(
 &htlc.payment_hash,
 FailureCode::TemporaryNodeFailure,
 );
 jit_channel.state = OutboundJITChannelState::PendingInitialPayment {
 payment_queue: PaymentQueue::new(),
 };
 } else {
 return Err(APIError::APIMisuseError {
 err: "Channel is not in the PendingChannelOpen state.".to_string(),
 });
 }

 jit_channel.state = OutboundJITChannelState::PendingInitialPayment {
 payment_queue: PaymentQueue::new(),
 };
 } else {
 return Err(APIError::APIMisuseError {
 err: "Channel is not in the PendingChannelOpen state.".to_string(),
 });
 peer_state.needs_persist |= true;
 }

 peer_state.needs_persist |= true;

 drop(peer_state);
 drop(outer_state_lock);

 self.persist_peer_state(*counterparty_node_id).await.map_err(|e| {
 APIError::APIMisuseError {
 err: format!("Failed to persist peer state for {}: {}", counterparty_node_id, e),
Expand All@@ -1268,7 +1265,6 @@ where
	/// we need to forward a payment over otherwise it will be ignored.
	///
	/// [`Event::ChannelReady`]: lightning::events::Event::ChannelReady
	#[allow(clippy::await_holding_lock)]
	pub async fn channel_ready(
 &self, user_channel_id: u128, channel_id: &ChannelId, counterparty_node_id: &PublicKey,
	) -> Result<(), APIError> {
Expand All@@ -1277,8 +1273,7 @@ where
 let mut peer_by_channel_id = self.peer_by_channel_id.write().unwrap();
 peer_by_channel_id.insert(*channel_id, *counterparty_node_id);
 }
 let outer_state_lock = self.per_peer_state.read().unwrap();
 match outer_state_lock.get(counterparty_node_id) {
 match self.per_peer_state.read().unwrap().get(counterparty_node_id) {
 Some(inner_state_lock) => {
 let mut peer_state = inner_state_lock.lock().unwrap();
 if let Some(intercept_scid) =
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
LSPS2ServiceHandler API: Avoid explictly dropping locks#4124

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

tnull
merged 1 commit into

from

Sep 25, 2025
 Merged

LSPS2ServiceHandler API: Avoid explictly dropping locks
#4124
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


181 changes: 88 additions & 93 deletions
lightning-liquidity/src/lsps2/service.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -771,16 +771,14 @@ where
	/// [`ChannelManager::create_channel`]: lightning::ln::channelmanager::ChannelManager::create_channel
	/// [`ChannelManager::get_intercept_scid`]: lightning::ln::channelmanager::ChannelManager::get_intercept_scid
	/// [`LSPS2ServiceEvent::BuyRequest`]: crate::lsps2::event::LSPS2ServiceEvent::BuyRequest
	#[allow(clippy::await_holding_lock)]
	pub async fn invoice_parameters_generated(
 &self, counterparty_node_id: &PublicKey, request_id: LSPSRequestId, intercept_scid: u64,
 cltv_expiry_delta: u32, client_trusts_lsp: bool, user_channel_id: u128,
	) -> Result<(), APIError> {
 let mut message_queue_notifier = self.pending_messages.notifier();
 let mut should_persist = false;

 let outer_state_lock = self.per_peer_state.read().unwrap();
 match outer_state_lock.get(counterparty_node_id) {
 match self.per_peer_state.read().unwrap().get(counterparty_node_id) {
 Some(inner_state_lock) => {
 let mut peer_state_lock = inner_state_lock.lock().unwrap();

Expand DownExpand Up@@ -827,8 +825,6 @@ where
 },
 };

 drop(outer_state_lock);

 if should_persist {
 self.persist_peer_state(*counterparty_node_id).await.map_err(|e| {
 APIError::APIMisuseError {
Expand All@@ -855,16 +851,16 @@ where
	///
	/// [`Event::HTLCIntercepted`]: lightning::events::Event::HTLCIntercepted
	/// [`LSPS2ServiceEvent::OpenChannel`]: crate::lsps2::event::LSPS2ServiceEvent::OpenChannel
	#[allow(clippy::await_holding_lock)]
	pub async fn htlc_intercepted(
 &self, intercept_scid: u64, intercept_id: InterceptId, expected_outbound_amount_msat: u64,
 payment_hash: PaymentHash,
	) -> Result<(), APIError> {
 let event_queue_notifier = self.pending_events.notifier();
 let mut should_persist = None;

 let peer_by_intercept_scid = self.peer_by_intercept_scid.read().unwrap();
 if let Some(counterparty_node_id) = peer_by_intercept_scid.get(&intercept_scid) {
 if let Some(counterparty_node_id) =
 self.peer_by_intercept_scid.read().unwrap().get(&intercept_scid)
 {
 let outer_state_lock = self.per_peer_state.read().unwrap();
 match outer_state_lock.get(counterparty_node_id) {
 Some(inner_state_lock) => {
Expand DownExpand Up@@ -939,8 +935,6 @@ where
 }
 }

 drop(peer_by_intercept_scid);

 if let Some(counterparty_node_id) = should_persist {
 self.persist_peer_state(counterparty_node_id).await.map_err(|e| {
 APIError::APIMisuseError {
Expand DownExpand Up@@ -1131,55 +1125,57 @@ where
	/// open, as it only affects the local LSPS2 state and doesn't affect any channels that
	/// might already exist on-chain. Any pending channel open attempts must be managed
	/// separately.
	#[allow(clippy::await_holding_lock)]
	pub async fn channel_open_abandoned(
 &self, counterparty_node_id: &PublicKey, user_channel_id: u128,
	) -> Result<(), APIError> {
 let outer_state_lock = self.per_peer_state.read().unwrap();
 let inner_state_lock =
 outer_state_lock.get(counterparty_node_id).ok_or_else(|| APIError::APIMisuseError {
 err: format!("No counterparty state for: {}", counterparty_node_id),
 })?;
 let mut peer_state = inner_state_lock.lock().unwrap();

 let intercept_scid = peer_state
 .intercept_scid_by_user_channel_id
 .get(&user_channel_id)
 .copied()
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!("Could not find a channel with user_channel_id {}", user_channel_id),
 {
 let outer_state_lock = self.per_peer_state.read().unwrap();
 let inner_state_lock = outer_state_lock.get(counterparty_node_id).ok_or_else(|| {
 APIError::APIMisuseError {
 err: format!("No counterparty state for: {}", counterparty_node_id),
 }
 })?;
 let mut peer_state = inner_state_lock.lock().unwrap();

 let jit_channel = peer_state
 .outbound_channels_by_intercept_scid
 .get(&intercept_scid)
 .ok_or_else(|| APIError::APIMisuseError {
 let intercept_scid = peer_state
 .intercept_scid_by_user_channel_id
 .get(&user_channel_id)
 .copied()
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!(
 "Could not find a channel with user_channel_id {}",
 user_channel_id
 ),
 })?;

 let jit_channel = peer_state
 .outbound_channels_by_intercept_scid
 .get(&intercept_scid)
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!(
 "Failed to map intercept_scid {} for user_channel_id {} to a channel.",
 intercept_scid, user_channel_id,
 ),
 })?;

 let is_pending = matches!(
 jit_channel.state,
 OutboundJITChannelState::PendingInitialPayment { .. }
 | OutboundJITChannelState::PendingChannelOpen { .. }
 );

 if !is_pending {
 return Err(APIError::APIMisuseError {
 err: "Cannot abandon channel open after channel creation or payment forwarding"
 .to_string(),
 });
 }
 let is_pending = matches!(
 jit_channel.state,
 OutboundJITChannelState::PendingInitialPayment { .. }
 | OutboundJITChannelState::PendingChannelOpen { .. }
 );

 peer_state.intercept_scid_by_user_channel_id.remove(&user_channel_id);
 peer_state.outbound_channels_by_intercept_scid.remove(&intercept_scid);
 peer_state.intercept_scid_by_channel_id.retain(|_, &mut scid| scid != intercept_scid);
 peer_state.needs_persist |= true;
 if !is_pending {
 return Err(APIError::APIMisuseError {
 err: "Cannot abandon channel open after channel creation or payment forwarding"
 .to_string(),
 });
 }

 drop(peer_state);
 drop(outer_state_lock);
 peer_state.intercept_scid_by_user_channel_id.remove(&user_channel_id);
 peer_state.outbound_channels_by_intercept_scid.remove(&intercept_scid);
 peer_state.intercept_scid_by_channel_id.retain(|_, &mut scid| scid != intercept_scid);
 peer_state.needs_persist |= true;
 }

 self.persist_peer_state(*counterparty_node_id).await.map_err(|e| {
 APIError::APIMisuseError {
Expand All@@ -1197,62 +1193,63 @@ where
	/// state so that the payer may try the payment again.
	///
	/// [`LSPS2ServiceEvent::OpenChannel`]: crate::lsps2::event::LSPS2ServiceEvent::OpenChannel
	#[allow(clippy::await_holding_lock)]
	pub async fn channel_open_failed(
 &self, counterparty_node_id: &PublicKey, user_channel_id: u128,
	) -> Result<(), APIError> {
 let outer_state_lock = self.per_peer_state.read().unwrap();
 {
 let outer_state_lock = self.per_peer_state.read().unwrap();

 let inner_state_lock =
 outer_state_lock.get(counterparty_node_id).ok_or_else(|| APIError::APIMisuseError {
 err: format!("No counterparty state for: {}", counterparty_node_id),
 let inner_state_lock = outer_state_lock.get(counterparty_node_id).ok_or_else(|| {
 APIError::APIMisuseError {
 err: format!("No counterparty state for: {}", counterparty_node_id),
 }
 })?;

 let mut peer_state = inner_state_lock.lock().unwrap();
let mut peer_state = inner_state_lock.lock().unwrap();

 let intercept_scid = peer_state
 .intercept_scid_by_user_channel_id
 .get(&user_channel_id)
 .copied()
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!("Could not find a channel with user_channel_id {}", user_channel_id),
 })?;
 let intercept_scid = peer_state
 .intercept_scid_by_user_channel_id
 .get(&user_channel_id)
 .copied()
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!(
 "Could not find a channel with user_channel_id {}",
 user_channel_id
 ),
 })?;

 let jit_channel = peer_state
 .outbound_channels_by_intercept_scid
 .get_mut(&intercept_scid)
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!(
 "Failed to map intercept_scid {} for user_channel_id {} to a channel.",
 intercept_scid, user_channel_id,
 ),
 })?;
 let jit_channel = peer_state
 .outbound_channels_by_intercept_scid
 .get_mut(&intercept_scid)
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!(
 "Failed to map intercept_scid {} for user_channel_id {} to a channel.",
 intercept_scid, user_channel_id,
 ),
 })?;

 if let OutboundJITChannelState::PendingChannelOpen { payment_queue, .. } =
 &mut jit_channel.state
 {
 let intercepted_htlcs = payment_queue.clear();
 for htlc in intercepted_htlcs {
 self.channel_manager.get_cm().fail_htlc_backwards_with_reason(
 &htlc.payment_hash,
 FailureCode::TemporaryNodeFailure,
 );
 }

 if let OutboundJITChannelState::PendingChannelOpen { payment_queue, .. } =
 &mut jit_channel.state
 {
 let intercepted_htlcs = payment_queue.clear();
 for htlc in intercepted_htlcs {
 self.channel_manager.get_cm().fail_htlc_backwards_with_reason(
 &htlc.payment_hash,
 FailureCode::TemporaryNodeFailure,
 );
 jit_channel.state = OutboundJITChannelState::PendingInitialPayment {
 payment_queue: PaymentQueue::new(),
 };
 } else {
 return Err(APIError::APIMisuseError {
 err: "Channel is not in the PendingChannelOpen state.".to_string(),
 });
 }

 jit_channel.state = OutboundJITChannelState::PendingInitialPayment {
 payment_queue: PaymentQueue::new(),
 };
 } else {
 return Err(APIError::APIMisuseError {
 err: "Channel is not in the PendingChannelOpen state.".to_string(),
 });
 peer_state.needs_persist |= true;
 }

 peer_state.needs_persist |= true;

 drop(peer_state);
 drop(outer_state_lock);

 self.persist_peer_state(*counterparty_node_id).await.map_err(|e| {
 APIError::APIMisuseError {
 err: format!("Failed to persist peer state for {}: {}", counterparty_node_id, e),
Expand All@@ -1268,7 +1265,6 @@ where
	/// we need to forward a payment over otherwise it will be ignored.
	///
	/// [`Event::ChannelReady`]: lightning::events::Event::ChannelReady
	#[allow(clippy::await_holding_lock)]
	pub async fn channel_ready(
 &self, user_channel_id: u128, channel_id: &ChannelId, counterparty_node_id: &PublicKey,
	) -> Result<(), APIError> {
Expand All@@ -1277,8 +1273,7 @@ where
 let mut peer_by_channel_id = self.peer_by_channel_id.write().unwrap();
 peer_by_channel_id.insert(*channel_id, *counterparty_node_id);
 }
 let outer_state_lock = self.per_peer_state.read().unwrap();
 match outer_state_lock.get(counterparty_node_id) {
 match self.per_peer_state.read().unwrap().get(counterparty_node_id) {
 Some(inner_state_lock) => {
 let mut peer_state = inner_state_lock.lock().unwrap();
 if let Some(intercept_scid) =
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
LSPS2ServiceHandler API: Avoid explictly dropping locks#4124

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

tnull
merged 1 commit into

from

Sep 25, 2025
 Merged

LSPS2ServiceHandler API: Avoid explictly dropping locks
#4124
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


181 changes: 88 additions & 93 deletions
lightning-liquidity/src/lsps2/service.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -771,16 +771,14 @@ where
	/// [`ChannelManager::create_channel`]: lightning::ln::channelmanager::ChannelManager::create_channel
	/// [`ChannelManager::get_intercept_scid`]: lightning::ln::channelmanager::ChannelManager::get_intercept_scid
	/// [`LSPS2ServiceEvent::BuyRequest`]: crate::lsps2::event::LSPS2ServiceEvent::BuyRequest
	#[allow(clippy::await_holding_lock)]
	pub async fn invoice_parameters_generated(
 &self, counterparty_node_id: &PublicKey, request_id: LSPSRequestId, intercept_scid: u64,
 cltv_expiry_delta: u32, client_trusts_lsp: bool, user_channel_id: u128,
	) -> Result<(), APIError> {
 let mut message_queue_notifier = self.pending_messages.notifier();
 let mut should_persist = false;

 let outer_state_lock = self.per_peer_state.read().unwrap();
 match outer_state_lock.get(counterparty_node_id) {
 match self.per_peer_state.read().unwrap().get(counterparty_node_id) {
 Some(inner_state_lock) => {
 let mut peer_state_lock = inner_state_lock.lock().unwrap();

Expand DownExpand Up@@ -827,8 +825,6 @@ where
 },
 };

 drop(outer_state_lock);

 if should_persist {
 self.persist_peer_state(*counterparty_node_id).await.map_err(|e| {
 APIError::APIMisuseError {
Expand All@@ -855,16 +851,16 @@ where
	///
	/// [`Event::HTLCIntercepted`]: lightning::events::Event::HTLCIntercepted
	/// [`LSPS2ServiceEvent::OpenChannel`]: crate::lsps2::event::LSPS2ServiceEvent::OpenChannel
	#[allow(clippy::await_holding_lock)]
	pub async fn htlc_intercepted(
 &self, intercept_scid: u64, intercept_id: InterceptId, expected_outbound_amount_msat: u64,
 payment_hash: PaymentHash,
	) -> Result<(), APIError> {
 let event_queue_notifier = self.pending_events.notifier();
 let mut should_persist = None;

 let peer_by_intercept_scid = self.peer_by_intercept_scid.read().unwrap();
 if let Some(counterparty_node_id) = peer_by_intercept_scid.get(&intercept_scid) {
 if let Some(counterparty_node_id) =
 self.peer_by_intercept_scid.read().unwrap().get(&intercept_scid)
 {
 let outer_state_lock = self.per_peer_state.read().unwrap();
 match outer_state_lock.get(counterparty_node_id) {
 Some(inner_state_lock) => {
Expand DownExpand Up@@ -939,8 +935,6 @@ where
 }
 }

 drop(peer_by_intercept_scid);

 if let Some(counterparty_node_id) = should_persist {
 self.persist_peer_state(counterparty_node_id).await.map_err(|e| {
 APIError::APIMisuseError {
Expand DownExpand Up@@ -1131,55 +1125,57 @@ where
	/// open, as it only affects the local LSPS2 state and doesn't affect any channels that
	/// might already exist on-chain. Any pending channel open attempts must be managed
	/// separately.
	#[allow(clippy::await_holding_lock)]
	pub async fn channel_open_abandoned(
 &self, counterparty_node_id: &PublicKey, user_channel_id: u128,
	) -> Result<(), APIError> {
 let outer_state_lock = self.per_peer_state.read().unwrap();
 let inner_state_lock =
 outer_state_lock.get(counterparty_node_id).ok_or_else(|| APIError::APIMisuseError {
 err: format!("No counterparty state for: {}", counterparty_node_id),
 })?;
 let mut peer_state = inner_state_lock.lock().unwrap();

 let intercept_scid = peer_state
 .intercept_scid_by_user_channel_id
 .get(&user_channel_id)
 .copied()
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!("Could not find a channel with user_channel_id {}", user_channel_id),
 {
 let outer_state_lock = self.per_peer_state.read().unwrap();
 let inner_state_lock = outer_state_lock.get(counterparty_node_id).ok_or_else(|| {
 APIError::APIMisuseError {
 err: format!("No counterparty state for: {}", counterparty_node_id),
 }
 })?;
 let mut peer_state = inner_state_lock.lock().unwrap();

 let jit_channel = peer_state
 .outbound_channels_by_intercept_scid
 .get(&intercept_scid)
 .ok_or_else(|| APIError::APIMisuseError {
 let intercept_scid = peer_state
 .intercept_scid_by_user_channel_id
 .get(&user_channel_id)
 .copied()
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!(
 "Could not find a channel with user_channel_id {}",
 user_channel_id
 ),
 })?;

 let jit_channel = peer_state
 .outbound_channels_by_intercept_scid
 .get(&intercept_scid)
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!(
 "Failed to map intercept_scid {} for user_channel_id {} to a channel.",
 intercept_scid, user_channel_id,
 ),
 })?;

 let is_pending = matches!(
 jit_channel.state,
 OutboundJITChannelState::PendingInitialPayment { .. }
 | OutboundJITChannelState::PendingChannelOpen { .. }
 );

 if !is_pending {
 return Err(APIError::APIMisuseError {
 err: "Cannot abandon channel open after channel creation or payment forwarding"
 .to_string(),
 });
 }
 let is_pending = matches!(
 jit_channel.state,
 OutboundJITChannelState::PendingInitialPayment { .. }
 | OutboundJITChannelState::PendingChannelOpen { .. }
 );

 peer_state.intercept_scid_by_user_channel_id.remove(&user_channel_id);
 peer_state.outbound_channels_by_intercept_scid.remove(&intercept_scid);
 peer_state.intercept_scid_by_channel_id.retain(|_, &mut scid| scid != intercept_scid);
 peer_state.needs_persist |= true;
 if !is_pending {
 return Err(APIError::APIMisuseError {
 err: "Cannot abandon channel open after channel creation or payment forwarding"
 .to_string(),
 });
 }

 drop(peer_state);
 drop(outer_state_lock);
 peer_state.intercept_scid_by_user_channel_id.remove(&user_channel_id);
 peer_state.outbound_channels_by_intercept_scid.remove(&intercept_scid);
 peer_state.intercept_scid_by_channel_id.retain(|_, &mut scid| scid != intercept_scid);
 peer_state.needs_persist |= true;
 }

 self.persist_peer_state(*counterparty_node_id).await.map_err(|e| {
 APIError::APIMisuseError {
Expand All@@ -1197,62 +1193,63 @@ where
	/// state so that the payer may try the payment again.
	///
	/// [`LSPS2ServiceEvent::OpenChannel`]: crate::lsps2::event::LSPS2ServiceEvent::OpenChannel
	#[allow(clippy::await_holding_lock)]
	pub async fn channel_open_failed(
 &self, counterparty_node_id: &PublicKey, user_channel_id: u128,
	) -> Result<(), APIError> {
 let outer_state_lock = self.per_peer_state.read().unwrap();
 {
 let outer_state_lock = self.per_peer_state.read().unwrap();

 let inner_state_lock =
 outer_state_lock.get(counterparty_node_id).ok_or_else(|| APIError::APIMisuseError {
 err: format!("No counterparty state for: {}", counterparty_node_id),
 let inner_state_lock = outer_state_lock.get(counterparty_node_id).ok_or_else(|| {
 APIError::APIMisuseError {
 err: format!("No counterparty state for: {}", counterparty_node_id),
 }
 })?;

 let mut peer_state = inner_state_lock.lock().unwrap();
let mut peer_state = inner_state_lock.lock().unwrap();

 let intercept_scid = peer_state
 .intercept_scid_by_user_channel_id
 .get(&user_channel_id)
 .copied()
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!("Could not find a channel with user_channel_id {}", user_channel_id),
 })?;
 let intercept_scid = peer_state
 .intercept_scid_by_user_channel_id
 .get(&user_channel_id)
 .copied()
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!(
 "Could not find a channel with user_channel_id {}",
 user_channel_id
 ),
 })?;

 let jit_channel = peer_state
 .outbound_channels_by_intercept_scid
 .get_mut(&intercept_scid)
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!(
 "Failed to map intercept_scid {} for user_channel_id {} to a channel.",
 intercept_scid, user_channel_id,
 ),
 })?;
 let jit_channel = peer_state
 .outbound_channels_by_intercept_scid
 .get_mut(&intercept_scid)
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!(
 "Failed to map intercept_scid {} for user_channel_id {} to a channel.",
 intercept_scid, user_channel_id,
 ),
 })?;

 if let OutboundJITChannelState::PendingChannelOpen { payment_queue, .. } =
 &mut jit_channel.state
 {
 let intercepted_htlcs = payment_queue.clear();
 for htlc in intercepted_htlcs {
 self.channel_manager.get_cm().fail_htlc_backwards_with_reason(
 &htlc.payment_hash,
 FailureCode::TemporaryNodeFailure,
 );
 }

 if let OutboundJITChannelState::PendingChannelOpen { payment_queue, .. } =
 &mut jit_channel.state
 {
 let intercepted_htlcs = payment_queue.clear();
 for htlc in intercepted_htlcs {
 self.channel_manager.get_cm().fail_htlc_backwards_with_reason(
 &htlc.payment_hash,
 FailureCode::TemporaryNodeFailure,
 );
 jit_channel.state = OutboundJITChannelState::PendingInitialPayment {
 payment_queue: PaymentQueue::new(),
 };
 } else {
 return Err(APIError::APIMisuseError {
 err: "Channel is not in the PendingChannelOpen state.".to_string(),
 });
 }

 jit_channel.state = OutboundJITChannelState::PendingInitialPayment {
 payment_queue: PaymentQueue::new(),
 };
 } else {
 return Err(APIError::APIMisuseError {
 err: "Channel is not in the PendingChannelOpen state.".to_string(),
 });
 peer_state.needs_persist |= true;
 }

 peer_state.needs_persist |= true;

 drop(peer_state);
 drop(outer_state_lock);

 self.persist_peer_state(*counterparty_node_id).await.map_err(|e| {
 APIError::APIMisuseError {
 err: format!("Failed to persist peer state for {}: {}", counterparty_node_id, e),
Expand All@@ -1268,7 +1265,6 @@ where
	/// we need to forward a payment over otherwise it will be ignored.
	///
	/// [`Event::ChannelReady`]: lightning::events::Event::ChannelReady
	#[allow(clippy::await_holding_lock)]
	pub async fn channel_ready(
 &self, user_channel_id: u128, channel_id: &ChannelId, counterparty_node_id: &PublicKey,
	) -> Result<(), APIError> {
Expand All@@ -1277,8 +1273,7 @@ where
 let mut peer_by_channel_id = self.peer_by_channel_id.write().unwrap();
 peer_by_channel_id.insert(*channel_id, *counterparty_node_id);
 }
 let outer_state_lock = self.per_peer_state.read().unwrap();
 match outer_state_lock.get(counterparty_node_id) {
 match self.per_peer_state.read().unwrap().get(counterparty_node_id) {
 Some(inner_state_lock) => {
 let mut peer_state = inner_state_lock.lock().unwrap();
 if let Some(intercept_scid) =
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
LSPS2ServiceHandler API: Avoid explictly dropping locks#4124

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

tnull
merged 1 commit into

from

Sep 25, 2025
 Merged

LSPS2ServiceHandler API: Avoid explictly dropping locks
#4124
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


181 changes: 88 additions & 93 deletions
lightning-liquidity/src/lsps2/service.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -771,16 +771,14 @@ where
	/// [`ChannelManager::create_channel`]: lightning::ln::channelmanager::ChannelManager::create_channel
	/// [`ChannelManager::get_intercept_scid`]: lightning::ln::channelmanager::ChannelManager::get_intercept_scid
	/// [`LSPS2ServiceEvent::BuyRequest`]: crate::lsps2::event::LSPS2ServiceEvent::BuyRequest
	#[allow(clippy::await_holding_lock)]
	pub async fn invoice_parameters_generated(
 &self, counterparty_node_id: &PublicKey, request_id: LSPSRequestId, intercept_scid: u64,
 cltv_expiry_delta: u32, client_trusts_lsp: bool, user_channel_id: u128,
	) -> Result<(), APIError> {
 let mut message_queue_notifier = self.pending_messages.notifier();
 let mut should_persist = false;

 let outer_state_lock = self.per_peer_state.read().unwrap();
 match outer_state_lock.get(counterparty_node_id) {
 match self.per_peer_state.read().unwrap().get(counterparty_node_id) {
 Some(inner_state_lock) => {
 let mut peer_state_lock = inner_state_lock.lock().unwrap();

Expand DownExpand Up@@ -827,8 +825,6 @@ where
 },
 };

 drop(outer_state_lock);

 if should_persist {
 self.persist_peer_state(*counterparty_node_id).await.map_err(|e| {
 APIError::APIMisuseError {
Expand All@@ -855,16 +851,16 @@ where
	///
	/// [`Event::HTLCIntercepted`]: lightning::events::Event::HTLCIntercepted
	/// [`LSPS2ServiceEvent::OpenChannel`]: crate::lsps2::event::LSPS2ServiceEvent::OpenChannel
	#[allow(clippy::await_holding_lock)]
	pub async fn htlc_intercepted(
 &self, intercept_scid: u64, intercept_id: InterceptId, expected_outbound_amount_msat: u64,
 payment_hash: PaymentHash,
	) -> Result<(), APIError> {
 let event_queue_notifier = self.pending_events.notifier();
 let mut should_persist = None;

 let peer_by_intercept_scid = self.peer_by_intercept_scid.read().unwrap();
 if let Some(counterparty_node_id) = peer_by_intercept_scid.get(&intercept_scid) {
 if let Some(counterparty_node_id) =
 self.peer_by_intercept_scid.read().unwrap().get(&intercept_scid)
 {
 let outer_state_lock = self.per_peer_state.read().unwrap();
 match outer_state_lock.get(counterparty_node_id) {
 Some(inner_state_lock) => {
Expand DownExpand Up@@ -939,8 +935,6 @@ where
 }
 }

 drop(peer_by_intercept_scid);

 if let Some(counterparty_node_id) = should_persist {
 self.persist_peer_state(counterparty_node_id).await.map_err(|e| {
 APIError::APIMisuseError {
Expand DownExpand Up@@ -1131,55 +1125,57 @@ where
	/// open, as it only affects the local LSPS2 state and doesn't affect any channels that
	/// might already exist on-chain. Any pending channel open attempts must be managed
	/// separately.
	#[allow(clippy::await_holding_lock)]
	pub async fn channel_open_abandoned(
 &self, counterparty_node_id: &PublicKey, user_channel_id: u128,
	) -> Result<(), APIError> {
 let outer_state_lock = self.per_peer_state.read().unwrap();
 let inner_state_lock =
 outer_state_lock.get(counterparty_node_id).ok_or_else(|| APIError::APIMisuseError {
 err: format!("No counterparty state for: {}", counterparty_node_id),
 })?;
 let mut peer_state = inner_state_lock.lock().unwrap();

 let intercept_scid = peer_state
 .intercept_scid_by_user_channel_id
 .get(&user_channel_id)
 .copied()
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!("Could not find a channel with user_channel_id {}", user_channel_id),
 {
 let outer_state_lock = self.per_peer_state.read().unwrap();
 let inner_state_lock = outer_state_lock.get(counterparty_node_id).ok_or_else(|| {
 APIError::APIMisuseError {
 err: format!("No counterparty state for: {}", counterparty_node_id),
 }
 })?;
 let mut peer_state = inner_state_lock.lock().unwrap();

 let jit_channel = peer_state
 .outbound_channels_by_intercept_scid
 .get(&intercept_scid)
 .ok_or_else(|| APIError::APIMisuseError {
 let intercept_scid = peer_state
 .intercept_scid_by_user_channel_id
 .get(&user_channel_id)
 .copied()
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!(
 "Could not find a channel with user_channel_id {}",
 user_channel_id
 ),
 })?;

 let jit_channel = peer_state
 .outbound_channels_by_intercept_scid
 .get(&intercept_scid)
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!(
 "Failed to map intercept_scid {} for user_channel_id {} to a channel.",
 intercept_scid, user_channel_id,
 ),
 })?;

 let is_pending = matches!(
 jit_channel.state,
 OutboundJITChannelState::PendingInitialPayment { .. }
 | OutboundJITChannelState::PendingChannelOpen { .. }
 );

 if !is_pending {
 return Err(APIError::APIMisuseError {
 err: "Cannot abandon channel open after channel creation or payment forwarding"
 .to_string(),
 });
 }
 let is_pending = matches!(
 jit_channel.state,
 OutboundJITChannelState::PendingInitialPayment { .. }
 | OutboundJITChannelState::PendingChannelOpen { .. }
 );

 peer_state.intercept_scid_by_user_channel_id.remove(&user_channel_id);
 peer_state.outbound_channels_by_intercept_scid.remove(&intercept_scid);
 peer_state.intercept_scid_by_channel_id.retain(|_, &mut scid| scid != intercept_scid);
 peer_state.needs_persist |= true;
 if !is_pending {
 return Err(APIError::APIMisuseError {
 err: "Cannot abandon channel open after channel creation or payment forwarding"
 .to_string(),
 });
 }

 drop(peer_state);
 drop(outer_state_lock);
 peer_state.intercept_scid_by_user_channel_id.remove(&user_channel_id);
 peer_state.outbound_channels_by_intercept_scid.remove(&intercept_scid);
 peer_state.intercept_scid_by_channel_id.retain(|_, &mut scid| scid != intercept_scid);
 peer_state.needs_persist |= true;
 }

 self.persist_peer_state(*counterparty_node_id).await.map_err(|e| {
 APIError::APIMisuseError {
Expand All@@ -1197,62 +1193,63 @@ where
	/// state so that the payer may try the payment again.
	///
	/// [`LSPS2ServiceEvent::OpenChannel`]: crate::lsps2::event::LSPS2ServiceEvent::OpenChannel
	#[allow(clippy::await_holding_lock)]
	pub async fn channel_open_failed(
 &self, counterparty_node_id: &PublicKey, user_channel_id: u128,
	) -> Result<(), APIError> {
 let outer_state_lock = self.per_peer_state.read().unwrap();
 {
 let outer_state_lock = self.per_peer_state.read().unwrap();

 let inner_state_lock =
 outer_state_lock.get(counterparty_node_id).ok_or_else(|| APIError::APIMisuseError {
 err: format!("No counterparty state for: {}", counterparty_node_id),
 let inner_state_lock = outer_state_lock.get(counterparty_node_id).ok_or_else(|| {
 APIError::APIMisuseError {
 err: format!("No counterparty state for: {}", counterparty_node_id),
 }
 })?;

 let mut peer_state = inner_state_lock.lock().unwrap();
let mut peer_state = inner_state_lock.lock().unwrap();

 let intercept_scid = peer_state
 .intercept_scid_by_user_channel_id
 .get(&user_channel_id)
 .copied()
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!("Could not find a channel with user_channel_id {}", user_channel_id),
 })?;
 let intercept_scid = peer_state
 .intercept_scid_by_user_channel_id
 .get(&user_channel_id)
 .copied()
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!(
 "Could not find a channel with user_channel_id {}",
 user_channel_id
 ),
 })?;

 let jit_channel = peer_state
 .outbound_channels_by_intercept_scid
 .get_mut(&intercept_scid)
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!(
 "Failed to map intercept_scid {} for user_channel_id {} to a channel.",
 intercept_scid, user_channel_id,
 ),
 })?;
 let jit_channel = peer_state
 .outbound_channels_by_intercept_scid
 .get_mut(&intercept_scid)
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!(
 "Failed to map intercept_scid {} for user_channel_id {} to a channel.",
 intercept_scid, user_channel_id,
 ),
 })?;

 if let OutboundJITChannelState::PendingChannelOpen { payment_queue, .. } =
 &mut jit_channel.state
 {
 let intercepted_htlcs = payment_queue.clear();
 for htlc in intercepted_htlcs {
 self.channel_manager.get_cm().fail_htlc_backwards_with_reason(
 &htlc.payment_hash,
 FailureCode::TemporaryNodeFailure,
 );
 }

 if let OutboundJITChannelState::PendingChannelOpen { payment_queue, .. } =
 &mut jit_channel.state
 {
 let intercepted_htlcs = payment_queue.clear();
 for htlc in intercepted_htlcs {
 self.channel_manager.get_cm().fail_htlc_backwards_with_reason(
 &htlc.payment_hash,
 FailureCode::TemporaryNodeFailure,
 );
 jit_channel.state = OutboundJITChannelState::PendingInitialPayment {
 payment_queue: PaymentQueue::new(),
 };
 } else {
 return Err(APIError::APIMisuseError {
 err: "Channel is not in the PendingChannelOpen state.".to_string(),
 });
 }

 jit_channel.state = OutboundJITChannelState::PendingInitialPayment {
 payment_queue: PaymentQueue::new(),
 };
 } else {
 return Err(APIError::APIMisuseError {
 err: "Channel is not in the PendingChannelOpen state.".to_string(),
 });
 peer_state.needs_persist |= true;
 }

 peer_state.needs_persist |= true;

 drop(peer_state);
 drop(outer_state_lock);

 self.persist_peer_state(*counterparty_node_id).await.map_err(|e| {
 APIError::APIMisuseError {
 err: format!("Failed to persist peer state for {}: {}", counterparty_node_id, e),
Expand All@@ -1268,7 +1265,6 @@ where
	/// we need to forward a payment over otherwise it will be ignored.
	///
	/// [`Event::ChannelReady`]: lightning::events::Event::ChannelReady
	#[allow(clippy::await_holding_lock)]
	pub async fn channel_ready(
 &self, user_channel_id: u128, channel_id: &ChannelId, counterparty_node_id: &PublicKey,
	) -> Result<(), APIError> {
Expand All@@ -1277,8 +1273,7 @@ where
 let mut peer_by_channel_id = self.peer_by_channel_id.write().unwrap();
 peer_by_channel_id.insert(*channel_id, *counterparty_node_id);
 }
 let outer_state_lock = self.per_peer_state.read().unwrap();
 match outer_state_lock.get(counterparty_node_id) {
 match self.per_peer_state.read().unwrap().get(counterparty_node_id) {
 Some(inner_state_lock) => {
 let mut peer_state = inner_state_lock.lock().unwrap();
 if let Some(intercept_scid) =
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
LSPS2ServiceHandler API: Avoid explictly dropping locks#4124

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

tnull
merged 1 commit into

from

Sep 25, 2025
 Merged

LSPS2ServiceHandler API: Avoid explictly dropping locks
#4124
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


181 changes: 88 additions & 93 deletions
lightning-liquidity/src/lsps2/service.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -771,16 +771,14 @@ where
	/// [`ChannelManager::create_channel`]: lightning::ln::channelmanager::ChannelManager::create_channel
	/// [`ChannelManager::get_intercept_scid`]: lightning::ln::channelmanager::ChannelManager::get_intercept_scid
	/// [`LSPS2ServiceEvent::BuyRequest`]: crate::lsps2::event::LSPS2ServiceEvent::BuyRequest
	#[allow(clippy::await_holding_lock)]
	pub async fn invoice_parameters_generated(
 &self, counterparty_node_id: &PublicKey, request_id: LSPSRequestId, intercept_scid: u64,
 cltv_expiry_delta: u32, client_trusts_lsp: bool, user_channel_id: u128,
	) -> Result<(), APIError> {
 let mut message_queue_notifier = self.pending_messages.notifier();
 let mut should_persist = false;

 let outer_state_lock = self.per_peer_state.read().unwrap();
 match outer_state_lock.get(counterparty_node_id) {
 match self.per_peer_state.read().unwrap().get(counterparty_node_id) {
 Some(inner_state_lock) => {
 let mut peer_state_lock = inner_state_lock.lock().unwrap();

Expand DownExpand Up@@ -827,8 +825,6 @@ where
 },
 };

 drop(outer_state_lock);

 if should_persist {
 self.persist_peer_state(*counterparty_node_id).await.map_err(|e| {
 APIError::APIMisuseError {
Expand All@@ -855,16 +851,16 @@ where
	///
	/// [`Event::HTLCIntercepted`]: lightning::events::Event::HTLCIntercepted
	/// [`LSPS2ServiceEvent::OpenChannel`]: crate::lsps2::event::LSPS2ServiceEvent::OpenChannel
	#[allow(clippy::await_holding_lock)]
	pub async fn htlc_intercepted(
 &self, intercept_scid: u64, intercept_id: InterceptId, expected_outbound_amount_msat: u64,
 payment_hash: PaymentHash,
	) -> Result<(), APIError> {
 let event_queue_notifier = self.pending_events.notifier();
 let mut should_persist = None;

 let peer_by_intercept_scid = self.peer_by_intercept_scid.read().unwrap();
 if let Some(counterparty_node_id) = peer_by_intercept_scid.get(&intercept_scid) {
 if let Some(counterparty_node_id) =
 self.peer_by_intercept_scid.read().unwrap().get(&intercept_scid)
 {
 let outer_state_lock = self.per_peer_state.read().unwrap();
 match outer_state_lock.get(counterparty_node_id) {
 Some(inner_state_lock) => {
Expand DownExpand Up@@ -939,8 +935,6 @@ where
 }
 }

 drop(peer_by_intercept_scid);

 if let Some(counterparty_node_id) = should_persist {
 self.persist_peer_state(counterparty_node_id).await.map_err(|e| {
 APIError::APIMisuseError {
Expand DownExpand Up@@ -1131,55 +1125,57 @@ where
	/// open, as it only affects the local LSPS2 state and doesn't affect any channels that
	/// might already exist on-chain. Any pending channel open attempts must be managed
	/// separately.
	#[allow(clippy::await_holding_lock)]
	pub async fn channel_open_abandoned(
 &self, counterparty_node_id: &PublicKey, user_channel_id: u128,
	) -> Result<(), APIError> {
 let outer_state_lock = self.per_peer_state.read().unwrap();
 let inner_state_lock =
 outer_state_lock.get(counterparty_node_id).ok_or_else(|| APIError::APIMisuseError {
 err: format!("No counterparty state for: {}", counterparty_node_id),
 })?;
 let mut peer_state = inner_state_lock.lock().unwrap();

 let intercept_scid = peer_state
 .intercept_scid_by_user_channel_id
 .get(&user_channel_id)
 .copied()
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!("Could not find a channel with user_channel_id {}", user_channel_id),
 {
 let outer_state_lock = self.per_peer_state.read().unwrap();
 let inner_state_lock = outer_state_lock.get(counterparty_node_id).ok_or_else(|| {
 APIError::APIMisuseError {
 err: format!("No counterparty state for: {}", counterparty_node_id),
 }
 })?;
 let mut peer_state = inner_state_lock.lock().unwrap();

 let jit_channel = peer_state
 .outbound_channels_by_intercept_scid
 .get(&intercept_scid)
 .ok_or_else(|| APIError::APIMisuseError {
 let intercept_scid = peer_state
 .intercept_scid_by_user_channel_id
 .get(&user_channel_id)
 .copied()
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!(
 "Could not find a channel with user_channel_id {}",
 user_channel_id
 ),
 })?;

 let jit_channel = peer_state
 .outbound_channels_by_intercept_scid
 .get(&intercept_scid)
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!(
 "Failed to map intercept_scid {} for user_channel_id {} to a channel.",
 intercept_scid, user_channel_id,
 ),
 })?;

 let is_pending = matches!(
 jit_channel.state,
 OutboundJITChannelState::PendingInitialPayment { .. }
 | OutboundJITChannelState::PendingChannelOpen { .. }
 );

 if !is_pending {
 return Err(APIError::APIMisuseError {
 err: "Cannot abandon channel open after channel creation or payment forwarding"
 .to_string(),
 });
 }
 let is_pending = matches!(
 jit_channel.state,
 OutboundJITChannelState::PendingInitialPayment { .. }
 | OutboundJITChannelState::PendingChannelOpen { .. }
 );

 peer_state.intercept_scid_by_user_channel_id.remove(&user_channel_id);
 peer_state.outbound_channels_by_intercept_scid.remove(&intercept_scid);
 peer_state.intercept_scid_by_channel_id.retain(|_, &mut scid| scid != intercept_scid);
 peer_state.needs_persist |= true;
 if !is_pending {
 return Err(APIError::APIMisuseError {
 err: "Cannot abandon channel open after channel creation or payment forwarding"
 .to_string(),
 });
 }

 drop(peer_state);
 drop(outer_state_lock);
 peer_state.intercept_scid_by_user_channel_id.remove(&user_channel_id);
 peer_state.outbound_channels_by_intercept_scid.remove(&intercept_scid);
 peer_state.intercept_scid_by_channel_id.retain(|_, &mut scid| scid != intercept_scid);
 peer_state.needs_persist |= true;
 }

 self.persist_peer_state(*counterparty_node_id).await.map_err(|e| {
 APIError::APIMisuseError {
Expand All@@ -1197,62 +1193,63 @@ where
	/// state so that the payer may try the payment again.
	///
	/// [`LSPS2ServiceEvent::OpenChannel`]: crate::lsps2::event::LSPS2ServiceEvent::OpenChannel
	#[allow(clippy::await_holding_lock)]
	pub async fn channel_open_failed(
 &self, counterparty_node_id: &PublicKey, user_channel_id: u128,
	) -> Result<(), APIError> {
 let outer_state_lock = self.per_peer_state.read().unwrap();
 {
 let outer_state_lock = self.per_peer_state.read().unwrap();

 let inner_state_lock =
 outer_state_lock.get(counterparty_node_id).ok_or_else(|| APIError::APIMisuseError {
 err: format!("No counterparty state for: {}", counterparty_node_id),
 let inner_state_lock = outer_state_lock.get(counterparty_node_id).ok_or_else(|| {
 APIError::APIMisuseError {
 err: format!("No counterparty state for: {}", counterparty_node_id),
 }
 })?;

 let mut peer_state = inner_state_lock.lock().unwrap();
let mut peer_state = inner_state_lock.lock().unwrap();

 let intercept_scid = peer_state
 .intercept_scid_by_user_channel_id
 .get(&user_channel_id)
 .copied()
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!("Could not find a channel with user_channel_id {}", user_channel_id),
 })?;
 let intercept_scid = peer_state
 .intercept_scid_by_user_channel_id
 .get(&user_channel_id)
 .copied()
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!(
 "Could not find a channel with user_channel_id {}",
 user_channel_id
 ),
 })?;

 let jit_channel = peer_state
 .outbound_channels_by_intercept_scid
 .get_mut(&intercept_scid)
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!(
 "Failed to map intercept_scid {} for user_channel_id {} to a channel.",
 intercept_scid, user_channel_id,
 ),
 })?;
 let jit_channel = peer_state
 .outbound_channels_by_intercept_scid
 .get_mut(&intercept_scid)
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!(
 "Failed to map intercept_scid {} for user_channel_id {} to a channel.",
 intercept_scid, user_channel_id,
 ),
 })?;

 if let OutboundJITChannelState::PendingChannelOpen { payment_queue, .. } =
 &mut jit_channel.state
 {
 let intercepted_htlcs = payment_queue.clear();
 for htlc in intercepted_htlcs {
 self.channel_manager.get_cm().fail_htlc_backwards_with_reason(
 &htlc.payment_hash,
 FailureCode::TemporaryNodeFailure,
 );
 }

 if let OutboundJITChannelState::PendingChannelOpen { payment_queue, .. } =
 &mut jit_channel.state
 {
 let intercepted_htlcs = payment_queue.clear();
 for htlc in intercepted_htlcs {
 self.channel_manager.get_cm().fail_htlc_backwards_with_reason(
 &htlc.payment_hash,
 FailureCode::TemporaryNodeFailure,
 );
 jit_channel.state = OutboundJITChannelState::PendingInitialPayment {
 payment_queue: PaymentQueue::new(),
 };
 } else {
 return Err(APIError::APIMisuseError {
 err: "Channel is not in the PendingChannelOpen state.".to_string(),
 });
 }

 jit_channel.state = OutboundJITChannelState::PendingInitialPayment {
 payment_queue: PaymentQueue::new(),
 };
 } else {
 return Err(APIError::APIMisuseError {
 err: "Channel is not in the PendingChannelOpen state.".to_string(),
 });
 peer_state.needs_persist |= true;
 }

 peer_state.needs_persist |= true;

 drop(peer_state);
 drop(outer_state_lock);

 self.persist_peer_state(*counterparty_node_id).await.map_err(|e| {
 APIError::APIMisuseError {
 err: format!("Failed to persist peer state for {}: {}", counterparty_node_id, e),
Expand All@@ -1268,7 +1265,6 @@ where
	/// we need to forward a payment over otherwise it will be ignored.
	///
	/// [`Event::ChannelReady`]: lightning::events::Event::ChannelReady
	#[allow(clippy::await_holding_lock)]
	pub async fn channel_ready(
 &self, user_channel_id: u128, channel_id: &ChannelId, counterparty_node_id: &PublicKey,
	) -> Result<(), APIError> {
Expand All@@ -1277,8 +1273,7 @@ where
 let mut peer_by_channel_id = self.peer_by_channel_id.write().unwrap();
 peer_by_channel_id.insert(*channel_id, *counterparty_node_id);
 }
 let outer_state_lock = self.per_peer_state.read().unwrap();
 match outer_state_lock.get(counterparty_node_id) {
 match self.per_peer_state.read().unwrap().get(counterparty_node_id) {
 Some(inner_state_lock) => {
 let mut peer_state = inner_state_lock.lock().unwrap();
 if let Some(intercept_scid) =
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
LSPS2ServiceHandler API: Avoid explictly dropping locks#4124

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

tnull
merged 1 commit into

from

Sep 25, 2025
 Merged

LSPS2ServiceHandler API: Avoid explictly dropping locks
#4124
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


181 changes: 88 additions & 93 deletions
lightning-liquidity/src/lsps2/service.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -771,16 +771,14 @@ where
	/// [`ChannelManager::create_channel`]: lightning::ln::channelmanager::ChannelManager::create_channel
	/// [`ChannelManager::get_intercept_scid`]: lightning::ln::channelmanager::ChannelManager::get_intercept_scid
	/// [`LSPS2ServiceEvent::BuyRequest`]: crate::lsps2::event::LSPS2ServiceEvent::BuyRequest
	#[allow(clippy::await_holding_lock)]
	pub async fn invoice_parameters_generated(
 &self, counterparty_node_id: &PublicKey, request_id: LSPSRequestId, intercept_scid: u64,
 cltv_expiry_delta: u32, client_trusts_lsp: bool, user_channel_id: u128,
	) -> Result<(), APIError> {
 let mut message_queue_notifier = self.pending_messages.notifier();
 let mut should_persist = false;

 let outer_state_lock = self.per_peer_state.read().unwrap();
 match outer_state_lock.get(counterparty_node_id) {
 match self.per_peer_state.read().unwrap().get(counterparty_node_id) {
 Some(inner_state_lock) => {
 let mut peer_state_lock = inner_state_lock.lock().unwrap();

Expand DownExpand Up@@ -827,8 +825,6 @@ where
 },
 };

 drop(outer_state_lock);

 if should_persist {
 self.persist_peer_state(*counterparty_node_id).await.map_err(|e| {
 APIError::APIMisuseError {
Expand All@@ -855,16 +851,16 @@ where
	///
	/// [`Event::HTLCIntercepted`]: lightning::events::Event::HTLCIntercepted
	/// [`LSPS2ServiceEvent::OpenChannel`]: crate::lsps2::event::LSPS2ServiceEvent::OpenChannel
	#[allow(clippy::await_holding_lock)]
	pub async fn htlc_intercepted(
 &self, intercept_scid: u64, intercept_id: InterceptId, expected_outbound_amount_msat: u64,
 payment_hash: PaymentHash,
	) -> Result<(), APIError> {
 let event_queue_notifier = self.pending_events.notifier();
 let mut should_persist = None;

 let peer_by_intercept_scid = self.peer_by_intercept_scid.read().unwrap();
 if let Some(counterparty_node_id) = peer_by_intercept_scid.get(&intercept_scid) {
 if let Some(counterparty_node_id) =
 self.peer_by_intercept_scid.read().unwrap().get(&intercept_scid)
 {
 let outer_state_lock = self.per_peer_state.read().unwrap();
 match outer_state_lock.get(counterparty_node_id) {
 Some(inner_state_lock) => {
Expand DownExpand Up@@ -939,8 +935,6 @@ where
 }
 }

 drop(peer_by_intercept_scid);

 if let Some(counterparty_node_id) = should_persist {
 self.persist_peer_state(counterparty_node_id).await.map_err(|e| {
 APIError::APIMisuseError {
Expand DownExpand Up@@ -1131,55 +1125,57 @@ where
	/// open, as it only affects the local LSPS2 state and doesn't affect any channels that
	/// might already exist on-chain. Any pending channel open attempts must be managed
	/// separately.
	#[allow(clippy::await_holding_lock)]
	pub async fn channel_open_abandoned(
 &self, counterparty_node_id: &PublicKey, user_channel_id: u128,
	) -> Result<(), APIError> {
 let outer_state_lock = self.per_peer_state.read().unwrap();
 let inner_state_lock =
 outer_state_lock.get(counterparty_node_id).ok_or_else(|| APIError::APIMisuseError {
 err: format!("No counterparty state for: {}", counterparty_node_id),
 })?;
 let mut peer_state = inner_state_lock.lock().unwrap();

 let intercept_scid = peer_state
 .intercept_scid_by_user_channel_id
 .get(&user_channel_id)
 .copied()
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!("Could not find a channel with user_channel_id {}", user_channel_id),
 {
 let outer_state_lock = self.per_peer_state.read().unwrap();
 let inner_state_lock = outer_state_lock.get(counterparty_node_id).ok_or_else(|| {
 APIError::APIMisuseError {
 err: format!("No counterparty state for: {}", counterparty_node_id),
 }
 })?;
 let mut peer_state = inner_state_lock.lock().unwrap();

 let jit_channel = peer_state
 .outbound_channels_by_intercept_scid
 .get(&intercept_scid)
 .ok_or_else(|| APIError::APIMisuseError {
 let intercept_scid = peer_state
 .intercept_scid_by_user_channel_id
 .get(&user_channel_id)
 .copied()
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!(
 "Could not find a channel with user_channel_id {}",
 user_channel_id
 ),
 })?;

 let jit_channel = peer_state
 .outbound_channels_by_intercept_scid
 .get(&intercept_scid)
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!(
 "Failed to map intercept_scid {} for user_channel_id {} to a channel.",
 intercept_scid, user_channel_id,
 ),
 })?;

 let is_pending = matches!(
 jit_channel.state,
 OutboundJITChannelState::PendingInitialPayment { .. }
 | OutboundJITChannelState::PendingChannelOpen { .. }
 );

 if !is_pending {
 return Err(APIError::APIMisuseError {
 err: "Cannot abandon channel open after channel creation or payment forwarding"
 .to_string(),
 });
 }
 let is_pending = matches!(
 jit_channel.state,
 OutboundJITChannelState::PendingInitialPayment { .. }
 | OutboundJITChannelState::PendingChannelOpen { .. }
 );

 peer_state.intercept_scid_by_user_channel_id.remove(&user_channel_id);
 peer_state.outbound_channels_by_intercept_scid.remove(&intercept_scid);
 peer_state.intercept_scid_by_channel_id.retain(|_, &mut scid| scid != intercept_scid);
 peer_state.needs_persist |= true;
 if !is_pending {
 return Err(APIError::APIMisuseError {
 err: "Cannot abandon channel open after channel creation or payment forwarding"
 .to_string(),
 });
 }

 drop(peer_state);
 drop(outer_state_lock);
 peer_state.intercept_scid_by_user_channel_id.remove(&user_channel_id);
 peer_state.outbound_channels_by_intercept_scid.remove(&intercept_scid);
 peer_state.intercept_scid_by_channel_id.retain(|_, &mut scid| scid != intercept_scid);
 peer_state.needs_persist |= true;
 }

 self.persist_peer_state(*counterparty_node_id).await.map_err(|e| {
 APIError::APIMisuseError {
Expand All@@ -1197,62 +1193,63 @@ where
	/// state so that the payer may try the payment again.
	///
	/// [`LSPS2ServiceEvent::OpenChannel`]: crate::lsps2::event::LSPS2ServiceEvent::OpenChannel
	#[allow(clippy::await_holding_lock)]
	pub async fn channel_open_failed(
 &self, counterparty_node_id: &PublicKey, user_channel_id: u128,
	) -> Result<(), APIError> {
 let outer_state_lock = self.per_peer_state.read().unwrap();
 {
 let outer_state_lock = self.per_peer_state.read().unwrap();

 let inner_state_lock =
 outer_state_lock.get(counterparty_node_id).ok_or_else(|| APIError::APIMisuseError {
 err: format!("No counterparty state for: {}", counterparty_node_id),
 let inner_state_lock = outer_state_lock.get(counterparty_node_id).ok_or_else(|| {
 APIError::APIMisuseError {
 err: format!("No counterparty state for: {}", counterparty_node_id),
 }
 })?;

 let mut peer_state = inner_state_lock.lock().unwrap();
let mut peer_state = inner_state_lock.lock().unwrap();

 let intercept_scid = peer_state
 .intercept_scid_by_user_channel_id
 .get(&user_channel_id)
 .copied()
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!("Could not find a channel with user_channel_id {}", user_channel_id),
 })?;
 let intercept_scid = peer_state
 .intercept_scid_by_user_channel_id
 .get(&user_channel_id)
 .copied()
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!(
 "Could not find a channel with user_channel_id {}",
 user_channel_id
 ),
 })?;

 let jit_channel = peer_state
 .outbound_channels_by_intercept_scid
 .get_mut(&intercept_scid)
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!(
 "Failed to map intercept_scid {} for user_channel_id {} to a channel.",
 intercept_scid, user_channel_id,
 ),
 })?;
 let jit_channel = peer_state
 .outbound_channels_by_intercept_scid
 .get_mut(&intercept_scid)
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!(
 "Failed to map intercept_scid {} for user_channel_id {} to a channel.",
 intercept_scid, user_channel_id,
 ),
 })?;

 if let OutboundJITChannelState::PendingChannelOpen { payment_queue, .. } =
 &mut jit_channel.state
 {
 let intercepted_htlcs = payment_queue.clear();
 for htlc in intercepted_htlcs {
 self.channel_manager.get_cm().fail_htlc_backwards_with_reason(
 &htlc.payment_hash,
 FailureCode::TemporaryNodeFailure,
 );
 }

 if let OutboundJITChannelState::PendingChannelOpen { payment_queue, .. } =
 &mut jit_channel.state
 {
 let intercepted_htlcs = payment_queue.clear();
 for htlc in intercepted_htlcs {
 self.channel_manager.get_cm().fail_htlc_backwards_with_reason(
 &htlc.payment_hash,
 FailureCode::TemporaryNodeFailure,
 );
 jit_channel.state = OutboundJITChannelState::PendingInitialPayment {
 payment_queue: PaymentQueue::new(),
 };
 } else {
 return Err(APIError::APIMisuseError {
 err: "Channel is not in the PendingChannelOpen state.".to_string(),
 });
 }

 jit_channel.state = OutboundJITChannelState::PendingInitialPayment {
 payment_queue: PaymentQueue::new(),
 };
 } else {
 return Err(APIError::APIMisuseError {
 err: "Channel is not in the PendingChannelOpen state.".to_string(),
 });
 peer_state.needs_persist |= true;
 }

 peer_state.needs_persist |= true;

 drop(peer_state);
 drop(outer_state_lock);

 self.persist_peer_state(*counterparty_node_id).await.map_err(|e| {
 APIError::APIMisuseError {
 err: format!("Failed to persist peer state for {}: {}", counterparty_node_id, e),
Expand All@@ -1268,7 +1265,6 @@ where
	/// we need to forward a payment over otherwise it will be ignored.
	///
	/// [`Event::ChannelReady`]: lightning::events::Event::ChannelReady
	#[allow(clippy::await_holding_lock)]
	pub async fn channel_ready(
 &self, user_channel_id: u128, channel_id: &ChannelId, counterparty_node_id: &PublicKey,
	) -> Result<(), APIError> {
Expand All@@ -1277,8 +1273,7 @@ where
 let mut peer_by_channel_id = self.peer_by_channel_id.write().unwrap();
 peer_by_channel_id.insert(*channel_id, *counterparty_node_id);
 }
 let outer_state_lock = self.per_peer_state.read().unwrap();
 match outer_state_lock.get(counterparty_node_id) {
 match self.per_peer_state.read().unwrap().get(counterparty_node_id) {
 Some(inner_state_lock) => {
 let mut peer_state = inner_state_lock.lock().unwrap();
 if let Some(intercept_scid) =
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
LSPS2ServiceHandler API: Avoid explictly dropping locks#4124

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

tnull
merged 1 commit into

from

Sep 25, 2025
 Merged

LSPS2ServiceHandler API: Avoid explictly dropping locks
#4124
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


181 changes: 88 additions & 93 deletions
lightning-liquidity/src/lsps2/service.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -771,16 +771,14 @@ where
	/// [`ChannelManager::create_channel`]: lightning::ln::channelmanager::ChannelManager::create_channel
	/// [`ChannelManager::get_intercept_scid`]: lightning::ln::channelmanager::ChannelManager::get_intercept_scid
	/// [`LSPS2ServiceEvent::BuyRequest`]: crate::lsps2::event::LSPS2ServiceEvent::BuyRequest
	#[allow(clippy::await_holding_lock)]
	pub async fn invoice_parameters_generated(
 &self, counterparty_node_id: &PublicKey, request_id: LSPSRequestId, intercept_scid: u64,
 cltv_expiry_delta: u32, client_trusts_lsp: bool, user_channel_id: u128,
	) -> Result<(), APIError> {
 let mut message_queue_notifier = self.pending_messages.notifier();
 let mut should_persist = false;

 let outer_state_lock = self.per_peer_state.read().unwrap();
 match outer_state_lock.get(counterparty_node_id) {
 match self.per_peer_state.read().unwrap().get(counterparty_node_id) {
 Some(inner_state_lock) => {
 let mut peer_state_lock = inner_state_lock.lock().unwrap();

Expand DownExpand Up@@ -827,8 +825,6 @@ where
 },
 };

 drop(outer_state_lock);

 if should_persist {
 self.persist_peer_state(*counterparty_node_id).await.map_err(|e| {
 APIError::APIMisuseError {
Expand All@@ -855,16 +851,16 @@ where
	///
	/// [`Event::HTLCIntercepted`]: lightning::events::Event::HTLCIntercepted
	/// [`LSPS2ServiceEvent::OpenChannel`]: crate::lsps2::event::LSPS2ServiceEvent::OpenChannel
	#[allow(clippy::await_holding_lock)]
	pub async fn htlc_intercepted(
 &self, intercept_scid: u64, intercept_id: InterceptId, expected_outbound_amount_msat: u64,
 payment_hash: PaymentHash,
	) -> Result<(), APIError> {
 let event_queue_notifier = self.pending_events.notifier();
 let mut should_persist = None;

 let peer_by_intercept_scid = self.peer_by_intercept_scid.read().unwrap();
 if let Some(counterparty_node_id) = peer_by_intercept_scid.get(&intercept_scid) {
 if let Some(counterparty_node_id) =
 self.peer_by_intercept_scid.read().unwrap().get(&intercept_scid)
 {
 let outer_state_lock = self.per_peer_state.read().unwrap();
 match outer_state_lock.get(counterparty_node_id) {
 Some(inner_state_lock) => {
Expand DownExpand Up@@ -939,8 +935,6 @@ where
 }
 }

 drop(peer_by_intercept_scid);

 if let Some(counterparty_node_id) = should_persist {
 self.persist_peer_state(counterparty_node_id).await.map_err(|e| {
 APIError::APIMisuseError {
Expand DownExpand Up@@ -1131,55 +1125,57 @@ where
	/// open, as it only affects the local LSPS2 state and doesn't affect any channels that
	/// might already exist on-chain. Any pending channel open attempts must be managed
	/// separately.
	#[allow(clippy::await_holding_lock)]
	pub async fn channel_open_abandoned(
 &self, counterparty_node_id: &PublicKey, user_channel_id: u128,
	) -> Result<(), APIError> {
 let outer_state_lock = self.per_peer_state.read().unwrap();
 let inner_state_lock =
 outer_state_lock.get(counterparty_node_id).ok_or_else(|| APIError::APIMisuseError {
 err: format!("No counterparty state for: {}", counterparty_node_id),
 })?;
 let mut peer_state = inner_state_lock.lock().unwrap();

 let intercept_scid = peer_state
 .intercept_scid_by_user_channel_id
 .get(&user_channel_id)
 .copied()
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!("Could not find a channel with user_channel_id {}", user_channel_id),
 {
 let outer_state_lock = self.per_peer_state.read().unwrap();
 let inner_state_lock = outer_state_lock.get(counterparty_node_id).ok_or_else(|| {
 APIError::APIMisuseError {
 err: format!("No counterparty state for: {}", counterparty_node_id),
 }
 })?;
 let mut peer_state = inner_state_lock.lock().unwrap();

 let jit_channel = peer_state
 .outbound_channels_by_intercept_scid
 .get(&intercept_scid)
 .ok_or_else(|| APIError::APIMisuseError {
 let intercept_scid = peer_state
 .intercept_scid_by_user_channel_id
 .get(&user_channel_id)
 .copied()
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!(
 "Could not find a channel with user_channel_id {}",
 user_channel_id
 ),
 })?;

 let jit_channel = peer_state
 .outbound_channels_by_intercept_scid
 .get(&intercept_scid)
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!(
 "Failed to map intercept_scid {} for user_channel_id {} to a channel.",
 intercept_scid, user_channel_id,
 ),
 })?;

 let is_pending = matches!(
 jit_channel.state,
 OutboundJITChannelState::PendingInitialPayment { .. }
 | OutboundJITChannelState::PendingChannelOpen { .. }
 );

 if !is_pending {
 return Err(APIError::APIMisuseError {
 err: "Cannot abandon channel open after channel creation or payment forwarding"
 .to_string(),
 });
 }
 let is_pending = matches!(
 jit_channel.state,
 OutboundJITChannelState::PendingInitialPayment { .. }
 | OutboundJITChannelState::PendingChannelOpen { .. }
 );

 peer_state.intercept_scid_by_user_channel_id.remove(&user_channel_id);
 peer_state.outbound_channels_by_intercept_scid.remove(&intercept_scid);
 peer_state.intercept_scid_by_channel_id.retain(|_, &mut scid| scid != intercept_scid);
 peer_state.needs_persist |= true;
 if !is_pending {
 return Err(APIError::APIMisuseError {
 err: "Cannot abandon channel open after channel creation or payment forwarding"
 .to_string(),
 });
 }

 drop(peer_state);
 drop(outer_state_lock);
 peer_state.intercept_scid_by_user_channel_id.remove(&user_channel_id);
 peer_state.outbound_channels_by_intercept_scid.remove(&intercept_scid);
 peer_state.intercept_scid_by_channel_id.retain(|_, &mut scid| scid != intercept_scid);
 peer_state.needs_persist |= true;
 }

 self.persist_peer_state(*counterparty_node_id).await.map_err(|e| {
 APIError::APIMisuseError {
Expand All@@ -1197,62 +1193,63 @@ where
	/// state so that the payer may try the payment again.
	///
	/// [`LSPS2ServiceEvent::OpenChannel`]: crate::lsps2::event::LSPS2ServiceEvent::OpenChannel
	#[allow(clippy::await_holding_lock)]
	pub async fn channel_open_failed(
 &self, counterparty_node_id: &PublicKey, user_channel_id: u128,
	) -> Result<(), APIError> {
 let outer_state_lock = self.per_peer_state.read().unwrap();
 {
 let outer_state_lock = self.per_peer_state.read().unwrap();

 let inner_state_lock =
 outer_state_lock.get(counterparty_node_id).ok_or_else(|| APIError::APIMisuseError {
 err: format!("No counterparty state for: {}", counterparty_node_id),
 let inner_state_lock = outer_state_lock.get(counterparty_node_id).ok_or_else(|| {
 APIError::APIMisuseError {
 err: format!("No counterparty state for: {}", counterparty_node_id),
 }
 })?;

 let mut peer_state = inner_state_lock.lock().unwrap();
let mut peer_state = inner_state_lock.lock().unwrap();

 let intercept_scid = peer_state
 .intercept_scid_by_user_channel_id
 .get(&user_channel_id)
 .copied()
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!("Could not find a channel with user_channel_id {}", user_channel_id),
 })?;
 let intercept_scid = peer_state
 .intercept_scid_by_user_channel_id
 .get(&user_channel_id)
 .copied()
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!(
 "Could not find a channel with user_channel_id {}",
 user_channel_id
 ),
 })?;

 let jit_channel = peer_state
 .outbound_channels_by_intercept_scid
 .get_mut(&intercept_scid)
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!(
 "Failed to map intercept_scid {} for user_channel_id {} to a channel.",
 intercept_scid, user_channel_id,
 ),
 })?;
 let jit_channel = peer_state
 .outbound_channels_by_intercept_scid
 .get_mut(&intercept_scid)
 .ok_or_else(|| APIError::APIMisuseError {
 err: format!(
 "Failed to map intercept_scid {} for user_channel_id {} to a channel.",
 intercept_scid, user_channel_id,
 ),
 })?;

 if let OutboundJITChannelState::PendingChannelOpen { payment_queue, .. } =
 &mut jit_channel.state
 {
 let intercepted_htlcs = payment_queue.clear();
 for htlc in intercepted_htlcs {
 self.channel_manager.get_cm().fail_htlc_backwards_with_reason(
 &htlc.payment_hash,
 FailureCode::TemporaryNodeFailure,
 );
 }

 if let OutboundJITChannelState::PendingChannelOpen { payment_queue, .. } =
 &mut jit_channel.state
 {
 let intercepted_htlcs = payment_queue.clear();
 for htlc in intercepted_htlcs {
 self.channel_manager.get_cm().fail_htlc_backwards_with_reason(
 &htlc.payment_hash,
 FailureCode::TemporaryNodeFailure,
 );
 jit_channel.state = OutboundJITChannelState::PendingInitialPayment {
 payment_queue: PaymentQueue::new(),
 };
 } else {
 return Err(APIError::APIMisuseError {
 err: "Channel is not in the PendingChannelOpen state.".to_string(),
 });
 }

 jit_channel.state = OutboundJITChannelState::PendingInitialPayment {
 payment_queue: PaymentQueue::new(),
 };
 } else {
 return Err(APIError::APIMisuseError {
 err: "Channel is not in the PendingChannelOpen state.".to_string(),
 });
 peer_state.needs_persist |= true;
 }

 peer_state.needs_persist |= true;

 drop(peer_state);
 drop(outer_state_lock);

 self.persist_peer_state(*counterparty_node_id).await.map_err(|e| {
 APIError::APIMisuseError {
 err: format!("Failed to persist peer state for {}: {}", counterparty_node_id, e),
Expand All@@ -1268,7 +1265,6 @@ where
	/// we need to forward a payment over otherwise it will be ignored.
	///
	/// [`Event::ChannelReady`]: lightning::events::Event::ChannelReady
	#[allow(clippy::await_holding_lock)]
	pub async fn channel_ready(
 &self, user_channel_id: u128, channel_id: &ChannelId, counterparty_node_id: &PublicKey,
	) -> Result<(), APIError> {
Expand All@@ -1277,8 +1273,7 @@ where
 let mut peer_by_channel_id = self.peer_by_channel_id.write().unwrap();
 peer_by_channel_id.insert(*channel_id, *counterparty_node_id);
 }
 let outer_state_lock = self.per_peer_state.read().unwrap();
 match outer_state_lock.get(counterparty_node_id) {
 match self.per_peer_state.read().unwrap().get(counterparty_node_id) {
 Some(inner_state_lock) => {
 let mut peer_state = inner_state_lock.lock().unwrap();
 if let Some(intercept_scid) =
Expand Down
Loading