Use interior mutability in ChannelMonitor#813

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
TheBlueMatt merged 4 commits into from
Mar 2, 2021
Merged

Use interior mutability in ChannelMonitor #813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b0978a8
Move ChannelMonitor state behind a Mutex
jkczyz Mar 1, 2021
8e558fe
Use consistent variable naming in ChainMonitor
jkczyz Mar 1, 2021
389c4ad
Change Mutex to RwLock in ChainMonitor
jkczyz Mar 1, 2021
e8ea0d9
Implement chain::Listen without using RefCell
jkczyz Mar 1, 2021
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
2 changes: 1 addition & 1 deletion fuzz/src/chanmon_consistency.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,7 +126,7 @@ impl chain::Watch<EnforcingSigner> for TestChainMonitor {
hash_map::Entry::Occupied(entry) => entry,
hash_map::Entry::Vacant(_) => panic!("Didn't have monitor on update call"),
};
let mut deserialized_monitor = <(BlockHash, channelmonitor::ChannelMonitor<EnforcingSigner>)>::
let deserialized_monitor = <(BlockHash, channelmonitor::ChannelMonitor<EnforcingSigner>)>::
read(&mut Cursor::new(&map_entry.get().1), &OnlyReadsKeysInterface {}).unwrap().1;
deserialized_monitor.update_monitor(&update, &&TestBroadcaster{}, &&FuzzEstimator{}, &self.logger).unwrap();
let mut ser = VecWriter(Vec::new());
Expand Down
5 changes: 2 additions & 3 deletions lightning-block-sync/src/init.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,6 @@ use lightning::chain;
///
/// use lightning_block_sync::*;
///
/// use std::cell::RefCell;
/// use std::io::Cursor;
///
/// async fn init_sync<
Expand DownExpand Up@@ -83,7 +82,7 @@ use lightning::chain;
///
/// // Synchronize any channel monitors and the channel manager to be on the best block.
/// let mut cache = UnboundedCache::new();
/// let mut monitor_listener = (RefCell::new(monitor), &*tx_broadcaster, &*fee_estimator, &*logger);
/// let mut monitor_listener = (monitor, &*tx_broadcaster, &*fee_estimator, &*logger);
/// let listeners = vec![
/// (monitor_block_hash, &mut monitor_listener as &mut dyn chain::Listen),
/// (manager_block_hash, &mut manager as &mut dyn chain::Listen),
Expand All@@ -92,7 +91,7 @@ use lightning::chain;
/// block_source, Network::Bitcoin, &mut cache, listeners).await.unwrap();
///
/// // Allow the chain monitor to watch any channels.
/// let monitor = monitor_listener.0.into_inner();
/// let monitor = monitor_listener.0;
/// chain_monitor.watch_channel(monitor.get_funding_txo().0, monitor);
///
/// // Create an SPV client to notify the chain monitor and channel manager of block events.
Expand Down
36 changes: 18 additions & 18 deletions lightning/src/chain/chainmonitor.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ use util::events;
use util::events::Event;

use std::collections::{HashMap, hash_map};
use std::sync::Mutex;
use std::sync::RwLock;
use std::ops::Deref;

/// An implementation of [`chain::Watch`] for monitoring channels.
Expand All@@ -64,7 +64,7 @@ pub struct ChainMonitor<ChannelSigner: Sign, C: Deref, T: Deref, F: Deref, L: De
P::Target: channelmonitor::Persist<ChannelSigner>,
{
/// The monitors
pub monitors: Mutex<HashMap<OutPoint, ChannelMonitor<ChannelSigner>>>,
pub monitors: RwLock<HashMap<OutPoint, ChannelMonitor<ChannelSigner>>>,
chain_source: Option<C>,
broadcaster: T,
logger: L,
Expand DownExpand Up@@ -93,8 +93,8 @@ where C::Target: chain::Filter,
/// [`chain::Watch::release_pending_monitor_events`]: ../trait.Watch.html#tymethod.release_pending_monitor_events
/// [`chain::Filter`]: ../trait.Filter.html
pub fn block_connected(&self, header: &BlockHeader, txdata: &TransactionData, height: u32) {
let mut monitors = self.monitors.lock().unwrap();
for monitor in monitors.values_mut() {
let monitors = self.monitors.read().unwrap();
for monitor in monitors.values() {
let mut txn_outputs = monitor.block_connected(header, txdata, height, &*self.broadcaster, &*self.fee_estimator, &*self.logger);

if let Some(ref chain_source) = self.chain_source {
Expand All@@ -113,8 +113,8 @@ where C::Target: chain::Filter,
///
/// [`ChannelMonitor::block_disconnected`]: ../channelmonitor/struct.ChannelMonitor.html#method.block_disconnected
pub fn block_disconnected(&self, header: &BlockHeader, disconnected_height: u32) {
let mut monitors = self.monitors.lock().unwrap();
for monitor in monitors.values_mut() {
let monitors = self.monitors.read().unwrap();
for monitor in monitors.values() {
monitor.block_disconnected(header, disconnected_height, &*self.broadcaster, &*self.fee_estimator, &*self.logger);
}
}
Expand All@@ -130,7 +130,7 @@ where C::Target: chain::Filter,
/// [`chain::Filter`]: ../trait.Filter.html
pub fn new(chain_source: Option<C>, broadcaster: T, logger: L, feeest: F, persister: P) -> Self {
Self {
monitors: Mutex::new(HashMap::new()),
monitors: RwLock::new(HashMap::new()),
chain_source,
broadcaster,
logger,
Expand DownExpand Up@@ -177,7 +177,7 @@ where C::Target: chain::Filter,
///
/// [`chain::Filter`]: ../trait.Filter.html
fn watch_channel(&self, funding_outpoint: OutPoint, monitor: ChannelMonitor<ChannelSigner>) -> Result<(), ChannelMonitorUpdateErr> {
let mut monitors = self.monitors.lock().unwrap();
let mut monitors = self.monitors.write().unwrap();
let entry = match monitors.entry(funding_outpoint) {
hash_map::Entry::Occupied(_) => {
log_error!(self.logger, "Failed to add new channel data: channel monitor for given outpoint is already present");
Expand DownExpand Up@@ -209,8 +209,8 @@ where C::Target: chain::Filter,
/// `ChainMonitor` monitors lock.
fn update_channel(&self, funding_txo: OutPoint, update: ChannelMonitorUpdate) -> Result<(), ChannelMonitorUpdateErr> {
// Update the monitor that watches the channel referred to by the given outpoint.
let mut monitors = self.monitors.lock().unwrap();
match monitors.get_mut(&funding_txo) {
let monitors = self.monitors.read().unwrap();
match monitors.get(&funding_txo) {
None => {
log_error!(self.logger, "Failed to update channel monitor: no such monitor registered");

Expand All@@ -222,15 +222,15 @@ where C::Target: chain::Filter,
#[cfg(not(any(test, feature = "fuzztarget")))]
Err(ChannelMonitorUpdateErr::PermanentFailure)
},
Some(orig_monitor) => {
log_trace!(self.logger, "Updating Channel Monitor for channel {}", log_funding_info!(orig_monitor));
let update_res = orig_monitor.update_monitor(&update, &self.broadcaster, &self.fee_estimator, &self.logger);
Some(monitor) => {
log_trace!(self.logger, "Updating Channel Monitor for channel {}", log_funding_info!(monitor));
let update_res = monitor.update_monitor(&update, &self.broadcaster, &self.fee_estimator, &self.logger);
if let Err(e) = &update_res {
log_error!(self.logger, "Failed to update channel monitor: {:?}", e);
}
// Even if updating the monitor returns an error, the monitor's state will
// still be changed. So, persist the updated monitor despite the error.
let persist_res = self.persister.update_persisted_channel(funding_txo, &update, orig_monitor);
let persist_res = self.persister.update_persisted_channel(funding_txo, &update, monitor);
if let Err(ref e) = persist_res {
log_error!(self.logger, "Failed to persist channel monitor update: {:?}", e);
}
Expand All@@ -245,8 +245,8 @@ where C::Target: chain::Filter,

fn release_pending_monitor_events(&self) -> Vec<MonitorEvent> {
let mut pending_monitor_events = Vec::new();
for chan in self.monitors.lock().unwrap().values_mut() {
pending_monitor_events.append(&mut chan.get_and_clear_pending_monitor_events());
for monitor in self.monitors.read().unwrap().values() {
pending_monitor_events.append(&mut monitor.get_and_clear_pending_monitor_events());
}
pending_monitor_events
}
Expand All@@ -261,8 +261,8 @@ impl<ChannelSigner: Sign, C: Deref, T: Deref, F: Deref, L: Deref, P: Deref> even
{
fn get_and_clear_pending_events(&self) -> Vec<Event> {
let mut pending_events = Vec::new();
for chan in self.monitors.lock().unwrap().values_mut() {
pending_events.append(&mut chan.get_and_clear_pending_events());
for monitor in self.monitors.read().unwrap().values() {
pending_events.append(&mut monitor.get_and_clear_pending_events());
}
pending_events
}
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
Use interior mutability in ChannelMonitor#813

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

TheBlueMatt
merged 4 commits into

from

Mar 2, 2021
 Merged


Use interior mutability in ChannelMonitor
#813
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
b0978a8

Move ChannelMonitor state behind a Mutex


jkczyz Mar 1, 2021
8e558fe

Use consistent variable naming in ChainMonitor


jkczyz Mar 1, 2021
389c4ad

Change Mutex to RwLock in ChainMonitor


jkczyz Mar 1, 2021
e8ea0d9

Implement chain::Listen without using RefCell


jkczyz Mar 1, 2021

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


2 changes: 1 addition & 1 deletion
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,7 +126,7 @@ impl chain::Watch<EnforcingSigner> for TestChainMonitor {
 hash_map::Entry::Occupied(entry) => entry,
 hash_map::Entry::Vacant(_) => panic!("Didn't have monitor on update call"),
 };
 let mut deserialized_monitor = <(BlockHash, channelmonitor::ChannelMonitor<EnforcingSigner>)>::
 let deserialized_monitor = <(BlockHash, channelmonitor::ChannelMonitor<EnforcingSigner>)>::
 read(&mut Cursor::new(&map_entry.get().1), &OnlyReadsKeysInterface {}).unwrap().1;
 deserialized_monitor.update_monitor(&update, &&TestBroadcaster{}, &&FuzzEstimator{}, &self.logger).unwrap();
 let mut ser = VecWriter(Vec::new());
Expand Down

5 changes: 2 additions & 3 deletions
lightning-block-sync/src/init.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,6 @@ use lightning::chain;
///
/// use lightning_block_sync::*;
///
/// use std::cell::RefCell;
/// use std::io::Cursor;
///
/// async fn init_sync<
Expand DownExpand Up@@ -83,7 +82,7 @@ use lightning::chain;
///
/// // Synchronize any channel monitors and the channel manager to be on the best block.
/// let mut cache = UnboundedCache::new();
/// let mut monitor_listener = (RefCell::new(monitor), &*tx_broadcaster, &*fee_estimator, &*logger);
/// let mut monitor_listener = (monitor, &*tx_broadcaster, &*fee_estimator, &*logger);
/// let listeners = vec![
/// (monitor_block_hash, &mut monitor_listener as &mut dyn chain::Listen),
/// (manager_block_hash, &mut manager as &mut dyn chain::Listen),
Expand All@@ -92,7 +91,7 @@ use lightning::chain;
/// block_source, Network::Bitcoin, &mut cache, listeners).await.unwrap();
///
/// // Allow the chain monitor to watch any channels.
/// let monitor = monitor_listener.0.into_inner();
/// let monitor = monitor_listener.0;
/// chain_monitor.watch_channel(monitor.get_funding_txo().0, monitor);
///
/// // Create an SPV client to notify the chain monitor and channel manager of block events.
Expand Down

36 changes: 18 additions & 18 deletions
lightning/src/chain/chainmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ use util::events;
use util::events::Event;

use std::collections::{HashMap, hash_map};
use std::sync::Mutex;
use std::sync::RwLock;
use std::ops::Deref;

/// An implementation of [`chain::Watch`] for monitoring channels.
Expand All@@ -64,7 +64,7 @@ pub struct ChainMonitor<ChannelSigner: Sign, C: Deref, T: Deref, F: Deref, L: De
 P::Target: channelmonitor::Persist<ChannelSigner>,
{
	/// The monitors
	pub monitors: Mutex<HashMap<OutPoint, ChannelMonitor<ChannelSigner>>>,
	pub monitors: RwLock<HashMap<OutPoint, ChannelMonitor<ChannelSigner>>>,
	chain_source: Option<C>,
	broadcaster: T,
	logger: L,
Expand DownExpand Up@@ -93,8 +93,8 @@ where C::Target: chain::Filter,
	/// [`chain::Watch::release_pending_monitor_events`]: ../trait.Watch.html#tymethod.release_pending_monitor_events
	/// [`chain::Filter`]: ../trait.Filter.html
	pub fn block_connected(&self, header: &BlockHeader, txdata: &TransactionData, height: u32) {
 let mut monitors = self.monitors.lock().unwrap();
 for monitor in monitors.values_mut() {
 let monitors = self.monitors.read().unwrap();
 for monitor in monitors.values() {
 let mut txn_outputs = monitor.block_connected(header, txdata, height, &*self.broadcaster, &*self.fee_estimator, &*self.logger);

 if let Some(ref chain_source) = self.chain_source {
Expand All@@ -113,8 +113,8 @@ where C::Target: chain::Filter,
	///
	/// [`ChannelMonitor::block_disconnected`]: ../channelmonitor/struct.ChannelMonitor.html#method.block_disconnected
	pub fn block_disconnected(&self, header: &BlockHeader, disconnected_height: u32) {
 let mut monitors = self.monitors.lock().unwrap();
 for monitor in monitors.values_mut() {
 let monitors = self.monitors.read().unwrap();
 for monitor in monitors.values() {
 monitor.block_disconnected(header, disconnected_height, &*self.broadcaster, &*self.fee_estimator, &*self.logger);
 }
	}
Expand All@@ -130,7 +130,7 @@ where C::Target: chain::Filter,
	/// [`chain::Filter`]: ../trait.Filter.html
	pub fn new(chain_source: Option<C>, broadcaster: T, logger: L, feeest: F, persister: P) -> Self {
 Self {
 monitors: Mutex::new(HashMap::new()),
 monitors: RwLock::new(HashMap::new()),
 chain_source,
 broadcaster,
 logger,
Expand DownExpand Up@@ -177,7 +177,7 @@ where C::Target: chain::Filter,
	///
	/// [`chain::Filter`]: ../trait.Filter.html
	fn watch_channel(&self, funding_outpoint: OutPoint, monitor: ChannelMonitor<ChannelSigner>) -> Result<(), ChannelMonitorUpdateErr> {
 let mut monitors = self.monitors.lock().unwrap();
 let mut monitors = self.monitors.write().unwrap();
 let entry = match monitors.entry(funding_outpoint) {
 hash_map::Entry::Occupied(_) => {
 log_error!(self.logger, "Failed to add new channel data: channel monitor for given outpoint is already present");
Expand DownExpand Up@@ -209,8 +209,8 @@ where C::Target: chain::Filter,
	/// `ChainMonitor` monitors lock.
	fn update_channel(&self, funding_txo: OutPoint, update: ChannelMonitorUpdate) -> Result<(), ChannelMonitorUpdateErr> {
 // Update the monitor that watches the channel referred to by the given outpoint.
 let mut monitors = self.monitors.lock().unwrap();
 match monitors.get_mut(&funding_txo) {
 let monitors = self.monitors.read().unwrap();
 match monitors.get(&funding_txo) {
 None => {
 log_error!(self.logger, "Failed to update channel monitor: no such monitor registered");

Expand All@@ -222,15 +222,15 @@ where C::Target: chain::Filter,
 #[cfg(not(any(test, feature = "fuzztarget")))]
 Err(ChannelMonitorUpdateErr::PermanentFailure)
 },
 Some(orig_monitor) => {
 log_trace!(self.logger, "Updating Channel Monitor for channel {}", log_funding_info!(orig_monitor));
 let update_res = orig_monitor.update_monitor(&update, &self.broadcaster, &self.fee_estimator, &self.logger);
 Some(monitor) => {
 log_trace!(self.logger, "Updating Channel Monitor for channel {}", log_funding_info!(monitor));
 let update_res = monitor.update_monitor(&update, &self.broadcaster, &self.fee_estimator, &self.logger);
 if let Err(e) = &update_res {
 log_error!(self.logger, "Failed to update channel monitor: {:?}", e);
 }
 // Even if updating the monitor returns an error, the monitor's state will
 // still be changed. So, persist the updated monitor despite the error.
 let persist_res = self.persister.update_persisted_channel(funding_txo, &update, orig_monitor);
 let persist_res = self.persister.update_persisted_channel(funding_txo, &update, monitor);
 if let Err(ref e) = persist_res {
 log_error!(self.logger, "Failed to persist channel monitor update: {:?}", e);
 }
Expand All@@ -245,8 +245,8 @@ where C::Target: chain::Filter,

	fn release_pending_monitor_events(&self) -> Vec<MonitorEvent> {
 let mut pending_monitor_events = Vec::new();
 for chan in self.monitors.lock().unwrap().values_mut() {
 pending_monitor_events.append(&mut chan.get_and_clear_pending_monitor_events());
 for monitor in self.monitors.read().unwrap().values() {
 pending_monitor_events.append(&mut monitor.get_and_clear_pending_monitor_events());
 }
 pending_monitor_events
	}
Expand All@@ -261,8 +261,8 @@ impl<ChannelSigner: Sign, C: Deref, T: Deref, F: Deref, L: Deref, P: Deref> even
{
	fn get_and_clear_pending_events(&self) -> Vec<Event> {
 let mut pending_events = Vec::new();
 for chan in self.monitors.lock().unwrap().values_mut() {
 pending_events.append(&mut chan.get_and_clear_pending_events());
 for monitor in self.monitors.read().unwrap().values() {
 pending_events.append(&mut monitor.get_and_clear_pending_events());
 }
 pending_events
	}
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
Use interior mutability in ChannelMonitor#813

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

TheBlueMatt
merged 4 commits into

from

Mar 2, 2021
 Merged


Use interior mutability in ChannelMonitor
#813
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
b0978a8

Move ChannelMonitor state behind a Mutex


jkczyz Mar 1, 2021
8e558fe

Use consistent variable naming in ChainMonitor


jkczyz Mar 1, 2021
389c4ad

Change Mutex to RwLock in ChainMonitor


jkczyz Mar 1, 2021
e8ea0d9

Implement chain::Listen without using RefCell


jkczyz Mar 1, 2021

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


2 changes: 1 addition & 1 deletion
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,7 +126,7 @@ impl chain::Watch<EnforcingSigner> for TestChainMonitor {
 hash_map::Entry::Occupied(entry) => entry,
 hash_map::Entry::Vacant(_) => panic!("Didn't have monitor on update call"),
 };
 let mut deserialized_monitor = <(BlockHash, channelmonitor::ChannelMonitor<EnforcingSigner>)>::
 let deserialized_monitor = <(BlockHash, channelmonitor::ChannelMonitor<EnforcingSigner>)>::
 read(&mut Cursor::new(&map_entry.get().1), &OnlyReadsKeysInterface {}).unwrap().1;
 deserialized_monitor.update_monitor(&update, &&TestBroadcaster{}, &&FuzzEstimator{}, &self.logger).unwrap();
 let mut ser = VecWriter(Vec::new());
Expand Down

5 changes: 2 additions & 3 deletions
lightning-block-sync/src/init.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,6 @@ use lightning::chain;
///
/// use lightning_block_sync::*;
///
/// use std::cell::RefCell;
/// use std::io::Cursor;
///
/// async fn init_sync<
Expand DownExpand Up@@ -83,7 +82,7 @@ use lightning::chain;
///
/// // Synchronize any channel monitors and the channel manager to be on the best block.
/// let mut cache = UnboundedCache::new();
/// let mut monitor_listener = (RefCell::new(monitor), &*tx_broadcaster, &*fee_estimator, &*logger);
/// let mut monitor_listener = (monitor, &*tx_broadcaster, &*fee_estimator, &*logger);
/// let listeners = vec![
/// (monitor_block_hash, &mut monitor_listener as &mut dyn chain::Listen),
/// (manager_block_hash, &mut manager as &mut dyn chain::Listen),
Expand All@@ -92,7 +91,7 @@ use lightning::chain;
/// block_source, Network::Bitcoin, &mut cache, listeners).await.unwrap();
///
/// // Allow the chain monitor to watch any channels.
/// let monitor = monitor_listener.0.into_inner();
/// let monitor = monitor_listener.0;
/// chain_monitor.watch_channel(monitor.get_funding_txo().0, monitor);
///
/// // Create an SPV client to notify the chain monitor and channel manager of block events.
Expand Down

36 changes: 18 additions & 18 deletions
lightning/src/chain/chainmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ use util::events;
use util::events::Event;

use std::collections::{HashMap, hash_map};
use std::sync::Mutex;
use std::sync::RwLock;
use std::ops::Deref;

/// An implementation of [`chain::Watch`] for monitoring channels.
Expand All@@ -64,7 +64,7 @@ pub struct ChainMonitor<ChannelSigner: Sign, C: Deref, T: Deref, F: Deref, L: De
 P::Target: channelmonitor::Persist<ChannelSigner>,
{
	/// The monitors
	pub monitors: Mutex<HashMap<OutPoint, ChannelMonitor<ChannelSigner>>>,
	pub monitors: RwLock<HashMap<OutPoint, ChannelMonitor<ChannelSigner>>>,
	chain_source: Option<C>,
	broadcaster: T,
	logger: L,
Expand DownExpand Up@@ -93,8 +93,8 @@ where C::Target: chain::Filter,
	/// [`chain::Watch::release_pending_monitor_events`]: ../trait.Watch.html#tymethod.release_pending_monitor_events
	/// [`chain::Filter`]: ../trait.Filter.html
	pub fn block_connected(&self, header: &BlockHeader, txdata: &TransactionData, height: u32) {
 let mut monitors = self.monitors.lock().unwrap();
 for monitor in monitors.values_mut() {
 let monitors = self.monitors.read().unwrap();
 for monitor in monitors.values() {
 let mut txn_outputs = monitor.block_connected(header, txdata, height, &*self.broadcaster, &*self.fee_estimator, &*self.logger);

 if let Some(ref chain_source) = self.chain_source {
Expand All@@ -113,8 +113,8 @@ where C::Target: chain::Filter,
	///
	/// [`ChannelMonitor::block_disconnected`]: ../channelmonitor/struct.ChannelMonitor.html#method.block_disconnected
	pub fn block_disconnected(&self, header: &BlockHeader, disconnected_height: u32) {
 let mut monitors = self.monitors.lock().unwrap();
 for monitor in monitors.values_mut() {
 let monitors = self.monitors.read().unwrap();
 for monitor in monitors.values() {
 monitor.block_disconnected(header, disconnected_height, &*self.broadcaster, &*self.fee_estimator, &*self.logger);
 }
	}
Expand All@@ -130,7 +130,7 @@ where C::Target: chain::Filter,
	/// [`chain::Filter`]: ../trait.Filter.html
	pub fn new(chain_source: Option<C>, broadcaster: T, logger: L, feeest: F, persister: P) -> Self {
 Self {
 monitors: Mutex::new(HashMap::new()),
 monitors: RwLock::new(HashMap::new()),
 chain_source,
 broadcaster,
 logger,
Expand DownExpand Up@@ -177,7 +177,7 @@ where C::Target: chain::Filter,
	///
	/// [`chain::Filter`]: ../trait.Filter.html
	fn watch_channel(&self, funding_outpoint: OutPoint, monitor: ChannelMonitor<ChannelSigner>) -> Result<(), ChannelMonitorUpdateErr> {
 let mut monitors = self.monitors.lock().unwrap();
 let mut monitors = self.monitors.write().unwrap();
 let entry = match monitors.entry(funding_outpoint) {
 hash_map::Entry::Occupied(_) => {
 log_error!(self.logger, "Failed to add new channel data: channel monitor for given outpoint is already present");
Expand DownExpand Up@@ -209,8 +209,8 @@ where C::Target: chain::Filter,
	/// `ChainMonitor` monitors lock.
	fn update_channel(&self, funding_txo: OutPoint, update: ChannelMonitorUpdate) -> Result<(), ChannelMonitorUpdateErr> {
 // Update the monitor that watches the channel referred to by the given outpoint.
 let mut monitors = self.monitors.lock().unwrap();
 match monitors.get_mut(&funding_txo) {
 let monitors = self.monitors.read().unwrap();
 match monitors.get(&funding_txo) {
 None => {
 log_error!(self.logger, "Failed to update channel monitor: no such monitor registered");

Expand All@@ -222,15 +222,15 @@ where C::Target: chain::Filter,
 #[cfg(not(any(test, feature = "fuzztarget")))]
 Err(ChannelMonitorUpdateErr::PermanentFailure)
 },
 Some(orig_monitor) => {
 log_trace!(self.logger, "Updating Channel Monitor for channel {}", log_funding_info!(orig_monitor));
 let update_res = orig_monitor.update_monitor(&update, &self.broadcaster, &self.fee_estimator, &self.logger);
 Some(monitor) => {
 log_trace!(self.logger, "Updating Channel Monitor for channel {}", log_funding_info!(monitor));
 let update_res = monitor.update_monitor(&update, &self.broadcaster, &self.fee_estimator, &self.logger);
 if let Err(e) = &update_res {
 log_error!(self.logger, "Failed to update channel monitor: {:?}", e);
 }
 // Even if updating the monitor returns an error, the monitor's state will
 // still be changed. So, persist the updated monitor despite the error.
 let persist_res = self.persister.update_persisted_channel(funding_txo, &update, orig_monitor);
 let persist_res = self.persister.update_persisted_channel(funding_txo, &update, monitor);
 if let Err(ref e) = persist_res {
 log_error!(self.logger, "Failed to persist channel monitor update: {:?}", e);
 }
Expand All@@ -245,8 +245,8 @@ where C::Target: chain::Filter,

	fn release_pending_monitor_events(&self) -> Vec<MonitorEvent> {
 let mut pending_monitor_events = Vec::new();
 for chan in self.monitors.lock().unwrap().values_mut() {
 pending_monitor_events.append(&mut chan.get_and_clear_pending_monitor_events());
 for monitor in self.monitors.read().unwrap().values() {
 pending_monitor_events.append(&mut monitor.get_and_clear_pending_monitor_events());
 }
 pending_monitor_events
	}
Expand All@@ -261,8 +261,8 @@ impl<ChannelSigner: Sign, C: Deref, T: Deref, F: Deref, L: Deref, P: Deref> even
{
	fn get_and_clear_pending_events(&self) -> Vec<Event> {
 let mut pending_events = Vec::new();
 for chan in self.monitors.lock().unwrap().values_mut() {
 pending_events.append(&mut chan.get_and_clear_pending_events());
 for monitor in self.monitors.read().unwrap().values() {
 pending_events.append(&mut monitor.get_and_clear_pending_events());
 }
 pending_events
	}
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
Use interior mutability in ChannelMonitor#813

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

TheBlueMatt
merged 4 commits into

from

Mar 2, 2021
 Merged


Use interior mutability in ChannelMonitor
#813
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
b0978a8

Move ChannelMonitor state behind a Mutex


jkczyz Mar 1, 2021
8e558fe

Use consistent variable naming in ChainMonitor


jkczyz Mar 1, 2021
389c4ad

Change Mutex to RwLock in ChainMonitor


jkczyz Mar 1, 2021
e8ea0d9

Implement chain::Listen without using RefCell


jkczyz Mar 1, 2021

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


2 changes: 1 addition & 1 deletion
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,7 +126,7 @@ impl chain::Watch<EnforcingSigner> for TestChainMonitor {
 hash_map::Entry::Occupied(entry) => entry,
 hash_map::Entry::Vacant(_) => panic!("Didn't have monitor on update call"),
 };
 let mut deserialized_monitor = <(BlockHash, channelmonitor::ChannelMonitor<EnforcingSigner>)>::
 let deserialized_monitor = <(BlockHash, channelmonitor::ChannelMonitor<EnforcingSigner>)>::
 read(&mut Cursor::new(&map_entry.get().1), &OnlyReadsKeysInterface {}).unwrap().1;
 deserialized_monitor.update_monitor(&update, &&TestBroadcaster{}, &&FuzzEstimator{}, &self.logger).unwrap();
 let mut ser = VecWriter(Vec::new());
Expand Down

5 changes: 2 additions & 3 deletions
lightning-block-sync/src/init.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,6 @@ use lightning::chain;
///
/// use lightning_block_sync::*;
///
/// use std::cell::RefCell;
/// use std::io::Cursor;
///
/// async fn init_sync<
Expand DownExpand Up@@ -83,7 +82,7 @@ use lightning::chain;
///
/// // Synchronize any channel monitors and the channel manager to be on the best block.
/// let mut cache = UnboundedCache::new();
/// let mut monitor_listener = (RefCell::new(monitor), &*tx_broadcaster, &*fee_estimator, &*logger);
/// let mut monitor_listener = (monitor, &*tx_broadcaster, &*fee_estimator, &*logger);
/// let listeners = vec![
/// (monitor_block_hash, &mut monitor_listener as &mut dyn chain::Listen),
/// (manager_block_hash, &mut manager as &mut dyn chain::Listen),
Expand All@@ -92,7 +91,7 @@ use lightning::chain;
/// block_source, Network::Bitcoin, &mut cache, listeners).await.unwrap();
///
/// // Allow the chain monitor to watch any channels.
/// let monitor = monitor_listener.0.into_inner();
/// let monitor = monitor_listener.0;
/// chain_monitor.watch_channel(monitor.get_funding_txo().0, monitor);
///
/// // Create an SPV client to notify the chain monitor and channel manager of block events.
Expand Down

36 changes: 18 additions & 18 deletions
lightning/src/chain/chainmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ use util::events;
use util::events::Event;

use std::collections::{HashMap, hash_map};
use std::sync::Mutex;
use std::sync::RwLock;
use std::ops::Deref;

/// An implementation of [`chain::Watch`] for monitoring channels.
Expand All@@ -64,7 +64,7 @@ pub struct ChainMonitor<ChannelSigner: Sign, C: Deref, T: Deref, F: Deref, L: De
 P::Target: channelmonitor::Persist<ChannelSigner>,
{
	/// The monitors
	pub monitors: Mutex<HashMap<OutPoint, ChannelMonitor<ChannelSigner>>>,
	pub monitors: RwLock<HashMap<OutPoint, ChannelMonitor<ChannelSigner>>>,
	chain_source: Option<C>,
	broadcaster: T,
	logger: L,
Expand DownExpand Up@@ -93,8 +93,8 @@ where C::Target: chain::Filter,
	/// [`chain::Watch::release_pending_monitor_events`]: ../trait.Watch.html#tymethod.release_pending_monitor_events
	/// [`chain::Filter`]: ../trait.Filter.html
	pub fn block_connected(&self, header: &BlockHeader, txdata: &TransactionData, height: u32) {
 let mut monitors = self.monitors.lock().unwrap();
 for monitor in monitors.values_mut() {
 let monitors = self.monitors.read().unwrap();
 for monitor in monitors.values() {
 let mut txn_outputs = monitor.block_connected(header, txdata, height, &*self.broadcaster, &*self.fee_estimator, &*self.logger);

 if let Some(ref chain_source) = self.chain_source {
Expand All@@ -113,8 +113,8 @@ where C::Target: chain::Filter,
	///
	/// [`ChannelMonitor::block_disconnected`]: ../channelmonitor/struct.ChannelMonitor.html#method.block_disconnected
	pub fn block_disconnected(&self, header: &BlockHeader, disconnected_height: u32) {
 let mut monitors = self.monitors.lock().unwrap();
 for monitor in monitors.values_mut() {
 let monitors = self.monitors.read().unwrap();
 for monitor in monitors.values() {
 monitor.block_disconnected(header, disconnected_height, &*self.broadcaster, &*self.fee_estimator, &*self.logger);
 }
	}
Expand All@@ -130,7 +130,7 @@ where C::Target: chain::Filter,
	/// [`chain::Filter`]: ../trait.Filter.html
	pub fn new(chain_source: Option<C>, broadcaster: T, logger: L, feeest: F, persister: P) -> Self {
 Self {
 monitors: Mutex::new(HashMap::new()),
 monitors: RwLock::new(HashMap::new()),
 chain_source,
 broadcaster,
 logger,
Expand DownExpand Up@@ -177,7 +177,7 @@ where C::Target: chain::Filter,
	///
	/// [`chain::Filter`]: ../trait.Filter.html
	fn watch_channel(&self, funding_outpoint: OutPoint, monitor: ChannelMonitor<ChannelSigner>) -> Result<(), ChannelMonitorUpdateErr> {
 let mut monitors = self.monitors.lock().unwrap();
 let mut monitors = self.monitors.write().unwrap();
 let entry = match monitors.entry(funding_outpoint) {
 hash_map::Entry::Occupied(_) => {
 log_error!(self.logger, "Failed to add new channel data: channel monitor for given outpoint is already present");
Expand DownExpand Up@@ -209,8 +209,8 @@ where C::Target: chain::Filter,
	/// `ChainMonitor` monitors lock.
	fn update_channel(&self, funding_txo: OutPoint, update: ChannelMonitorUpdate) -> Result<(), ChannelMonitorUpdateErr> {
 // Update the monitor that watches the channel referred to by the given outpoint.
 let mut monitors = self.monitors.lock().unwrap();
 match monitors.get_mut(&funding_txo) {
 let monitors = self.monitors.read().unwrap();
 match monitors.get(&funding_txo) {
 None => {
 log_error!(self.logger, "Failed to update channel monitor: no such monitor registered");

Expand All@@ -222,15 +222,15 @@ where C::Target: chain::Filter,
 #[cfg(not(any(test, feature = "fuzztarget")))]
 Err(ChannelMonitorUpdateErr::PermanentFailure)
 },
 Some(orig_monitor) => {
 log_trace!(self.logger, "Updating Channel Monitor for channel {}", log_funding_info!(orig_monitor));
 let update_res = orig_monitor.update_monitor(&update, &self.broadcaster, &self.fee_estimator, &self.logger);
 Some(monitor) => {
 log_trace!(self.logger, "Updating Channel Monitor for channel {}", log_funding_info!(monitor));
 let update_res = monitor.update_monitor(&update, &self.broadcaster, &self.fee_estimator, &self.logger);
 if let Err(e) = &update_res {
 log_error!(self.logger, "Failed to update channel monitor: {:?}", e);
 }
 // Even if updating the monitor returns an error, the monitor's state will
 // still be changed. So, persist the updated monitor despite the error.
 let persist_res = self.persister.update_persisted_channel(funding_txo, &update, orig_monitor);
 let persist_res = self.persister.update_persisted_channel(funding_txo, &update, monitor);
 if let Err(ref e) = persist_res {
 log_error!(self.logger, "Failed to persist channel monitor update: {:?}", e);
 }
Expand All@@ -245,8 +245,8 @@ where C::Target: chain::Filter,

	fn release_pending_monitor_events(&self) -> Vec<MonitorEvent> {
 let mut pending_monitor_events = Vec::new();
 for chan in self.monitors.lock().unwrap().values_mut() {
 pending_monitor_events.append(&mut chan.get_and_clear_pending_monitor_events());
 for monitor in self.monitors.read().unwrap().values() {
 pending_monitor_events.append(&mut monitor.get_and_clear_pending_monitor_events());
 }
 pending_monitor_events
	}
Expand All@@ -261,8 +261,8 @@ impl<ChannelSigner: Sign, C: Deref, T: Deref, F: Deref, L: Deref, P: Deref> even
{
	fn get_and_clear_pending_events(&self) -> Vec<Event> {
 let mut pending_events = Vec::new();
 for chan in self.monitors.lock().unwrap().values_mut() {
 pending_events.append(&mut chan.get_and_clear_pending_events());
 for monitor in self.monitors.read().unwrap().values() {
 pending_events.append(&mut monitor.get_and_clear_pending_events());
 }
 pending_events
	}
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
Use interior mutability in ChannelMonitor#813

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

TheBlueMatt
merged 4 commits into

from

Mar 2, 2021
 Merged


Use interior mutability in ChannelMonitor
#813
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
b0978a8

Move ChannelMonitor state behind a Mutex


jkczyz Mar 1, 2021
8e558fe

Use consistent variable naming in ChainMonitor


jkczyz Mar 1, 2021
389c4ad

Change Mutex to RwLock in ChainMonitor


jkczyz Mar 1, 2021
e8ea0d9

Implement chain::Listen without using RefCell


jkczyz Mar 1, 2021

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


2 changes: 1 addition & 1 deletion
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,7 +126,7 @@ impl chain::Watch<EnforcingSigner> for TestChainMonitor {
 hash_map::Entry::Occupied(entry) => entry,
 hash_map::Entry::Vacant(_) => panic!("Didn't have monitor on update call"),
 };
 let mut deserialized_monitor = <(BlockHash, channelmonitor::ChannelMonitor<EnforcingSigner>)>::
 let deserialized_monitor = <(BlockHash, channelmonitor::ChannelMonitor<EnforcingSigner>)>::
 read(&mut Cursor::new(&map_entry.get().1), &OnlyReadsKeysInterface {}).unwrap().1;
 deserialized_monitor.update_monitor(&update, &&TestBroadcaster{}, &&FuzzEstimator{}, &self.logger).unwrap();
 let mut ser = VecWriter(Vec::new());
Expand Down

5 changes: 2 additions & 3 deletions
lightning-block-sync/src/init.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,6 @@ use lightning::chain;
///
/// use lightning_block_sync::*;
///
/// use std::cell::RefCell;
/// use std::io::Cursor;
///
/// async fn init_sync<
Expand DownExpand Up@@ -83,7 +82,7 @@ use lightning::chain;
///
/// // Synchronize any channel monitors and the channel manager to be on the best block.
/// let mut cache = UnboundedCache::new();
/// let mut monitor_listener = (RefCell::new(monitor), &*tx_broadcaster, &*fee_estimator, &*logger);
/// let mut monitor_listener = (monitor, &*tx_broadcaster, &*fee_estimator, &*logger);
/// let listeners = vec![
/// (monitor_block_hash, &mut monitor_listener as &mut dyn chain::Listen),
/// (manager_block_hash, &mut manager as &mut dyn chain::Listen),
Expand All@@ -92,7 +91,7 @@ use lightning::chain;
/// block_source, Network::Bitcoin, &mut cache, listeners).await.unwrap();
///
/// // Allow the chain monitor to watch any channels.
/// let monitor = monitor_listener.0.into_inner();
/// let monitor = monitor_listener.0;
/// chain_monitor.watch_channel(monitor.get_funding_txo().0, monitor);
///
/// // Create an SPV client to notify the chain monitor and channel manager of block events.
Expand Down

36 changes: 18 additions & 18 deletions
lightning/src/chain/chainmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ use util::events;
use util::events::Event;

use std::collections::{HashMap, hash_map};
use std::sync::Mutex;
use std::sync::RwLock;
use std::ops::Deref;

/// An implementation of [`chain::Watch`] for monitoring channels.
Expand All@@ -64,7 +64,7 @@ pub struct ChainMonitor<ChannelSigner: Sign, C: Deref, T: Deref, F: Deref, L: De
 P::Target: channelmonitor::Persist<ChannelSigner>,
{
	/// The monitors
	pub monitors: Mutex<HashMap<OutPoint, ChannelMonitor<ChannelSigner>>>,
	pub monitors: RwLock<HashMap<OutPoint, ChannelMonitor<ChannelSigner>>>,
	chain_source: Option<C>,
	broadcaster: T,
	logger: L,
Expand DownExpand Up@@ -93,8 +93,8 @@ where C::Target: chain::Filter,
	/// [`chain::Watch::release_pending_monitor_events`]: ../trait.Watch.html#tymethod.release_pending_monitor_events
	/// [`chain::Filter`]: ../trait.Filter.html
	pub fn block_connected(&self, header: &BlockHeader, txdata: &TransactionData, height: u32) {
 let mut monitors = self.monitors.lock().unwrap();
 for monitor in monitors.values_mut() {
 let monitors = self.monitors.read().unwrap();
 for monitor in monitors.values() {
 let mut txn_outputs = monitor.block_connected(header, txdata, height, &*self.broadcaster, &*self.fee_estimator, &*self.logger);

 if let Some(ref chain_source) = self.chain_source {
Expand All@@ -113,8 +113,8 @@ where C::Target: chain::Filter,
	///
	/// [`ChannelMonitor::block_disconnected`]: ../channelmonitor/struct.ChannelMonitor.html#method.block_disconnected
	pub fn block_disconnected(&self, header: &BlockHeader, disconnected_height: u32) {
 let mut monitors = self.monitors.lock().unwrap();
 for monitor in monitors.values_mut() {
 let monitors = self.monitors.read().unwrap();
 for monitor in monitors.values() {
 monitor.block_disconnected(header, disconnected_height, &*self.broadcaster, &*self.fee_estimator, &*self.logger);
 }
	}
Expand All@@ -130,7 +130,7 @@ where C::Target: chain::Filter,
	/// [`chain::Filter`]: ../trait.Filter.html
	pub fn new(chain_source: Option<C>, broadcaster: T, logger: L, feeest: F, persister: P) -> Self {
 Self {
 monitors: Mutex::new(HashMap::new()),
 monitors: RwLock::new(HashMap::new()),
 chain_source,
 broadcaster,
 logger,
Expand DownExpand Up@@ -177,7 +177,7 @@ where C::Target: chain::Filter,
	///
	/// [`chain::Filter`]: ../trait.Filter.html
	fn watch_channel(&self, funding_outpoint: OutPoint, monitor: ChannelMonitor<ChannelSigner>) -> Result<(), ChannelMonitorUpdateErr> {
 let mut monitors = self.monitors.lock().unwrap();
 let mut monitors = self.monitors.write().unwrap();
 let entry = match monitors.entry(funding_outpoint) {
 hash_map::Entry::Occupied(_) => {
 log_error!(self.logger, "Failed to add new channel data: channel monitor for given outpoint is already present");
Expand DownExpand Up@@ -209,8 +209,8 @@ where C::Target: chain::Filter,
	/// `ChainMonitor` monitors lock.
	fn update_channel(&self, funding_txo: OutPoint, update: ChannelMonitorUpdate) -> Result<(), ChannelMonitorUpdateErr> {
 // Update the monitor that watches the channel referred to by the given outpoint.
 let mut monitors = self.monitors.lock().unwrap();
 match monitors.get_mut(&funding_txo) {
 let monitors = self.monitors.read().unwrap();
 match monitors.get(&funding_txo) {
 None => {
 log_error!(self.logger, "Failed to update channel monitor: no such monitor registered");

Expand All@@ -222,15 +222,15 @@ where C::Target: chain::Filter,
 #[cfg(not(any(test, feature = "fuzztarget")))]
 Err(ChannelMonitorUpdateErr::PermanentFailure)
 },
 Some(orig_monitor) => {
 log_trace!(self.logger, "Updating Channel Monitor for channel {}", log_funding_info!(orig_monitor));
 let update_res = orig_monitor.update_monitor(&update, &self.broadcaster, &self.fee_estimator, &self.logger);
 Some(monitor) => {
 log_trace!(self.logger, "Updating Channel Monitor for channel {}", log_funding_info!(monitor));
 let update_res = monitor.update_monitor(&update, &self.broadcaster, &self.fee_estimator, &self.logger);
 if let Err(e) = &update_res {
 log_error!(self.logger, "Failed to update channel monitor: {:?}", e);
 }
 // Even if updating the monitor returns an error, the monitor's state will
 // still be changed. So, persist the updated monitor despite the error.
 let persist_res = self.persister.update_persisted_channel(funding_txo, &update, orig_monitor);
 let persist_res = self.persister.update_persisted_channel(funding_txo, &update, monitor);
 if let Err(ref e) = persist_res {
 log_error!(self.logger, "Failed to persist channel monitor update: {:?}", e);
 }
Expand All@@ -245,8 +245,8 @@ where C::Target: chain::Filter,

	fn release_pending_monitor_events(&self) -> Vec<MonitorEvent> {
 let mut pending_monitor_events = Vec::new();
 for chan in self.monitors.lock().unwrap().values_mut() {
 pending_monitor_events.append(&mut chan.get_and_clear_pending_monitor_events());
 for monitor in self.monitors.read().unwrap().values() {
 pending_monitor_events.append(&mut monitor.get_and_clear_pending_monitor_events());
 }
 pending_monitor_events
	}
Expand All@@ -261,8 +261,8 @@ impl<ChannelSigner: Sign, C: Deref, T: Deref, F: Deref, L: Deref, P: Deref> even
{
	fn get_and_clear_pending_events(&self) -> Vec<Event> {
 let mut pending_events = Vec::new();
 for chan in self.monitors.lock().unwrap().values_mut() {
 pending_events.append(&mut chan.get_and_clear_pending_events());
 for monitor in self.monitors.read().unwrap().values() {
 pending_events.append(&mut monitor.get_and_clear_pending_events());
 }
 pending_events
	}
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
Use interior mutability in ChannelMonitor#813

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

TheBlueMatt
merged 4 commits into

from

Mar 2, 2021
 Merged


Use interior mutability in ChannelMonitor
#813
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
b0978a8

Move ChannelMonitor state behind a Mutex


jkczyz Mar 1, 2021
8e558fe

Use consistent variable naming in ChainMonitor


jkczyz Mar 1, 2021
389c4ad

Change Mutex to RwLock in ChainMonitor


jkczyz Mar 1, 2021
e8ea0d9

Implement chain::Listen without using RefCell


jkczyz Mar 1, 2021

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


2 changes: 1 addition & 1 deletion
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,7 +126,7 @@ impl chain::Watch<EnforcingSigner> for TestChainMonitor {
 hash_map::Entry::Occupied(entry) => entry,
 hash_map::Entry::Vacant(_) => panic!("Didn't have monitor on update call"),
 };
 let mut deserialized_monitor = <(BlockHash, channelmonitor::ChannelMonitor<EnforcingSigner>)>::
 let deserialized_monitor = <(BlockHash, channelmonitor::ChannelMonitor<EnforcingSigner>)>::
 read(&mut Cursor::new(&map_entry.get().1), &OnlyReadsKeysInterface {}).unwrap().1;
 deserialized_monitor.update_monitor(&update, &&TestBroadcaster{}, &&FuzzEstimator{}, &self.logger).unwrap();
 let mut ser = VecWriter(Vec::new());
Expand Down

5 changes: 2 additions & 3 deletions
lightning-block-sync/src/init.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,6 @@ use lightning::chain;
///
/// use lightning_block_sync::*;
///
/// use std::cell::RefCell;
/// use std::io::Cursor;
///
/// async fn init_sync<
Expand DownExpand Up@@ -83,7 +82,7 @@ use lightning::chain;
///
/// // Synchronize any channel monitors and the channel manager to be on the best block.
/// let mut cache = UnboundedCache::new();
/// let mut monitor_listener = (RefCell::new(monitor), &*tx_broadcaster, &*fee_estimator, &*logger);
/// let mut monitor_listener = (monitor, &*tx_broadcaster, &*fee_estimator, &*logger);
/// let listeners = vec![
/// (monitor_block_hash, &mut monitor_listener as &mut dyn chain::Listen),
/// (manager_block_hash, &mut manager as &mut dyn chain::Listen),
Expand All@@ -92,7 +91,7 @@ use lightning::chain;
/// block_source, Network::Bitcoin, &mut cache, listeners).await.unwrap();
///
/// // Allow the chain monitor to watch any channels.
/// let monitor = monitor_listener.0.into_inner();
/// let monitor = monitor_listener.0;
/// chain_monitor.watch_channel(monitor.get_funding_txo().0, monitor);
///
/// // Create an SPV client to notify the chain monitor and channel manager of block events.
Expand Down

36 changes: 18 additions & 18 deletions
lightning/src/chain/chainmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ use util::events;
use util::events::Event;

use std::collections::{HashMap, hash_map};
use std::sync::Mutex;
use std::sync::RwLock;
use std::ops::Deref;

/// An implementation of [`chain::Watch`] for monitoring channels.
Expand All@@ -64,7 +64,7 @@ pub struct ChainMonitor<ChannelSigner: Sign, C: Deref, T: Deref, F: Deref, L: De
 P::Target: channelmonitor::Persist<ChannelSigner>,
{
	/// The monitors
	pub monitors: Mutex<HashMap<OutPoint, ChannelMonitor<ChannelSigner>>>,
	pub monitors: RwLock<HashMap<OutPoint, ChannelMonitor<ChannelSigner>>>,
	chain_source: Option<C>,
	broadcaster: T,
	logger: L,
Expand DownExpand Up@@ -93,8 +93,8 @@ where C::Target: chain::Filter,
	/// [`chain::Watch::release_pending_monitor_events`]: ../trait.Watch.html#tymethod.release_pending_monitor_events
	/// [`chain::Filter`]: ../trait.Filter.html
	pub fn block_connected(&self, header: &BlockHeader, txdata: &TransactionData, height: u32) {
 let mut monitors = self.monitors.lock().unwrap();
 for monitor in monitors.values_mut() {
 let monitors = self.monitors.read().unwrap();
 for monitor in monitors.values() {
 let mut txn_outputs = monitor.block_connected(header, txdata, height, &*self.broadcaster, &*self.fee_estimator, &*self.logger);

 if let Some(ref chain_source) = self.chain_source {
Expand All@@ -113,8 +113,8 @@ where C::Target: chain::Filter,
	///
	/// [`ChannelMonitor::block_disconnected`]: ../channelmonitor/struct.ChannelMonitor.html#method.block_disconnected
	pub fn block_disconnected(&self, header: &BlockHeader, disconnected_height: u32) {
 let mut monitors = self.monitors.lock().unwrap();
 for monitor in monitors.values_mut() {
 let monitors = self.monitors.read().unwrap();
 for monitor in monitors.values() {
 monitor.block_disconnected(header, disconnected_height, &*self.broadcaster, &*self.fee_estimator, &*self.logger);
 }
	}
Expand All@@ -130,7 +130,7 @@ where C::Target: chain::Filter,
	/// [`chain::Filter`]: ../trait.Filter.html
	pub fn new(chain_source: Option<C>, broadcaster: T, logger: L, feeest: F, persister: P) -> Self {
 Self {
 monitors: Mutex::new(HashMap::new()),
 monitors: RwLock::new(HashMap::new()),
 chain_source,
 broadcaster,
 logger,
Expand DownExpand Up@@ -177,7 +177,7 @@ where C::Target: chain::Filter,
	///
	/// [`chain::Filter`]: ../trait.Filter.html
	fn watch_channel(&self, funding_outpoint: OutPoint, monitor: ChannelMonitor<ChannelSigner>) -> Result<(), ChannelMonitorUpdateErr> {
 let mut monitors = self.monitors.lock().unwrap();
 let mut monitors = self.monitors.write().unwrap();
 let entry = match monitors.entry(funding_outpoint) {
 hash_map::Entry::Occupied(_) => {
 log_error!(self.logger, "Failed to add new channel data: channel monitor for given outpoint is already present");
Expand DownExpand Up@@ -209,8 +209,8 @@ where C::Target: chain::Filter,
	/// `ChainMonitor` monitors lock.
	fn update_channel(&self, funding_txo: OutPoint, update: ChannelMonitorUpdate) -> Result<(), ChannelMonitorUpdateErr> {
 // Update the monitor that watches the channel referred to by the given outpoint.
 let mut monitors = self.monitors.lock().unwrap();
 match monitors.get_mut(&funding_txo) {
 let monitors = self.monitors.read().unwrap();
 match monitors.get(&funding_txo) {
 None => {
 log_error!(self.logger, "Failed to update channel monitor: no such monitor registered");

Expand All@@ -222,15 +222,15 @@ where C::Target: chain::Filter,
 #[cfg(not(any(test, feature = "fuzztarget")))]
 Err(ChannelMonitorUpdateErr::PermanentFailure)
 },
 Some(orig_monitor) => {
 log_trace!(self.logger, "Updating Channel Monitor for channel {}", log_funding_info!(orig_monitor));
 let update_res = orig_monitor.update_monitor(&update, &self.broadcaster, &self.fee_estimator, &self.logger);
 Some(monitor) => {
 log_trace!(self.logger, "Updating Channel Monitor for channel {}", log_funding_info!(monitor));
 let update_res = monitor.update_monitor(&update, &self.broadcaster, &self.fee_estimator, &self.logger);
 if let Err(e) = &update_res {
 log_error!(self.logger, "Failed to update channel monitor: {:?}", e);
 }
 // Even if updating the monitor returns an error, the monitor's state will
 // still be changed. So, persist the updated monitor despite the error.
 let persist_res = self.persister.update_persisted_channel(funding_txo, &update, orig_monitor);
 let persist_res = self.persister.update_persisted_channel(funding_txo, &update, monitor);
 if let Err(ref e) = persist_res {
 log_error!(self.logger, "Failed to persist channel monitor update: {:?}", e);
 }
Expand All@@ -245,8 +245,8 @@ where C::Target: chain::Filter,

	fn release_pending_monitor_events(&self) -> Vec<MonitorEvent> {
 let mut pending_monitor_events = Vec::new();
 for chan in self.monitors.lock().unwrap().values_mut() {
 pending_monitor_events.append(&mut chan.get_and_clear_pending_monitor_events());
 for monitor in self.monitors.read().unwrap().values() {
 pending_monitor_events.append(&mut monitor.get_and_clear_pending_monitor_events());
 }
 pending_monitor_events
	}
Expand All@@ -261,8 +261,8 @@ impl<ChannelSigner: Sign, C: Deref, T: Deref, F: Deref, L: Deref, P: Deref> even
{
	fn get_and_clear_pending_events(&self) -> Vec<Event> {
 let mut pending_events = Vec::new();
 for chan in self.monitors.lock().unwrap().values_mut() {
 pending_events.append(&mut chan.get_and_clear_pending_events());
 for monitor in self.monitors.read().unwrap().values() {
 pending_events.append(&mut monitor.get_and_clear_pending_events());
 }
 pending_events
	}
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
Use interior mutability in ChannelMonitor#813

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

TheBlueMatt
merged 4 commits into

from

Mar 2, 2021
 Merged


Use interior mutability in ChannelMonitor
#813
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
b0978a8

Move ChannelMonitor state behind a Mutex


jkczyz Mar 1, 2021
8e558fe

Use consistent variable naming in ChainMonitor


jkczyz Mar 1, 2021
389c4ad

Change Mutex to RwLock in ChainMonitor


jkczyz Mar 1, 2021
e8ea0d9

Implement chain::Listen without using RefCell


jkczyz Mar 1, 2021

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


2 changes: 1 addition & 1 deletion
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,7 +126,7 @@ impl chain::Watch<EnforcingSigner> for TestChainMonitor {
 hash_map::Entry::Occupied(entry) => entry,
 hash_map::Entry::Vacant(_) => panic!("Didn't have monitor on update call"),
 };
 let mut deserialized_monitor = <(BlockHash, channelmonitor::ChannelMonitor<EnforcingSigner>)>::
 let deserialized_monitor = <(BlockHash, channelmonitor::ChannelMonitor<EnforcingSigner>)>::
 read(&mut Cursor::new(&map_entry.get().1), &OnlyReadsKeysInterface {}).unwrap().1;
 deserialized_monitor.update_monitor(&update, &&TestBroadcaster{}, &&FuzzEstimator{}, &self.logger).unwrap();
 let mut ser = VecWriter(Vec::new());
Expand Down

5 changes: 2 additions & 3 deletions
lightning-block-sync/src/init.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,6 @@ use lightning::chain;
///
/// use lightning_block_sync::*;
///
/// use std::cell::RefCell;
/// use std::io::Cursor;
///
/// async fn init_sync<
Expand DownExpand Up@@ -83,7 +82,7 @@ use lightning::chain;
///
/// // Synchronize any channel monitors and the channel manager to be on the best block.
/// let mut cache = UnboundedCache::new();
/// let mut monitor_listener = (RefCell::new(monitor), &*tx_broadcaster, &*fee_estimator, &*logger);
/// let mut monitor_listener = (monitor, &*tx_broadcaster, &*fee_estimator, &*logger);
/// let listeners = vec![
/// (monitor_block_hash, &mut monitor_listener as &mut dyn chain::Listen),
/// (manager_block_hash, &mut manager as &mut dyn chain::Listen),
Expand All@@ -92,7 +91,7 @@ use lightning::chain;
/// block_source, Network::Bitcoin, &mut cache, listeners).await.unwrap();
///
/// // Allow the chain monitor to watch any channels.
/// let monitor = monitor_listener.0.into_inner();
/// let monitor = monitor_listener.0;
/// chain_monitor.watch_channel(monitor.get_funding_txo().0, monitor);
///
/// // Create an SPV client to notify the chain monitor and channel manager of block events.
Expand Down

36 changes: 18 additions & 18 deletions
lightning/src/chain/chainmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ use util::events;
use util::events::Event;

use std::collections::{HashMap, hash_map};
use std::sync::Mutex;
use std::sync::RwLock;
use std::ops::Deref;

/// An implementation of [`chain::Watch`] for monitoring channels.
Expand All@@ -64,7 +64,7 @@ pub struct ChainMonitor<ChannelSigner: Sign, C: Deref, T: Deref, F: Deref, L: De
 P::Target: channelmonitor::Persist<ChannelSigner>,
{
	/// The monitors
	pub monitors: Mutex<HashMap<OutPoint, ChannelMonitor<ChannelSigner>>>,
	pub monitors: RwLock<HashMap<OutPoint, ChannelMonitor<ChannelSigner>>>,
	chain_source: Option<C>,
	broadcaster: T,
	logger: L,
Expand DownExpand Up@@ -93,8 +93,8 @@ where C::Target: chain::Filter,
	/// [`chain::Watch::release_pending_monitor_events`]: ../trait.Watch.html#tymethod.release_pending_monitor_events
	/// [`chain::Filter`]: ../trait.Filter.html
	pub fn block_connected(&self, header: &BlockHeader, txdata: &TransactionData, height: u32) {
 let mut monitors = self.monitors.lock().unwrap();
 for monitor in monitors.values_mut() {
 let monitors = self.monitors.read().unwrap();
 for monitor in monitors.values() {
 let mut txn_outputs = monitor.block_connected(header, txdata, height, &*self.broadcaster, &*self.fee_estimator, &*self.logger);

 if let Some(ref chain_source) = self.chain_source {
Expand All@@ -113,8 +113,8 @@ where C::Target: chain::Filter,
	///
	/// [`ChannelMonitor::block_disconnected`]: ../channelmonitor/struct.ChannelMonitor.html#method.block_disconnected
	pub fn block_disconnected(&self, header: &BlockHeader, disconnected_height: u32) {
 let mut monitors = self.monitors.lock().unwrap();
 for monitor in monitors.values_mut() {
 let monitors = self.monitors.read().unwrap();
 for monitor in monitors.values() {
 monitor.block_disconnected(header, disconnected_height, &*self.broadcaster, &*self.fee_estimator, &*self.logger);
 }
	}
Expand All@@ -130,7 +130,7 @@ where C::Target: chain::Filter,
	/// [`chain::Filter`]: ../trait.Filter.html
	pub fn new(chain_source: Option<C>, broadcaster: T, logger: L, feeest: F, persister: P) -> Self {
 Self {
 monitors: Mutex::new(HashMap::new()),
 monitors: RwLock::new(HashMap::new()),
 chain_source,
 broadcaster,
 logger,
Expand DownExpand Up@@ -177,7 +177,7 @@ where C::Target: chain::Filter,
	///
	/// [`chain::Filter`]: ../trait.Filter.html
	fn watch_channel(&self, funding_outpoint: OutPoint, monitor: ChannelMonitor<ChannelSigner>) -> Result<(), ChannelMonitorUpdateErr> {
 let mut monitors = self.monitors.lock().unwrap();
 let mut monitors = self.monitors.write().unwrap();
 let entry = match monitors.entry(funding_outpoint) {
 hash_map::Entry::Occupied(_) => {
 log_error!(self.logger, "Failed to add new channel data: channel monitor for given outpoint is already present");
Expand DownExpand Up@@ -209,8 +209,8 @@ where C::Target: chain::Filter,
	/// `ChainMonitor` monitors lock.
	fn update_channel(&self, funding_txo: OutPoint, update: ChannelMonitorUpdate) -> Result<(), ChannelMonitorUpdateErr> {
 // Update the monitor that watches the channel referred to by the given outpoint.
 let mut monitors = self.monitors.lock().unwrap();
 match monitors.get_mut(&funding_txo) {
 let monitors = self.monitors.read().unwrap();
 match monitors.get(&funding_txo) {
 None => {
 log_error!(self.logger, "Failed to update channel monitor: no such monitor registered");

Expand All@@ -222,15 +222,15 @@ where C::Target: chain::Filter,
 #[cfg(not(any(test, feature = "fuzztarget")))]
 Err(ChannelMonitorUpdateErr::PermanentFailure)
 },
 Some(orig_monitor) => {
 log_trace!(self.logger, "Updating Channel Monitor for channel {}", log_funding_info!(orig_monitor));
 let update_res = orig_monitor.update_monitor(&update, &self.broadcaster, &self.fee_estimator, &self.logger);
 Some(monitor) => {
 log_trace!(self.logger, "Updating Channel Monitor for channel {}", log_funding_info!(monitor));
 let update_res = monitor.update_monitor(&update, &self.broadcaster, &self.fee_estimator, &self.logger);
 if let Err(e) = &update_res {
 log_error!(self.logger, "Failed to update channel monitor: {:?}", e);
 }
 // Even if updating the monitor returns an error, the monitor's state will
 // still be changed. So, persist the updated monitor despite the error.
 let persist_res = self.persister.update_persisted_channel(funding_txo, &update, orig_monitor);
 let persist_res = self.persister.update_persisted_channel(funding_txo, &update, monitor);
 if let Err(ref e) = persist_res {
 log_error!(self.logger, "Failed to persist channel monitor update: {:?}", e);
 }
Expand All@@ -245,8 +245,8 @@ where C::Target: chain::Filter,

	fn release_pending_monitor_events(&self) -> Vec<MonitorEvent> {
 let mut pending_monitor_events = Vec::new();
 for chan in self.monitors.lock().unwrap().values_mut() {
 pending_monitor_events.append(&mut chan.get_and_clear_pending_monitor_events());
 for monitor in self.monitors.read().unwrap().values() {
 pending_monitor_events.append(&mut monitor.get_and_clear_pending_monitor_events());
 }
 pending_monitor_events
	}
Expand All@@ -261,8 +261,8 @@ impl<ChannelSigner: Sign, C: Deref, T: Deref, F: Deref, L: Deref, P: Deref> even
{
	fn get_and_clear_pending_events(&self) -> Vec<Event> {
 let mut pending_events = Vec::new();
 for chan in self.monitors.lock().unwrap().values_mut() {
 pending_events.append(&mut chan.get_and_clear_pending_events());
 for monitor in self.monitors.read().unwrap().values() {
 pending_events.append(&mut monitor.get_and_clear_pending_events());
 }
 pending_events
	}
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
Use interior mutability in ChannelMonitor#813

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

TheBlueMatt
merged 4 commits into

from

Mar 2, 2021
 Merged


Use interior mutability in ChannelMonitor
#813
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
b0978a8

Move ChannelMonitor state behind a Mutex


jkczyz Mar 1, 2021
8e558fe

Use consistent variable naming in ChainMonitor


jkczyz Mar 1, 2021
389c4ad

Change Mutex to RwLock in ChainMonitor


jkczyz Mar 1, 2021
e8ea0d9

Implement chain::Listen without using RefCell


jkczyz Mar 1, 2021

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


2 changes: 1 addition & 1 deletion
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,7 +126,7 @@ impl chain::Watch<EnforcingSigner> for TestChainMonitor {
 hash_map::Entry::Occupied(entry) => entry,
 hash_map::Entry::Vacant(_) => panic!("Didn't have monitor on update call"),
 };
 let mut deserialized_monitor = <(BlockHash, channelmonitor::ChannelMonitor<EnforcingSigner>)>::
 let deserialized_monitor = <(BlockHash, channelmonitor::ChannelMonitor<EnforcingSigner>)>::
 read(&mut Cursor::new(&map_entry.get().1), &OnlyReadsKeysInterface {}).unwrap().1;
 deserialized_monitor.update_monitor(&update, &&TestBroadcaster{}, &&FuzzEstimator{}, &self.logger).unwrap();
 let mut ser = VecWriter(Vec::new());
Expand Down

5 changes: 2 additions & 3 deletions
lightning-block-sync/src/init.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,6 @@ use lightning::chain;
///
/// use lightning_block_sync::*;
///
/// use std::cell::RefCell;
/// use std::io::Cursor;
///
/// async fn init_sync<
Expand DownExpand Up@@ -83,7 +82,7 @@ use lightning::chain;
///
/// // Synchronize any channel monitors and the channel manager to be on the best block.
/// let mut cache = UnboundedCache::new();
/// let mut monitor_listener = (RefCell::new(monitor), &*tx_broadcaster, &*fee_estimator, &*logger);
/// let mut monitor_listener = (monitor, &*tx_broadcaster, &*fee_estimator, &*logger);
/// let listeners = vec![
/// (monitor_block_hash, &mut monitor_listener as &mut dyn chain::Listen),
/// (manager_block_hash, &mut manager as &mut dyn chain::Listen),
Expand All@@ -92,7 +91,7 @@ use lightning::chain;
/// block_source, Network::Bitcoin, &mut cache, listeners).await.unwrap();
///
/// // Allow the chain monitor to watch any channels.
/// let monitor = monitor_listener.0.into_inner();
/// let monitor = monitor_listener.0;
/// chain_monitor.watch_channel(monitor.get_funding_txo().0, monitor);
///
/// // Create an SPV client to notify the chain monitor and channel manager of block events.
Expand Down

36 changes: 18 additions & 18 deletions
lightning/src/chain/chainmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ use util::events;
use util::events::Event;

use std::collections::{HashMap, hash_map};
use std::sync::Mutex;
use std::sync::RwLock;
use std::ops::Deref;

/// An implementation of [`chain::Watch`] for monitoring channels.
Expand All@@ -64,7 +64,7 @@ pub struct ChainMonitor<ChannelSigner: Sign, C: Deref, T: Deref, F: Deref, L: De
 P::Target: channelmonitor::Persist<ChannelSigner>,
{
	/// The monitors
	pub monitors: Mutex<HashMap<OutPoint, ChannelMonitor<ChannelSigner>>>,
	pub monitors: RwLock<HashMap<OutPoint, ChannelMonitor<ChannelSigner>>>,
	chain_source: Option<C>,
	broadcaster: T,
	logger: L,
Expand DownExpand Up@@ -93,8 +93,8 @@ where C::Target: chain::Filter,
	/// [`chain::Watch::release_pending_monitor_events`]: ../trait.Watch.html#tymethod.release_pending_monitor_events
	/// [`chain::Filter`]: ../trait.Filter.html
	pub fn block_connected(&self, header: &BlockHeader, txdata: &TransactionData, height: u32) {
 let mut monitors = self.monitors.lock().unwrap();
 for monitor in monitors.values_mut() {
 let monitors = self.monitors.read().unwrap();
 for monitor in monitors.values() {
 let mut txn_outputs = monitor.block_connected(header, txdata, height, &*self.broadcaster, &*self.fee_estimator, &*self.logger);

 if let Some(ref chain_source) = self.chain_source {
Expand All@@ -113,8 +113,8 @@ where C::Target: chain::Filter,
	///
	/// [`ChannelMonitor::block_disconnected`]: ../channelmonitor/struct.ChannelMonitor.html#method.block_disconnected
	pub fn block_disconnected(&self, header: &BlockHeader, disconnected_height: u32) {
 let mut monitors = self.monitors.lock().unwrap();
 for monitor in monitors.values_mut() {
 let monitors = self.monitors.read().unwrap();
 for monitor in monitors.values() {
 monitor.block_disconnected(header, disconnected_height, &*self.broadcaster, &*self.fee_estimator, &*self.logger);
 }
	}
Expand All@@ -130,7 +130,7 @@ where C::Target: chain::Filter,
	/// [`chain::Filter`]: ../trait.Filter.html
	pub fn new(chain_source: Option<C>, broadcaster: T, logger: L, feeest: F, persister: P) -> Self {
 Self {
 monitors: Mutex::new(HashMap::new()),
 monitors: RwLock::new(HashMap::new()),
 chain_source,
 broadcaster,
 logger,
Expand DownExpand Up@@ -177,7 +177,7 @@ where C::Target: chain::Filter,
	///
	/// [`chain::Filter`]: ../trait.Filter.html
	fn watch_channel(&self, funding_outpoint: OutPoint, monitor: ChannelMonitor<ChannelSigner>) -> Result<(), ChannelMonitorUpdateErr> {
 let mut monitors = self.monitors.lock().unwrap();
 let mut monitors = self.monitors.write().unwrap();
 let entry = match monitors.entry(funding_outpoint) {
 hash_map::Entry::Occupied(_) => {
 log_error!(self.logger, "Failed to add new channel data: channel monitor for given outpoint is already present");
Expand DownExpand Up@@ -209,8 +209,8 @@ where C::Target: chain::Filter,
	/// `ChainMonitor` monitors lock.
	fn update_channel(&self, funding_txo: OutPoint, update: ChannelMonitorUpdate) -> Result<(), ChannelMonitorUpdateErr> {
 // Update the monitor that watches the channel referred to by the given outpoint.
 let mut monitors = self.monitors.lock().unwrap();
 match monitors.get_mut(&funding_txo) {
 let monitors = self.monitors.read().unwrap();
 match monitors.get(&funding_txo) {
 None => {
 log_error!(self.logger, "Failed to update channel monitor: no such monitor registered");

Expand All@@ -222,15 +222,15 @@ where C::Target: chain::Filter,
 #[cfg(not(any(test, feature = "fuzztarget")))]
 Err(ChannelMonitorUpdateErr::PermanentFailure)
 },
 Some(orig_monitor) => {
 log_trace!(self.logger, "Updating Channel Monitor for channel {}", log_funding_info!(orig_monitor));
 let update_res = orig_monitor.update_monitor(&update, &self.broadcaster, &self.fee_estimator, &self.logger);
 Some(monitor) => {
 log_trace!(self.logger, "Updating Channel Monitor for channel {}", log_funding_info!(monitor));
 let update_res = monitor.update_monitor(&update, &self.broadcaster, &self.fee_estimator, &self.logger);
 if let Err(e) = &update_res {
 log_error!(self.logger, "Failed to update channel monitor: {:?}", e);
 }
 // Even if updating the monitor returns an error, the monitor's state will
 // still be changed. So, persist the updated monitor despite the error.
 let persist_res = self.persister.update_persisted_channel(funding_txo, &update, orig_monitor);
 let persist_res = self.persister.update_persisted_channel(funding_txo, &update, monitor);
 if let Err(ref e) = persist_res {
 log_error!(self.logger, "Failed to persist channel monitor update: {:?}", e);
 }
Expand All@@ -245,8 +245,8 @@ where C::Target: chain::Filter,

	fn release_pending_monitor_events(&self) -> Vec<MonitorEvent> {
 let mut pending_monitor_events = Vec::new();
 for chan in self.monitors.lock().unwrap().values_mut() {
 pending_monitor_events.append(&mut chan.get_and_clear_pending_monitor_events());
 for monitor in self.monitors.read().unwrap().values() {
 pending_monitor_events.append(&mut monitor.get_and_clear_pending_monitor_events());
 }
 pending_monitor_events
	}
Expand All@@ -261,8 +261,8 @@ impl<ChannelSigner: Sign, C: Deref, T: Deref, F: Deref, L: Deref, P: Deref> even
{
	fn get_and_clear_pending_events(&self) -> Vec<Event> {
 let mut pending_events = Vec::new();
 for chan in self.monitors.lock().unwrap().values_mut() {
 pending_events.append(&mut chan.get_and_clear_pending_events());
 for monitor in self.monitors.read().unwrap().values() {
 pending_events.append(&mut monitor.get_and_clear_pending_events());
 }
 pending_events
	}
Expand Down
Loading