projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Return confirmation height via `Confirm::get_relevant_txids`
[rust-lightning]
/
lightning
/
src
/
chain
/
channelmonitor.rs
diff --git
a/lightning/src/chain/channelmonitor.rs
b/lightning/src/chain/channelmonitor.rs
index d78f40f3facf3bccec9ced5e483e74bb4bea969d..65b58722762087035cfb43573b87c05050e3abbb 100644
(file)
--- a/
lightning/src/chain/channelmonitor.rs
+++ b/
lightning/src/chain/channelmonitor.rs
@@
-1634,15
+1634,15
@@
impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
}
/// Returns the set of txids that should be monitored for re-organization out of the chain.
}
/// Returns the set of txids that should be monitored for re-organization out of the chain.
- pub fn get_relevant_txids(&self) -> Vec<(Txid, Option<BlockHash>)> {
+ pub fn get_relevant_txids(&self) -> Vec<(Txid,
u32,
Option<BlockHash>)> {
let inner = self.inner.lock().unwrap();
let inner = self.inner.lock().unwrap();
- let mut txids: Vec<(Txid, Option<BlockHash>)> = inner.onchain_events_awaiting_threshold_conf
+ let mut txids: Vec<(Txid,
u32,
Option<BlockHash>)> = inner.onchain_events_awaiting_threshold_conf
.iter()
.iter()
- .map(|entry| (entry.txid, entry.block_hash))
+ .map(|entry| (entry.txid, entry.
height, entry.
block_hash))
.chain(inner.onchain_tx_handler.get_relevant_txids().into_iter())
.collect();
.chain(inner.onchain_tx_handler.get_relevant_txids().into_iter())
.collect();
- txids.sort_unstable
(
);
- txids.dedup
(
);
+ txids.sort_unstable
_by(|a, b| a.0.cmp(&b.0).then(b.1.cmp(&a.1))
);
+ txids.dedup
_by_key(|(txid, _, _)| *txid
);
txids
}
txids
}
@@
-4171,7
+4171,7
@@
where
self.0.best_block_updated(header, height, &*self.1, &*self.2, &*self.3);
}
self.0.best_block_updated(header, height, &*self.1, &*self.2, &*self.3);
}
- fn get_relevant_txids(&self) -> Vec<(Txid, Option<BlockHash>)> {
+ fn get_relevant_txids(&self) -> Vec<(Txid,
u32,
Option<BlockHash>)> {
self.0.get_relevant_txids()
}
}
self.0.get_relevant_txids()
}
}