Move ChannelMonitorUpdateStatus mode check from ChannelManager to ChainMonitor#4435

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

Closed
joostjager wants to merge 1 commit into from
Closed

Move ChannelMonitorUpdateStatus mode check from ChannelManager to ChainMonitor #4435

Show file tree
Hide file tree
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
16 changes: 14 additions & 2 deletions fuzz/src/chanmon_consistency.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1038,13 +1038,25 @@ pub fn do_test<Out: Output + MaybeSend + MaybeSync>(
let manager =
<(BlockHash, ChanMan)>::read(&mut &ser[..], read_args).expect("Failed to read manager");
let res = (manager.1, chain_monitor.clone());
let expected_status = *mon_style[node_id as usize].borrow();
*chain_monitor.persister.update_ret.lock().unwrap() = expected_status.clone();
for (channel_id, mon) in monitors.drain() {
let monitor_id = mon.get_latest_update_id();
assert_eq!(
chain_monitor.chain_monitor.watch_channel(channel_id, mon),
Ok(ChannelMonitorUpdateStatus::Completed)
Ok(expected_status.clone())
);
// When persistence returns InProgress, the real ChainMonitor tracks
// the initial update_id as pending. We must mirror this in the
// TestChainMonitor's latest_monitors so that
// complete_all_monitor_updates can drain and complete it later.
if expected_status == chain::ChannelMonitorUpdateStatus::InProgress {
let mut map = chain_monitor.latest_monitors.lock().unwrap();
if let Some(state) = map.get_mut(&channel_id) {
state.pending_monitors.push((monitor_id, state.persisted_monitor.clone()));
}
}
}
*chain_monitor.persister.update_ret.lock().unwrap() = *mon_style[node_id as usize].borrow();
res
};

Expand Down
33 changes: 33 additions & 0 deletions lightning/src/chain/chainmonitor.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -369,6 +369,12 @@ pub struct ChainMonitor<
/// Messages to send to the peer. This is currently used to distribute PeerStorage to channel partners.
pending_send_only_events: Mutex<Vec<MessageSendEvent>>,

/// We only support using one of [`ChannelMonitorUpdateStatus::InProgress`] and
/// [`ChannelMonitorUpdateStatus::Completed`] without restarting. We enforce this in non-test
/// builds by storing which one is in use (0 = unset, 1 = InProgress, 2 = Completed).
#[cfg(not(any(test, feature = "_externalize_tests")))]
monitor_update_type: AtomicUsize,

#[cfg(peer_storage)]
our_peerstorage_encryption_key: PeerStorageKey,
}
Expand DownExpand Up@@ -412,6 +418,8 @@ where
event_notifier: Arc::clone(&event_notifier),
persister: AsyncPersister { persister, event_notifier },
pending_send_only_events: Mutex::new(Vec::new()),
#[cfg(not(any(test, feature = "_externalize_tests")))]
monitor_update_type: AtomicUsize::new(0),
#[cfg(peer_storage)]
our_peerstorage_encryption_key: _our_peerstorage_encryption_key,
}
Expand DownExpand Up@@ -617,11 +625,32 @@ where
highest_chain_height: AtomicUsize::new(0),
event_notifier: Arc::new(Notifier::new()),
pending_send_only_events: Mutex::new(Vec::new()),
#[cfg(not(any(test, feature = "_externalize_tests")))]
monitor_update_type: AtomicUsize::new(0),
#[cfg(peer_storage)]
our_peerstorage_encryption_key: _our_peerstorage_encryption_key,
}
}

#[cfg(not(any(test, feature = "_externalize_tests")))]
fn check_monitor_update_type(
monitor_update_type: &AtomicUsize, persist_res: &ChannelMonitorUpdateStatus,
) {
match persist_res {
ChannelMonitorUpdateStatus::InProgress => {
if monitor_update_type.swap(1, Ordering::Relaxed) == 2 {
panic!("Cannot use both ChannelMonitorUpdateStatus modes InProgress and Completed without restart");
}
},
ChannelMonitorUpdateStatus::Completed => {
if monitor_update_type.swap(2, Ordering::Relaxed) == 1 {
panic!("Cannot use both ChannelMonitorUpdateStatus modes InProgress and Completed without restart");
}
},
ChannelMonitorUpdateStatus::UnrecoverableError => {},
}
}

/// Gets the balances in the contained [`ChannelMonitor`]s which are claimable on-chain or
/// claims which are awaiting confirmation.
///
Expand DownExpand Up@@ -1285,6 +1314,8 @@ where
let update_id = monitor.get_latest_update_id();
let mut pending_monitor_updates = Vec::new();
let persist_res = self.persister.persist_new_channel(monitor.persistence_key(), &monitor);
#[cfg(not(any(test, feature = "_externalize_tests")))]
Self::check_monitor_update_type(&self.monitor_update_type, &persist_res);
match persist_res {
ChannelMonitorUpdateStatus::InProgress => {
log_info!(logger, "Persistence of new ChannelMonitor in progress",);
Expand DownExpand Up@@ -1367,6 +1398,8 @@ where
monitor,
)
};
#[cfg(not(any(test, feature = "_externalize_tests")))]
Self::check_monitor_update_type(&self.monitor_update_type, &persist_res);
match persist_res {
ChannelMonitorUpdateStatus::InProgress => {
pending_monitor_updates.push(update_id);
Expand Down
25 changes: 1 addition & 24 deletions lightning/src/ln/channelmanager.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2779,13 +2779,6 @@ pub struct ChannelManager<
#[cfg(any(test, feature = "_test_utils"))]
pub(super) per_peer_state: FairRwLock<HashMap<PublicKey, Mutex<PeerState<SP>>>>,

/// We only support using one of [`ChannelMonitorUpdateStatus::InProgress`] and
/// [`ChannelMonitorUpdateStatus::Completed`] without restarting. Because the API does not
/// otherwise directly enforce this, we enforce it in non-test builds here by storing which one
/// is in use.
#[cfg(not(any(test, feature = "_externalize_tests")))]
monitor_update_type: AtomicUsize,

/// The set of events which we need to give to the user to handle. In some cases an event may
/// require some further action after the user handles it (currently only blocking a monitor
/// update from being handed to the user to ensure the included changes to the channel state
Expand DownExpand Up@@ -3527,9 +3520,6 @@ impl<

per_peer_state: FairRwLock::new(new_hash_map()),

#[cfg(not(any(test, feature = "_externalize_tests")))]
monitor_update_type: AtomicUsize::new(0),

pending_events: Mutex::new(VecDeque::new()),
pending_events_processor: AtomicBool::new(false),
pending_htlc_forwards_processor: AtomicBool::new(false),
Expand DownExpand Up@@ -10006,23 +9996,13 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
panic!("{}", err_str);
},
ChannelMonitorUpdateStatus::InProgress => {
#[cfg(not(any(test, feature = "_externalize_tests")))]
if self.monitor_update_type.swap(1, Ordering::Relaxed) == 2 {
panic!("Cannot use both ChannelMonitorUpdateStatus modes InProgress and Completed without restart");
}
log_debug!(
logger,
"ChannelMonitor update in flight, holding messages until the update completes.",
);
false
},
ChannelMonitorUpdateStatus::Completed => {
#[cfg(not(any(test, feature = "_externalize_tests")))]
if self.monitor_update_type.swap(2, Ordering::Relaxed) == 1 {
panic!("Cannot use both ChannelMonitorUpdateStatus modes InProgress and Completed without restart");
}
true
},
ChannelMonitorUpdateStatus::Completed => true,
}
}

Expand DownExpand Up@@ -19550,9 +19530,6 @@ impl<

per_peer_state: FairRwLock::new(per_peer_state),

#[cfg(not(any(test, feature = "_externalize_tests")))]
monitor_update_type: AtomicUsize::new(0),

pending_events: Mutex::new(pending_events_read),
pending_events_processor: AtomicBool::new(false),
pending_htlc_forwards_processor: AtomicBool::new(false),
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
Move ChannelMonitorUpdateStatus mode check from ChannelManager to ChainMonitor#4435

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

 Closed

joostjager
wants to merge
1
commit into

from

 Closed


Move ChannelMonitorUpdateStatus mode check from ChannelManager to ChainMonitor
#4435
Show file tree
Hide file tree
 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


16 changes: 14 additions & 2 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1038,13 +1038,25 @@ pub fn do_test<Out: Output + MaybeSend + MaybeSync>(
 let manager =
 <(BlockHash, ChanMan)>::read(&mut &ser[..], read_args).expect("Failed to read manager");
 let res = (manager.1, chain_monitor.clone());
 let expected_status = *mon_style[node_id as usize].borrow();
 *chain_monitor.persister.update_ret.lock().unwrap() = expected_status.clone();
 for (channel_id, mon) in monitors.drain() {
 let monitor_id = mon.get_latest_update_id();
 assert_eq!(
 chain_monitor.chain_monitor.watch_channel(channel_id, mon),
 Ok(ChannelMonitorUpdateStatus::Completed)
 Ok(expected_status.clone())
 );
 // When persistence returns InProgress, the real ChainMonitor tracks
 // the initial update_id as pending. We must mirror this in the
 // TestChainMonitor's latest_monitors so that
 // complete_all_monitor_updates can drain and complete it later.
 if expected_status == chain::ChannelMonitorUpdateStatus::InProgress {
 let mut map = chain_monitor.latest_monitors.lock().unwrap();
 if let Some(state) = map.get_mut(&channel_id) {
 state.pending_monitors.push((monitor_id, state.persisted_monitor.clone()));
 }
 }
 }
 *chain_monitor.persister.update_ret.lock().unwrap() = *mon_style[node_id as usize].borrow();
 res
	};

Expand Down

33 changes: 33 additions & 0 deletions
lightning/src/chain/chainmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -369,6 +369,12 @@ pub struct ChainMonitor<
	/// Messages to send to the peer. This is currently used to distribute PeerStorage to channel partners.
	pending_send_only_events: Mutex<Vec<MessageSendEvent>>,

	/// We only support using one of [`ChannelMonitorUpdateStatus::InProgress`] and
	/// [`ChannelMonitorUpdateStatus::Completed`] without restarting. We enforce this in non-test
	/// builds by storing which one is in use (0 = unset, 1 = InProgress, 2 = Completed).
	#[cfg(not(any(test, feature = "_externalize_tests")))]
	monitor_update_type: AtomicUsize,

	#[cfg(peer_storage)]
	our_peerstorage_encryption_key: PeerStorageKey,
}
Expand DownExpand Up@@ -412,6 +418,8 @@ where
 event_notifier: Arc::clone(&event_notifier),
 persister: AsyncPersister { persister, event_notifier },
 pending_send_only_events: Mutex::new(Vec::new()),
 #[cfg(not(any(test, feature = "_externalize_tests")))]
 monitor_update_type: AtomicUsize::new(0),
 #[cfg(peer_storage)]
 our_peerstorage_encryption_key: _our_peerstorage_encryption_key,
 }
Expand DownExpand Up@@ -617,11 +625,32 @@ where
 highest_chain_height: AtomicUsize::new(0),
 event_notifier: Arc::new(Notifier::new()),
 pending_send_only_events: Mutex::new(Vec::new()),
 #[cfg(not(any(test, feature = "_externalize_tests")))]
 monitor_update_type: AtomicUsize::new(0),
 #[cfg(peer_storage)]
 our_peerstorage_encryption_key: _our_peerstorage_encryption_key,
 }
	}

	#[cfg(not(any(test, feature = "_externalize_tests")))]
	fn check_monitor_update_type(
 monitor_update_type: &AtomicUsize, persist_res: &ChannelMonitorUpdateStatus,
	) {
 match persist_res {
 ChannelMonitorUpdateStatus::InProgress => {
 if monitor_update_type.swap(1, Ordering::Relaxed) == 2 {
 panic!("Cannot use both ChannelMonitorUpdateStatus modes InProgress and Completed without restart");
 }
 },
 ChannelMonitorUpdateStatus::Completed => {
 if monitor_update_type.swap(2, Ordering::Relaxed) == 1 {
 panic!("Cannot use both ChannelMonitorUpdateStatus modes InProgress and Completed without restart");
 }
 },
 ChannelMonitorUpdateStatus::UnrecoverableError => {},
 }
	}

	/// Gets the balances in the contained [`ChannelMonitor`]s which are claimable on-chain or
	/// claims which are awaiting confirmation.
	///
Expand DownExpand Up@@ -1285,6 +1314,8 @@ where
 let update_id = monitor.get_latest_update_id();
 let mut pending_monitor_updates = Vec::new();
 let persist_res = self.persister.persist_new_channel(monitor.persistence_key(), &monitor);
 #[cfg(not(any(test, feature = "_externalize_tests")))]
 Self::check_monitor_update_type(&self.monitor_update_type, &persist_res);
 match persist_res {
 ChannelMonitorUpdateStatus::InProgress => {
 log_info!(logger, "Persistence of new ChannelMonitor in progress",);
Expand DownExpand Up@@ -1367,6 +1398,8 @@ where
 monitor,
 )
 };
 #[cfg(not(any(test, feature = "_externalize_tests")))]
 Self::check_monitor_update_type(&self.monitor_update_type, &persist_res);
 match persist_res {
 ChannelMonitorUpdateStatus::InProgress => {
 pending_monitor_updates.push(update_id);
Expand Down

25 changes: 1 addition & 24 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2779,13 +2779,6 @@ pub struct ChannelManager<
	#[cfg(any(test, feature = "_test_utils"))]
	pub(super) per_peer_state: FairRwLock<HashMap<PublicKey, Mutex<PeerState<SP>>>>,

	/// We only support using one of [`ChannelMonitorUpdateStatus::InProgress`] and
	/// [`ChannelMonitorUpdateStatus::Completed`] without restarting. Because the API does not
	/// otherwise directly enforce this, we enforce it in non-test builds here by storing which one
	/// is in use.
	#[cfg(not(any(test, feature = "_externalize_tests")))]
	monitor_update_type: AtomicUsize,

	/// The set of events which we need to give to the user to handle. In some cases an event may
	/// require some further action after the user handles it (currently only blocking a monitor
	/// update from being handed to the user to ensure the included changes to the channel state
Expand DownExpand Up@@ -3527,9 +3520,6 @@ impl<

 per_peer_state: FairRwLock::new(new_hash_map()),

 #[cfg(not(any(test, feature = "_externalize_tests")))]
 monitor_update_type: AtomicUsize::new(0),

 pending_events: Mutex::new(VecDeque::new()),
 pending_events_processor: AtomicBool::new(false),
 pending_htlc_forwards_processor: AtomicBool::new(false),
Expand DownExpand Up@@ -10006,23 +9996,13 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 panic!("{}", err_str);
 },
 ChannelMonitorUpdateStatus::InProgress => {
 #[cfg(not(any(test, feature = "_externalize_tests")))]
 if self.monitor_update_type.swap(1, Ordering::Relaxed) == 2 {
 panic!("Cannot use both ChannelMonitorUpdateStatus modes InProgress and Completed without restart");
 }
 log_debug!(
 logger,
 "ChannelMonitor update in flight, holding messages until the update completes.",
 );
 false
 },
 ChannelMonitorUpdateStatus::Completed => {
 #[cfg(not(any(test, feature = "_externalize_tests")))]
 if self.monitor_update_type.swap(2, Ordering::Relaxed) == 1 {
 panic!("Cannot use both ChannelMonitorUpdateStatus modes InProgress and Completed without restart");
 }
 true
 },
 ChannelMonitorUpdateStatus::Completed => true,
 }
	}

Expand DownExpand Up@@ -19550,9 +19530,6 @@ impl<

 per_peer_state: FairRwLock::new(per_peer_state),

 #[cfg(not(any(test, feature = "_externalize_tests")))]
 monitor_update_type: AtomicUsize::new(0),

 pending_events: Mutex::new(pending_events_read),
 pending_events_processor: AtomicBool::new(false),
 pending_htlc_forwards_processor: AtomicBool::new(false),
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
Move ChannelMonitorUpdateStatus mode check from ChannelManager to ChainMonitor#4435

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

 Closed

joostjager
wants to merge
1
commit into

from

 Closed


Move ChannelMonitorUpdateStatus mode check from ChannelManager to ChainMonitor
#4435
Show file tree
Hide file tree
 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


16 changes: 14 additions & 2 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1038,13 +1038,25 @@ pub fn do_test<Out: Output + MaybeSend + MaybeSync>(
 let manager =
 <(BlockHash, ChanMan)>::read(&mut &ser[..], read_args).expect("Failed to read manager");
 let res = (manager.1, chain_monitor.clone());
 let expected_status = *mon_style[node_id as usize].borrow();
 *chain_monitor.persister.update_ret.lock().unwrap() = expected_status.clone();
 for (channel_id, mon) in monitors.drain() {
 let monitor_id = mon.get_latest_update_id();
 assert_eq!(
 chain_monitor.chain_monitor.watch_channel(channel_id, mon),
 Ok(ChannelMonitorUpdateStatus::Completed)
 Ok(expected_status.clone())
 );
 // When persistence returns InProgress, the real ChainMonitor tracks
 // the initial update_id as pending. We must mirror this in the
 // TestChainMonitor's latest_monitors so that
 // complete_all_monitor_updates can drain and complete it later.
 if expected_status == chain::ChannelMonitorUpdateStatus::InProgress {
 let mut map = chain_monitor.latest_monitors.lock().unwrap();
 if let Some(state) = map.get_mut(&channel_id) {
 state.pending_monitors.push((monitor_id, state.persisted_monitor.clone()));
 }
 }
 }
 *chain_monitor.persister.update_ret.lock().unwrap() = *mon_style[node_id as usize].borrow();
 res
	};

Expand Down

33 changes: 33 additions & 0 deletions
lightning/src/chain/chainmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -369,6 +369,12 @@ pub struct ChainMonitor<
	/// Messages to send to the peer. This is currently used to distribute PeerStorage to channel partners.
	pending_send_only_events: Mutex<Vec<MessageSendEvent>>,

	/// We only support using one of [`ChannelMonitorUpdateStatus::InProgress`] and
	/// [`ChannelMonitorUpdateStatus::Completed`] without restarting. We enforce this in non-test
	/// builds by storing which one is in use (0 = unset, 1 = InProgress, 2 = Completed).
	#[cfg(not(any(test, feature = "_externalize_tests")))]
	monitor_update_type: AtomicUsize,

	#[cfg(peer_storage)]
	our_peerstorage_encryption_key: PeerStorageKey,
}
Expand DownExpand Up@@ -412,6 +418,8 @@ where
 event_notifier: Arc::clone(&event_notifier),
 persister: AsyncPersister { persister, event_notifier },
 pending_send_only_events: Mutex::new(Vec::new()),
 #[cfg(not(any(test, feature = "_externalize_tests")))]
 monitor_update_type: AtomicUsize::new(0),
 #[cfg(peer_storage)]
 our_peerstorage_encryption_key: _our_peerstorage_encryption_key,
 }
Expand DownExpand Up@@ -617,11 +625,32 @@ where
 highest_chain_height: AtomicUsize::new(0),
 event_notifier: Arc::new(Notifier::new()),
 pending_send_only_events: Mutex::new(Vec::new()),
 #[cfg(not(any(test, feature = "_externalize_tests")))]
 monitor_update_type: AtomicUsize::new(0),
 #[cfg(peer_storage)]
 our_peerstorage_encryption_key: _our_peerstorage_encryption_key,
 }
	}

	#[cfg(not(any(test, feature = "_externalize_tests")))]
	fn check_monitor_update_type(
 monitor_update_type: &AtomicUsize, persist_res: &ChannelMonitorUpdateStatus,
	) {
 match persist_res {
 ChannelMonitorUpdateStatus::InProgress => {
 if monitor_update_type.swap(1, Ordering::Relaxed) == 2 {
 panic!("Cannot use both ChannelMonitorUpdateStatus modes InProgress and Completed without restart");
 }
 },
 ChannelMonitorUpdateStatus::Completed => {
 if monitor_update_type.swap(2, Ordering::Relaxed) == 1 {
 panic!("Cannot use both ChannelMonitorUpdateStatus modes InProgress and Completed without restart");
 }
 },
 ChannelMonitorUpdateStatus::UnrecoverableError => {},
 }
	}

	/// Gets the balances in the contained [`ChannelMonitor`]s which are claimable on-chain or
	/// claims which are awaiting confirmation.
	///
Expand DownExpand Up@@ -1285,6 +1314,8 @@ where
 let update_id = monitor.get_latest_update_id();
 let mut pending_monitor_updates = Vec::new();
 let persist_res = self.persister.persist_new_channel(monitor.persistence_key(), &monitor);
 #[cfg(not(any(test, feature = "_externalize_tests")))]
 Self::check_monitor_update_type(&self.monitor_update_type, &persist_res);
 match persist_res {
 ChannelMonitorUpdateStatus::InProgress => {
 log_info!(logger, "Persistence of new ChannelMonitor in progress",);
Expand DownExpand Up@@ -1367,6 +1398,8 @@ where
 monitor,
 )
 };
 #[cfg(not(any(test, feature = "_externalize_tests")))]
 Self::check_monitor_update_type(&self.monitor_update_type, &persist_res);
 match persist_res {
 ChannelMonitorUpdateStatus::InProgress => {
 pending_monitor_updates.push(update_id);
Expand Down

25 changes: 1 addition & 24 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2779,13 +2779,6 @@ pub struct ChannelManager<
	#[cfg(any(test, feature = "_test_utils"))]
	pub(super) per_peer_state: FairRwLock<HashMap<PublicKey, Mutex<PeerState<SP>>>>,

	/// We only support using one of [`ChannelMonitorUpdateStatus::InProgress`] and
	/// [`ChannelMonitorUpdateStatus::Completed`] without restarting. Because the API does not
	/// otherwise directly enforce this, we enforce it in non-test builds here by storing which one
	/// is in use.
	#[cfg(not(any(test, feature = "_externalize_tests")))]
	monitor_update_type: AtomicUsize,

	/// The set of events which we need to give to the user to handle. In some cases an event may
	/// require some further action after the user handles it (currently only blocking a monitor
	/// update from being handed to the user to ensure the included changes to the channel state
Expand DownExpand Up@@ -3527,9 +3520,6 @@ impl<

 per_peer_state: FairRwLock::new(new_hash_map()),

 #[cfg(not(any(test, feature = "_externalize_tests")))]
 monitor_update_type: AtomicUsize::new(0),

 pending_events: Mutex::new(VecDeque::new()),
 pending_events_processor: AtomicBool::new(false),
 pending_htlc_forwards_processor: AtomicBool::new(false),
Expand DownExpand Up@@ -10006,23 +9996,13 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 panic!("{}", err_str);
 },
 ChannelMonitorUpdateStatus::InProgress => {
 #[cfg(not(any(test, feature = "_externalize_tests")))]
 if self.monitor_update_type.swap(1, Ordering::Relaxed) == 2 {
 panic!("Cannot use both ChannelMonitorUpdateStatus modes InProgress and Completed without restart");
 }
 log_debug!(
 logger,
 "ChannelMonitor update in flight, holding messages until the update completes.",
 );
 false
 },
 ChannelMonitorUpdateStatus::Completed => {
 #[cfg(not(any(test, feature = "_externalize_tests")))]
 if self.monitor_update_type.swap(2, Ordering::Relaxed) == 1 {
 panic!("Cannot use both ChannelMonitorUpdateStatus modes InProgress and Completed without restart");
 }
 true
 },
 ChannelMonitorUpdateStatus::Completed => true,
 }
	}

Expand DownExpand Up@@ -19550,9 +19530,6 @@ impl<

 per_peer_state: FairRwLock::new(per_peer_state),

 #[cfg(not(any(test, feature = "_externalize_tests")))]
 monitor_update_type: AtomicUsize::new(0),

 pending_events: Mutex::new(pending_events_read),
 pending_events_processor: AtomicBool::new(false),
 pending_htlc_forwards_processor: AtomicBool::new(false),
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
Move ChannelMonitorUpdateStatus mode check from ChannelManager to ChainMonitor#4435

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

 Closed

joostjager
wants to merge
1
commit into

from

 Closed


Move ChannelMonitorUpdateStatus mode check from ChannelManager to ChainMonitor
#4435
Show file tree
Hide file tree
 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


16 changes: 14 additions & 2 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1038,13 +1038,25 @@ pub fn do_test<Out: Output + MaybeSend + MaybeSync>(
 let manager =
 <(BlockHash, ChanMan)>::read(&mut &ser[..], read_args).expect("Failed to read manager");
 let res = (manager.1, chain_monitor.clone());
 let expected_status = *mon_style[node_id as usize].borrow();
 *chain_monitor.persister.update_ret.lock().unwrap() = expected_status.clone();
 for (channel_id, mon) in monitors.drain() {
 let monitor_id = mon.get_latest_update_id();
 assert_eq!(
 chain_monitor.chain_monitor.watch_channel(channel_id, mon),
 Ok(ChannelMonitorUpdateStatus::Completed)
 Ok(expected_status.clone())
 );
 // When persistence returns InProgress, the real ChainMonitor tracks
 // the initial update_id as pending. We must mirror this in the
 // TestChainMonitor's latest_monitors so that
 // complete_all_monitor_updates can drain and complete it later.
 if expected_status == chain::ChannelMonitorUpdateStatus::InProgress {
 let mut map = chain_monitor.latest_monitors.lock().unwrap();
 if let Some(state) = map.get_mut(&channel_id) {
 state.pending_monitors.push((monitor_id, state.persisted_monitor.clone()));
 }
 }
 }
 *chain_monitor.persister.update_ret.lock().unwrap() = *mon_style[node_id as usize].borrow();
 res
	};

Expand Down

33 changes: 33 additions & 0 deletions
lightning/src/chain/chainmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -369,6 +369,12 @@ pub struct ChainMonitor<
	/// Messages to send to the peer. This is currently used to distribute PeerStorage to channel partners.
	pending_send_only_events: Mutex<Vec<MessageSendEvent>>,

	/// We only support using one of [`ChannelMonitorUpdateStatus::InProgress`] and
	/// [`ChannelMonitorUpdateStatus::Completed`] without restarting. We enforce this in non-test
	/// builds by storing which one is in use (0 = unset, 1 = InProgress, 2 = Completed).
	#[cfg(not(any(test, feature = "_externalize_tests")))]
	monitor_update_type: AtomicUsize,

	#[cfg(peer_storage)]
	our_peerstorage_encryption_key: PeerStorageKey,
}
Expand DownExpand Up@@ -412,6 +418,8 @@ where
 event_notifier: Arc::clone(&event_notifier),
 persister: AsyncPersister { persister, event_notifier },
 pending_send_only_events: Mutex::new(Vec::new()),
 #[cfg(not(any(test, feature = "_externalize_tests")))]
 monitor_update_type: AtomicUsize::new(0),
 #[cfg(peer_storage)]
 our_peerstorage_encryption_key: _our_peerstorage_encryption_key,
 }
Expand DownExpand Up@@ -617,11 +625,32 @@ where
 highest_chain_height: AtomicUsize::new(0),
 event_notifier: Arc::new(Notifier::new()),
 pending_send_only_events: Mutex::new(Vec::new()),
 #[cfg(not(any(test, feature = "_externalize_tests")))]
 monitor_update_type: AtomicUsize::new(0),
 #[cfg(peer_storage)]
 our_peerstorage_encryption_key: _our_peerstorage_encryption_key,
 }
	}

	#[cfg(not(any(test, feature = "_externalize_tests")))]
	fn check_monitor_update_type(
 monitor_update_type: &AtomicUsize, persist_res: &ChannelMonitorUpdateStatus,
	) {
 match persist_res {
 ChannelMonitorUpdateStatus::InProgress => {
 if monitor_update_type.swap(1, Ordering::Relaxed) == 2 {
 panic!("Cannot use both ChannelMonitorUpdateStatus modes InProgress and Completed without restart");
 }
 },
 ChannelMonitorUpdateStatus::Completed => {
 if monitor_update_type.swap(2, Ordering::Relaxed) == 1 {
 panic!("Cannot use both ChannelMonitorUpdateStatus modes InProgress and Completed without restart");
 }
 },
 ChannelMonitorUpdateStatus::UnrecoverableError => {},
 }
	}

	/// Gets the balances in the contained [`ChannelMonitor`]s which are claimable on-chain or
	/// claims which are awaiting confirmation.
	///
Expand DownExpand Up@@ -1285,6 +1314,8 @@ where
 let update_id = monitor.get_latest_update_id();
 let mut pending_monitor_updates = Vec::new();
 let persist_res = self.persister.persist_new_channel(monitor.persistence_key(), &monitor);
 #[cfg(not(any(test, feature = "_externalize_tests")))]
 Self::check_monitor_update_type(&self.monitor_update_type, &persist_res);
 match persist_res {
 ChannelMonitorUpdateStatus::InProgress => {
 log_info!(logger, "Persistence of new ChannelMonitor in progress",);
Expand DownExpand Up@@ -1367,6 +1398,8 @@ where
 monitor,
 )
 };
 #[cfg(not(any(test, feature = "_externalize_tests")))]
 Self::check_monitor_update_type(&self.monitor_update_type, &persist_res);
 match persist_res {
 ChannelMonitorUpdateStatus::InProgress => {
 pending_monitor_updates.push(update_id);
Expand Down

25 changes: 1 addition & 24 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2779,13 +2779,6 @@ pub struct ChannelManager<
	#[cfg(any(test, feature = "_test_utils"))]
	pub(super) per_peer_state: FairRwLock<HashMap<PublicKey, Mutex<PeerState<SP>>>>,

	/// We only support using one of [`ChannelMonitorUpdateStatus::InProgress`] and
	/// [`ChannelMonitorUpdateStatus::Completed`] without restarting. Because the API does not
	/// otherwise directly enforce this, we enforce it in non-test builds here by storing which one
	/// is in use.
	#[cfg(not(any(test, feature = "_externalize_tests")))]
	monitor_update_type: AtomicUsize,

	/// The set of events which we need to give to the user to handle. In some cases an event may
	/// require some further action after the user handles it (currently only blocking a monitor
	/// update from being handed to the user to ensure the included changes to the channel state
Expand DownExpand Up@@ -3527,9 +3520,6 @@ impl<

 per_peer_state: FairRwLock::new(new_hash_map()),

 #[cfg(not(any(test, feature = "_externalize_tests")))]
 monitor_update_type: AtomicUsize::new(0),

 pending_events: Mutex::new(VecDeque::new()),
 pending_events_processor: AtomicBool::new(false),
 pending_htlc_forwards_processor: AtomicBool::new(false),
Expand DownExpand Up@@ -10006,23 +9996,13 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 panic!("{}", err_str);
 },
 ChannelMonitorUpdateStatus::InProgress => {
 #[cfg(not(any(test, feature = "_externalize_tests")))]
 if self.monitor_update_type.swap(1, Ordering::Relaxed) == 2 {
 panic!("Cannot use both ChannelMonitorUpdateStatus modes InProgress and Completed without restart");
 }
 log_debug!(
 logger,
 "ChannelMonitor update in flight, holding messages until the update completes.",
 );
 false
 },
 ChannelMonitorUpdateStatus::Completed => {
 #[cfg(not(any(test, feature = "_externalize_tests")))]
 if self.monitor_update_type.swap(2, Ordering::Relaxed) == 1 {
 panic!("Cannot use both ChannelMonitorUpdateStatus modes InProgress and Completed without restart");
 }
 true
 },
 ChannelMonitorUpdateStatus::Completed => true,
 }
	}

Expand DownExpand Up@@ -19550,9 +19530,6 @@ impl<

 per_peer_state: FairRwLock::new(per_peer_state),

 #[cfg(not(any(test, feature = "_externalize_tests")))]
 monitor_update_type: AtomicUsize::new(0),

 pending_events: Mutex::new(pending_events_read),
 pending_events_processor: AtomicBool::new(false),
 pending_htlc_forwards_processor: AtomicBool::new(false),
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
Move ChannelMonitorUpdateStatus mode check from ChannelManager to ChainMonitor#4435

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

 Closed

joostjager
wants to merge
1
commit into

from

 Closed


Move ChannelMonitorUpdateStatus mode check from ChannelManager to ChainMonitor
#4435
Show file tree
Hide file tree
 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


16 changes: 14 additions & 2 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1038,13 +1038,25 @@ pub fn do_test<Out: Output + MaybeSend + MaybeSync>(
 let manager =
 <(BlockHash, ChanMan)>::read(&mut &ser[..], read_args).expect("Failed to read manager");
 let res = (manager.1, chain_monitor.clone());
 let expected_status = *mon_style[node_id as usize].borrow();
 *chain_monitor.persister.update_ret.lock().unwrap() = expected_status.clone();
 for (channel_id, mon) in monitors.drain() {
 let monitor_id = mon.get_latest_update_id();
 assert_eq!(
 chain_monitor.chain_monitor.watch_channel(channel_id, mon),
 Ok(ChannelMonitorUpdateStatus::Completed)
 Ok(expected_status.clone())
 );
 // When persistence returns InProgress, the real ChainMonitor tracks
 // the initial update_id as pending. We must mirror this in the
 // TestChainMonitor's latest_monitors so that
 // complete_all_monitor_updates can drain and complete it later.
 if expected_status == chain::ChannelMonitorUpdateStatus::InProgress {
 let mut map = chain_monitor.latest_monitors.lock().unwrap();
 if let Some(state) = map.get_mut(&channel_id) {
 state.pending_monitors.push((monitor_id, state.persisted_monitor.clone()));
 }
 }
 }
 *chain_monitor.persister.update_ret.lock().unwrap() = *mon_style[node_id as usize].borrow();
 res
	};

Expand Down

33 changes: 33 additions & 0 deletions
lightning/src/chain/chainmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -369,6 +369,12 @@ pub struct ChainMonitor<
	/// Messages to send to the peer. This is currently used to distribute PeerStorage to channel partners.
	pending_send_only_events: Mutex<Vec<MessageSendEvent>>,

	/// We only support using one of [`ChannelMonitorUpdateStatus::InProgress`] and
	/// [`ChannelMonitorUpdateStatus::Completed`] without restarting. We enforce this in non-test
	/// builds by storing which one is in use (0 = unset, 1 = InProgress, 2 = Completed).
	#[cfg(not(any(test, feature = "_externalize_tests")))]
	monitor_update_type: AtomicUsize,

	#[cfg(peer_storage)]
	our_peerstorage_encryption_key: PeerStorageKey,
}
Expand DownExpand Up@@ -412,6 +418,8 @@ where
 event_notifier: Arc::clone(&event_notifier),
 persister: AsyncPersister { persister, event_notifier },
 pending_send_only_events: Mutex::new(Vec::new()),
 #[cfg(not(any(test, feature = "_externalize_tests")))]
 monitor_update_type: AtomicUsize::new(0),
 #[cfg(peer_storage)]
 our_peerstorage_encryption_key: _our_peerstorage_encryption_key,
 }
Expand DownExpand Up@@ -617,11 +625,32 @@ where
 highest_chain_height: AtomicUsize::new(0),
 event_notifier: Arc::new(Notifier::new()),
 pending_send_only_events: Mutex::new(Vec::new()),
 #[cfg(not(any(test, feature = "_externalize_tests")))]
 monitor_update_type: AtomicUsize::new(0),
 #[cfg(peer_storage)]
 our_peerstorage_encryption_key: _our_peerstorage_encryption_key,
 }
	}

	#[cfg(not(any(test, feature = "_externalize_tests")))]
	fn check_monitor_update_type(
 monitor_update_type: &AtomicUsize, persist_res: &ChannelMonitorUpdateStatus,
	) {
 match persist_res {
 ChannelMonitorUpdateStatus::InProgress => {
 if monitor_update_type.swap(1, Ordering::Relaxed) == 2 {
 panic!("Cannot use both ChannelMonitorUpdateStatus modes InProgress and Completed without restart");
 }
 },
 ChannelMonitorUpdateStatus::Completed => {
 if monitor_update_type.swap(2, Ordering::Relaxed) == 1 {
 panic!("Cannot use both ChannelMonitorUpdateStatus modes InProgress and Completed without restart");
 }
 },
 ChannelMonitorUpdateStatus::UnrecoverableError => {},
 }
	}

	/// Gets the balances in the contained [`ChannelMonitor`]s which are claimable on-chain or
	/// claims which are awaiting confirmation.
	///
Expand DownExpand Up@@ -1285,6 +1314,8 @@ where
 let update_id = monitor.get_latest_update_id();
 let mut pending_monitor_updates = Vec::new();
 let persist_res = self.persister.persist_new_channel(monitor.persistence_key(), &monitor);
 #[cfg(not(any(test, feature = "_externalize_tests")))]
 Self::check_monitor_update_type(&self.monitor_update_type, &persist_res);
 match persist_res {
 ChannelMonitorUpdateStatus::InProgress => {
 log_info!(logger, "Persistence of new ChannelMonitor in progress",);
Expand DownExpand Up@@ -1367,6 +1398,8 @@ where
 monitor,
 )
 };
 #[cfg(not(any(test, feature = "_externalize_tests")))]
 Self::check_monitor_update_type(&self.monitor_update_type, &persist_res);
 match persist_res {
 ChannelMonitorUpdateStatus::InProgress => {
 pending_monitor_updates.push(update_id);
Expand Down

25 changes: 1 addition & 24 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2779,13 +2779,6 @@ pub struct ChannelManager<
	#[cfg(any(test, feature = "_test_utils"))]
	pub(super) per_peer_state: FairRwLock<HashMap<PublicKey, Mutex<PeerState<SP>>>>,

	/// We only support using one of [`ChannelMonitorUpdateStatus::InProgress`] and
	/// [`ChannelMonitorUpdateStatus::Completed`] without restarting. Because the API does not
	/// otherwise directly enforce this, we enforce it in non-test builds here by storing which one
	/// is in use.
	#[cfg(not(any(test, feature = "_externalize_tests")))]
	monitor_update_type: AtomicUsize,

	/// The set of events which we need to give to the user to handle. In some cases an event may
	/// require some further action after the user handles it (currently only blocking a monitor
	/// update from being handed to the user to ensure the included changes to the channel state
Expand DownExpand Up@@ -3527,9 +3520,6 @@ impl<

 per_peer_state: FairRwLock::new(new_hash_map()),

 #[cfg(not(any(test, feature = "_externalize_tests")))]
 monitor_update_type: AtomicUsize::new(0),

 pending_events: Mutex::new(VecDeque::new()),
 pending_events_processor: AtomicBool::new(false),
 pending_htlc_forwards_processor: AtomicBool::new(false),
Expand DownExpand Up@@ -10006,23 +9996,13 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 panic!("{}", err_str);
 },
 ChannelMonitorUpdateStatus::InProgress => {
 #[cfg(not(any(test, feature = "_externalize_tests")))]
 if self.monitor_update_type.swap(1, Ordering::Relaxed) == 2 {
 panic!("Cannot use both ChannelMonitorUpdateStatus modes InProgress and Completed without restart");
 }
 log_debug!(
 logger,
 "ChannelMonitor update in flight, holding messages until the update completes.",
 );
 false
 },
 ChannelMonitorUpdateStatus::Completed => {
 #[cfg(not(any(test, feature = "_externalize_tests")))]
 if self.monitor_update_type.swap(2, Ordering::Relaxed) == 1 {
 panic!("Cannot use both ChannelMonitorUpdateStatus modes InProgress and Completed without restart");
 }
 true
 },
 ChannelMonitorUpdateStatus::Completed => true,
 }
	}

Expand DownExpand Up@@ -19550,9 +19530,6 @@ impl<

 per_peer_state: FairRwLock::new(per_peer_state),

 #[cfg(not(any(test, feature = "_externalize_tests")))]
 monitor_update_type: AtomicUsize::new(0),

 pending_events: Mutex::new(pending_events_read),
 pending_events_processor: AtomicBool::new(false),
 pending_htlc_forwards_processor: AtomicBool::new(false),
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
Move ChannelMonitorUpdateStatus mode check from ChannelManager to ChainMonitor#4435

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

 Closed

joostjager
wants to merge
1
commit into

from

 Closed


Move ChannelMonitorUpdateStatus mode check from ChannelManager to ChainMonitor
#4435
Show file tree
Hide file tree
 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


16 changes: 14 additions & 2 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1038,13 +1038,25 @@ pub fn do_test<Out: Output + MaybeSend + MaybeSync>(
 let manager =
 <(BlockHash, ChanMan)>::read(&mut &ser[..], read_args).expect("Failed to read manager");
 let res = (manager.1, chain_monitor.clone());
 let expected_status = *mon_style[node_id as usize].borrow();
 *chain_monitor.persister.update_ret.lock().unwrap() = expected_status.clone();
 for (channel_id, mon) in monitors.drain() {
 let monitor_id = mon.get_latest_update_id();
 assert_eq!(
 chain_monitor.chain_monitor.watch_channel(channel_id, mon),
 Ok(ChannelMonitorUpdateStatus::Completed)
 Ok(expected_status.clone())
 );
 // When persistence returns InProgress, the real ChainMonitor tracks
 // the initial update_id as pending. We must mirror this in the
 // TestChainMonitor's latest_monitors so that
 // complete_all_monitor_updates can drain and complete it later.
 if expected_status == chain::ChannelMonitorUpdateStatus::InProgress {
 let mut map = chain_monitor.latest_monitors.lock().unwrap();
 if let Some(state) = map.get_mut(&channel_id) {
 state.pending_monitors.push((monitor_id, state.persisted_monitor.clone()));
 }
 }
 }
 *chain_monitor.persister.update_ret.lock().unwrap() = *mon_style[node_id as usize].borrow();
 res
	};

Expand Down

33 changes: 33 additions & 0 deletions
lightning/src/chain/chainmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -369,6 +369,12 @@ pub struct ChainMonitor<
	/// Messages to send to the peer. This is currently used to distribute PeerStorage to channel partners.
	pending_send_only_events: Mutex<Vec<MessageSendEvent>>,

	/// We only support using one of [`ChannelMonitorUpdateStatus::InProgress`] and
	/// [`ChannelMonitorUpdateStatus::Completed`] without restarting. We enforce this in non-test
	/// builds by storing which one is in use (0 = unset, 1 = InProgress, 2 = Completed).
	#[cfg(not(any(test, feature = "_externalize_tests")))]
	monitor_update_type: AtomicUsize,

	#[cfg(peer_storage)]
	our_peerstorage_encryption_key: PeerStorageKey,
}
Expand DownExpand Up@@ -412,6 +418,8 @@ where
 event_notifier: Arc::clone(&event_notifier),
 persister: AsyncPersister { persister, event_notifier },
 pending_send_only_events: Mutex::new(Vec::new()),
 #[cfg(not(any(test, feature = "_externalize_tests")))]
 monitor_update_type: AtomicUsize::new(0),
 #[cfg(peer_storage)]
 our_peerstorage_encryption_key: _our_peerstorage_encryption_key,
 }
Expand DownExpand Up@@ -617,11 +625,32 @@ where
 highest_chain_height: AtomicUsize::new(0),
 event_notifier: Arc::new(Notifier::new()),
 pending_send_only_events: Mutex::new(Vec::new()),
 #[cfg(not(any(test, feature = "_externalize_tests")))]
 monitor_update_type: AtomicUsize::new(0),
 #[cfg(peer_storage)]
 our_peerstorage_encryption_key: _our_peerstorage_encryption_key,
 }
	}

	#[cfg(not(any(test, feature = "_externalize_tests")))]
	fn check_monitor_update_type(
 monitor_update_type: &AtomicUsize, persist_res: &ChannelMonitorUpdateStatus,
	) {
 match persist_res {
 ChannelMonitorUpdateStatus::InProgress => {
 if monitor_update_type.swap(1, Ordering::Relaxed) == 2 {
 panic!("Cannot use both ChannelMonitorUpdateStatus modes InProgress and Completed without restart");
 }
 },
 ChannelMonitorUpdateStatus::Completed => {
 if monitor_update_type.swap(2, Ordering::Relaxed) == 1 {
 panic!("Cannot use both ChannelMonitorUpdateStatus modes InProgress and Completed without restart");
 }
 },
 ChannelMonitorUpdateStatus::UnrecoverableError => {},
 }
	}

	/// Gets the balances in the contained [`ChannelMonitor`]s which are claimable on-chain or
	/// claims which are awaiting confirmation.
	///
Expand DownExpand Up@@ -1285,6 +1314,8 @@ where
 let update_id = monitor.get_latest_update_id();
 let mut pending_monitor_updates = Vec::new();
 let persist_res = self.persister.persist_new_channel(monitor.persistence_key(), &monitor);
 #[cfg(not(any(test, feature = "_externalize_tests")))]
 Self::check_monitor_update_type(&self.monitor_update_type, &persist_res);
 match persist_res {
 ChannelMonitorUpdateStatus::InProgress => {
 log_info!(logger, "Persistence of new ChannelMonitor in progress",);
Expand DownExpand Up@@ -1367,6 +1398,8 @@ where
 monitor,
 )
 };
 #[cfg(not(any(test, feature = "_externalize_tests")))]
 Self::check_monitor_update_type(&self.monitor_update_type, &persist_res);
 match persist_res {
 ChannelMonitorUpdateStatus::InProgress => {
 pending_monitor_updates.push(update_id);
Expand Down

25 changes: 1 addition & 24 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2779,13 +2779,6 @@ pub struct ChannelManager<
	#[cfg(any(test, feature = "_test_utils"))]
	pub(super) per_peer_state: FairRwLock<HashMap<PublicKey, Mutex<PeerState<SP>>>>,

	/// We only support using one of [`ChannelMonitorUpdateStatus::InProgress`] and
	/// [`ChannelMonitorUpdateStatus::Completed`] without restarting. Because the API does not
	/// otherwise directly enforce this, we enforce it in non-test builds here by storing which one
	/// is in use.
	#[cfg(not(any(test, feature = "_externalize_tests")))]
	monitor_update_type: AtomicUsize,

	/// The set of events which we need to give to the user to handle. In some cases an event may
	/// require some further action after the user handles it (currently only blocking a monitor
	/// update from being handed to the user to ensure the included changes to the channel state
Expand DownExpand Up@@ -3527,9 +3520,6 @@ impl<

 per_peer_state: FairRwLock::new(new_hash_map()),

 #[cfg(not(any(test, feature = "_externalize_tests")))]
 monitor_update_type: AtomicUsize::new(0),

 pending_events: Mutex::new(VecDeque::new()),
 pending_events_processor: AtomicBool::new(false),
 pending_htlc_forwards_processor: AtomicBool::new(false),
Expand DownExpand Up@@ -10006,23 +9996,13 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 panic!("{}", err_str);
 },
 ChannelMonitorUpdateStatus::InProgress => {
 #[cfg(not(any(test, feature = "_externalize_tests")))]
 if self.monitor_update_type.swap(1, Ordering::Relaxed) == 2 {
 panic!("Cannot use both ChannelMonitorUpdateStatus modes InProgress and Completed without restart");
 }
 log_debug!(
 logger,
 "ChannelMonitor update in flight, holding messages until the update completes.",
 );
 false
 },
 ChannelMonitorUpdateStatus::Completed => {
 #[cfg(not(any(test, feature = "_externalize_tests")))]
 if self.monitor_update_type.swap(2, Ordering::Relaxed) == 1 {
 panic!("Cannot use both ChannelMonitorUpdateStatus modes InProgress and Completed without restart");
 }
 true
 },
 ChannelMonitorUpdateStatus::Completed => true,
 }
	}

Expand DownExpand Up@@ -19550,9 +19530,6 @@ impl<

 per_peer_state: FairRwLock::new(per_peer_state),

 #[cfg(not(any(test, feature = "_externalize_tests")))]
 monitor_update_type: AtomicUsize::new(0),

 pending_events: Mutex::new(pending_events_read),
 pending_events_processor: AtomicBool::new(false),
 pending_htlc_forwards_processor: AtomicBool::new(false),
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
Move ChannelMonitorUpdateStatus mode check from ChannelManager to ChainMonitor#4435

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

 Closed

joostjager
wants to merge
1
commit into

from

 Closed


Move ChannelMonitorUpdateStatus mode check from ChannelManager to ChainMonitor
#4435
Show file tree
Hide file tree
 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


16 changes: 14 additions & 2 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1038,13 +1038,25 @@ pub fn do_test<Out: Output + MaybeSend + MaybeSync>(
 let manager =
 <(BlockHash, ChanMan)>::read(&mut &ser[..], read_args).expect("Failed to read manager");
 let res = (manager.1, chain_monitor.clone());
 let expected_status = *mon_style[node_id as usize].borrow();
 *chain_monitor.persister.update_ret.lock().unwrap() = expected_status.clone();
 for (channel_id, mon) in monitors.drain() {
 let monitor_id = mon.get_latest_update_id();
 assert_eq!(
 chain_monitor.chain_monitor.watch_channel(channel_id, mon),
 Ok(ChannelMonitorUpdateStatus::Completed)
 Ok(expected_status.clone())
 );
 // When persistence returns InProgress, the real ChainMonitor tracks
 // the initial update_id as pending. We must mirror this in the
 // TestChainMonitor's latest_monitors so that
 // complete_all_monitor_updates can drain and complete it later.
 if expected_status == chain::ChannelMonitorUpdateStatus::InProgress {
 let mut map = chain_monitor.latest_monitors.lock().unwrap();
 if let Some(state) = map.get_mut(&channel_id) {
 state.pending_monitors.push((monitor_id, state.persisted_monitor.clone()));
 }
 }
 }
 *chain_monitor.persister.update_ret.lock().unwrap() = *mon_style[node_id as usize].borrow();
 res
	};

Expand Down

33 changes: 33 additions & 0 deletions
lightning/src/chain/chainmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -369,6 +369,12 @@ pub struct ChainMonitor<
	/// Messages to send to the peer. This is currently used to distribute PeerStorage to channel partners.
	pending_send_only_events: Mutex<Vec<MessageSendEvent>>,

	/// We only support using one of [`ChannelMonitorUpdateStatus::InProgress`] and
	/// [`ChannelMonitorUpdateStatus::Completed`] without restarting. We enforce this in non-test
	/// builds by storing which one is in use (0 = unset, 1 = InProgress, 2 = Completed).
	#[cfg(not(any(test, feature = "_externalize_tests")))]
	monitor_update_type: AtomicUsize,

	#[cfg(peer_storage)]
	our_peerstorage_encryption_key: PeerStorageKey,
}
Expand DownExpand Up@@ -412,6 +418,8 @@ where
 event_notifier: Arc::clone(&event_notifier),
 persister: AsyncPersister { persister, event_notifier },
 pending_send_only_events: Mutex::new(Vec::new()),
 #[cfg(not(any(test, feature = "_externalize_tests")))]
 monitor_update_type: AtomicUsize::new(0),
 #[cfg(peer_storage)]
 our_peerstorage_encryption_key: _our_peerstorage_encryption_key,
 }
Expand DownExpand Up@@ -617,11 +625,32 @@ where
 highest_chain_height: AtomicUsize::new(0),
 event_notifier: Arc::new(Notifier::new()),
 pending_send_only_events: Mutex::new(Vec::new()),
 #[cfg(not(any(test, feature = "_externalize_tests")))]
 monitor_update_type: AtomicUsize::new(0),
 #[cfg(peer_storage)]
 our_peerstorage_encryption_key: _our_peerstorage_encryption_key,
 }
	}

	#[cfg(not(any(test, feature = "_externalize_tests")))]
	fn check_monitor_update_type(
 monitor_update_type: &AtomicUsize, persist_res: &ChannelMonitorUpdateStatus,
	) {
 match persist_res {
 ChannelMonitorUpdateStatus::InProgress => {
 if monitor_update_type.swap(1, Ordering::Relaxed) == 2 {
 panic!("Cannot use both ChannelMonitorUpdateStatus modes InProgress and Completed without restart");
 }
 },
 ChannelMonitorUpdateStatus::Completed => {
 if monitor_update_type.swap(2, Ordering::Relaxed) == 1 {
 panic!("Cannot use both ChannelMonitorUpdateStatus modes InProgress and Completed without restart");
 }
 },
 ChannelMonitorUpdateStatus::UnrecoverableError => {},
 }
	}

	/// Gets the balances in the contained [`ChannelMonitor`]s which are claimable on-chain or
	/// claims which are awaiting confirmation.
	///
Expand DownExpand Up@@ -1285,6 +1314,8 @@ where
 let update_id = monitor.get_latest_update_id();
 let mut pending_monitor_updates = Vec::new();
 let persist_res = self.persister.persist_new_channel(monitor.persistence_key(), &monitor);
 #[cfg(not(any(test, feature = "_externalize_tests")))]
 Self::check_monitor_update_type(&self.monitor_update_type, &persist_res);
 match persist_res {
 ChannelMonitorUpdateStatus::InProgress => {
 log_info!(logger, "Persistence of new ChannelMonitor in progress",);
Expand DownExpand Up@@ -1367,6 +1398,8 @@ where
 monitor,
 )
 };
 #[cfg(not(any(test, feature = "_externalize_tests")))]
 Self::check_monitor_update_type(&self.monitor_update_type, &persist_res);
 match persist_res {
 ChannelMonitorUpdateStatus::InProgress => {
 pending_monitor_updates.push(update_id);
Expand Down

25 changes: 1 addition & 24 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2779,13 +2779,6 @@ pub struct ChannelManager<
	#[cfg(any(test, feature = "_test_utils"))]
	pub(super) per_peer_state: FairRwLock<HashMap<PublicKey, Mutex<PeerState<SP>>>>,

	/// We only support using one of [`ChannelMonitorUpdateStatus::InProgress`] and
	/// [`ChannelMonitorUpdateStatus::Completed`] without restarting. Because the API does not
	/// otherwise directly enforce this, we enforce it in non-test builds here by storing which one
	/// is in use.
	#[cfg(not(any(test, feature = "_externalize_tests")))]
	monitor_update_type: AtomicUsize,

	/// The set of events which we need to give to the user to handle. In some cases an event may
	/// require some further action after the user handles it (currently only blocking a monitor
	/// update from being handed to the user to ensure the included changes to the channel state
Expand DownExpand Up@@ -3527,9 +3520,6 @@ impl<

 per_peer_state: FairRwLock::new(new_hash_map()),

 #[cfg(not(any(test, feature = "_externalize_tests")))]
 monitor_update_type: AtomicUsize::new(0),

 pending_events: Mutex::new(VecDeque::new()),
 pending_events_processor: AtomicBool::new(false),
 pending_htlc_forwards_processor: AtomicBool::new(false),
Expand DownExpand Up@@ -10006,23 +9996,13 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 panic!("{}", err_str);
 },
 ChannelMonitorUpdateStatus::InProgress => {
 #[cfg(not(any(test, feature = "_externalize_tests")))]
 if self.monitor_update_type.swap(1, Ordering::Relaxed) == 2 {
 panic!("Cannot use both ChannelMonitorUpdateStatus modes InProgress and Completed without restart");
 }
 log_debug!(
 logger,
 "ChannelMonitor update in flight, holding messages until the update completes.",
 );
 false
 },
 ChannelMonitorUpdateStatus::Completed => {
 #[cfg(not(any(test, feature = "_externalize_tests")))]
 if self.monitor_update_type.swap(2, Ordering::Relaxed) == 1 {
 panic!("Cannot use both ChannelMonitorUpdateStatus modes InProgress and Completed without restart");
 }
 true
 },
 ChannelMonitorUpdateStatus::Completed => true,
 }
	}

Expand DownExpand Up@@ -19550,9 +19530,6 @@ impl<

 per_peer_state: FairRwLock::new(per_peer_state),

 #[cfg(not(any(test, feature = "_externalize_tests")))]
 monitor_update_type: AtomicUsize::new(0),

 pending_events: Mutex::new(pending_events_read),
 pending_events_processor: AtomicBool::new(false),
 pending_htlc_forwards_processor: AtomicBool::new(false),
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
Move ChannelMonitorUpdateStatus mode check from ChannelManager to ChainMonitor#4435

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

 Closed

joostjager
wants to merge
1
commit into

from

 Closed


Move ChannelMonitorUpdateStatus mode check from ChannelManager to ChainMonitor
#4435
Show file tree
Hide file tree
 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


16 changes: 14 additions & 2 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1038,13 +1038,25 @@ pub fn do_test<Out: Output + MaybeSend + MaybeSync>(
 let manager =
 <(BlockHash, ChanMan)>::read(&mut &ser[..], read_args).expect("Failed to read manager");
 let res = (manager.1, chain_monitor.clone());
 let expected_status = *mon_style[node_id as usize].borrow();
 *chain_monitor.persister.update_ret.lock().unwrap() = expected_status.clone();
 for (channel_id, mon) in monitors.drain() {
 let monitor_id = mon.get_latest_update_id();
 assert_eq!(
 chain_monitor.chain_monitor.watch_channel(channel_id, mon),
 Ok(ChannelMonitorUpdateStatus::Completed)
 Ok(expected_status.clone())
 );
 // When persistence returns InProgress, the real ChainMonitor tracks
 // the initial update_id as pending. We must mirror this in the
 // TestChainMonitor's latest_monitors so that
 // complete_all_monitor_updates can drain and complete it later.
 if expected_status == chain::ChannelMonitorUpdateStatus::InProgress {
 let mut map = chain_monitor.latest_monitors.lock().unwrap();
 if let Some(state) = map.get_mut(&channel_id) {
 state.pending_monitors.push((monitor_id, state.persisted_monitor.clone()));
 }
 }
 }
 *chain_monitor.persister.update_ret.lock().unwrap() = *mon_style[node_id as usize].borrow();
 res
	};

Expand Down

33 changes: 33 additions & 0 deletions
lightning/src/chain/chainmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -369,6 +369,12 @@ pub struct ChainMonitor<
	/// Messages to send to the peer. This is currently used to distribute PeerStorage to channel partners.
	pending_send_only_events: Mutex<Vec<MessageSendEvent>>,

	/// We only support using one of [`ChannelMonitorUpdateStatus::InProgress`] and
	/// [`ChannelMonitorUpdateStatus::Completed`] without restarting. We enforce this in non-test
	/// builds by storing which one is in use (0 = unset, 1 = InProgress, 2 = Completed).
	#[cfg(not(any(test, feature = "_externalize_tests")))]
	monitor_update_type: AtomicUsize,

	#[cfg(peer_storage)]
	our_peerstorage_encryption_key: PeerStorageKey,
}
Expand DownExpand Up@@ -412,6 +418,8 @@ where
 event_notifier: Arc::clone(&event_notifier),
 persister: AsyncPersister { persister, event_notifier },
 pending_send_only_events: Mutex::new(Vec::new()),
 #[cfg(not(any(test, feature = "_externalize_tests")))]
 monitor_update_type: AtomicUsize::new(0),
 #[cfg(peer_storage)]
 our_peerstorage_encryption_key: _our_peerstorage_encryption_key,
 }
Expand DownExpand Up@@ -617,11 +625,32 @@ where
 highest_chain_height: AtomicUsize::new(0),
 event_notifier: Arc::new(Notifier::new()),
 pending_send_only_events: Mutex::new(Vec::new()),
 #[cfg(not(any(test, feature = "_externalize_tests")))]
 monitor_update_type: AtomicUsize::new(0),
 #[cfg(peer_storage)]
 our_peerstorage_encryption_key: _our_peerstorage_encryption_key,
 }
	}

	#[cfg(not(any(test, feature = "_externalize_tests")))]
	fn check_monitor_update_type(
 monitor_update_type: &AtomicUsize, persist_res: &ChannelMonitorUpdateStatus,
	) {
 match persist_res {
 ChannelMonitorUpdateStatus::InProgress => {
 if monitor_update_type.swap(1, Ordering::Relaxed) == 2 {
 panic!("Cannot use both ChannelMonitorUpdateStatus modes InProgress and Completed without restart");
 }
 },
 ChannelMonitorUpdateStatus::Completed => {
 if monitor_update_type.swap(2, Ordering::Relaxed) == 1 {
 panic!("Cannot use both ChannelMonitorUpdateStatus modes InProgress and Completed without restart");
 }
 },
 ChannelMonitorUpdateStatus::UnrecoverableError => {},
 }
	}

	/// Gets the balances in the contained [`ChannelMonitor`]s which are claimable on-chain or
	/// claims which are awaiting confirmation.
	///
Expand DownExpand Up@@ -1285,6 +1314,8 @@ where
 let update_id = monitor.get_latest_update_id();
 let mut pending_monitor_updates = Vec::new();
 let persist_res = self.persister.persist_new_channel(monitor.persistence_key(), &monitor);
 #[cfg(not(any(test, feature = "_externalize_tests")))]
 Self::check_monitor_update_type(&self.monitor_update_type, &persist_res);
 match persist_res {
 ChannelMonitorUpdateStatus::InProgress => {
 log_info!(logger, "Persistence of new ChannelMonitor in progress",);
Expand DownExpand Up@@ -1367,6 +1398,8 @@ where
 monitor,
 )
 };
 #[cfg(not(any(test, feature = "_externalize_tests")))]
 Self::check_monitor_update_type(&self.monitor_update_type, &persist_res);
 match persist_res {
 ChannelMonitorUpdateStatus::InProgress => {
 pending_monitor_updates.push(update_id);
Expand Down

25 changes: 1 addition & 24 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2779,13 +2779,6 @@ pub struct ChannelManager<
	#[cfg(any(test, feature = "_test_utils"))]
	pub(super) per_peer_state: FairRwLock<HashMap<PublicKey, Mutex<PeerState<SP>>>>,

	/// We only support using one of [`ChannelMonitorUpdateStatus::InProgress`] and
	/// [`ChannelMonitorUpdateStatus::Completed`] without restarting. Because the API does not
	/// otherwise directly enforce this, we enforce it in non-test builds here by storing which one
	/// is in use.
	#[cfg(not(any(test, feature = "_externalize_tests")))]
	monitor_update_type: AtomicUsize,

	/// The set of events which we need to give to the user to handle. In some cases an event may
	/// require some further action after the user handles it (currently only blocking a monitor
	/// update from being handed to the user to ensure the included changes to the channel state
Expand DownExpand Up@@ -3527,9 +3520,6 @@ impl<

 per_peer_state: FairRwLock::new(new_hash_map()),

 #[cfg(not(any(test, feature = "_externalize_tests")))]
 monitor_update_type: AtomicUsize::new(0),

 pending_events: Mutex::new(VecDeque::new()),
 pending_events_processor: AtomicBool::new(false),
 pending_htlc_forwards_processor: AtomicBool::new(false),
Expand DownExpand Up@@ -10006,23 +9996,13 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 panic!("{}", err_str);
 },
 ChannelMonitorUpdateStatus::InProgress => {
 #[cfg(not(any(test, feature = "_externalize_tests")))]
 if self.monitor_update_type.swap(1, Ordering::Relaxed) == 2 {
 panic!("Cannot use both ChannelMonitorUpdateStatus modes InProgress and Completed without restart");
 }
 log_debug!(
 logger,
 "ChannelMonitor update in flight, holding messages until the update completes.",
 );
 false
 },
 ChannelMonitorUpdateStatus::Completed => {
 #[cfg(not(any(test, feature = "_externalize_tests")))]
 if self.monitor_update_type.swap(2, Ordering::Relaxed) == 1 {
 panic!("Cannot use both ChannelMonitorUpdateStatus modes InProgress and Completed without restart");
 }
 true
 },
 ChannelMonitorUpdateStatus::Completed => true,
 }
	}

Expand DownExpand Up@@ -19550,9 +19530,6 @@ impl<

 per_peer_state: FairRwLock::new(per_peer_state),

 #[cfg(not(any(test, feature = "_externalize_tests")))]
 monitor_update_type: AtomicUsize::new(0),

 pending_events: Mutex::new(pending_events_read),
 pending_events_processor: AtomicBool::new(false),
 pending_htlc_forwards_processor: AtomicBool::new(false),
Expand Down
Loading