projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ensure we read the full TLV stream length when maybe-reading `None`
[rust-lightning]
/
lightning
/
src
/
chain
/
chainmonitor.rs
diff --git
a/lightning/src/chain/chainmonitor.rs
b/lightning/src/chain/chainmonitor.rs
index 09a32b6e2145e79a16121819f3112a31335ae5ca..14544754318ad5945622c42bd0300679aef6a6de 100644
(file)
--- a/
lightning/src/chain/chainmonitor.rs
+++ b/
lightning/src/chain/chainmonitor.rs
@@
-35,7
+35,7
@@
use crate::sign::ecdsa::WriteableEcdsaChannelSigner;
use crate::events;
use crate::events::{Event, EventHandler};
use crate::util::atomic_counter::AtomicCounter;
use crate::events;
use crate::events::{Event, EventHandler};
use crate::util::atomic_counter::AtomicCounter;
-use crate::util::logger::
Logger
;
+use crate::util::logger::
{Logger, WithContext}
;
use crate::util::errors::APIError;
use crate::util::wakers::{Future, Notifier};
use crate::ln::channelmanager::ChannelDetails;
use crate::util::errors::APIError;
use crate::util::wakers::{Future, Notifier};
use crate::ln::channelmanager::ChannelDetails;
@@
-757,7
+757,8
@@
where C::Target: chain::Filter,
let monitors = self.monitors.read().unwrap();
match monitors.get(&funding_txo) {
None => {
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");
+ let logger = WithContext::from(&self.logger, update.counterparty_node_id, Some(funding_txo.to_channel_id()));
+ log_error!(logger, "Failed to update channel monitor: no such monitor registered");
// We should never ever trigger this from within ChannelManager. Technically a
// user could use this object with some proxying in between which makes this
// We should never ever trigger this from within ChannelManager. Technically a
// user could use this object with some proxying in between which makes this