From 135cff1c954339c3a07d4ea7e970e440632fc5a9 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Sun, 7 Mar 2021 12:58:14 -0500 Subject: [PATCH] Add utility in `ChannelMonitor` to reload `chain::Filter` data The deserialization process for `ChannelManager`/`ChannelMonitor` data includes reloading any relevant `chain::Filter` with data provided from the `ChannelMonitor`, but its nice if we adapt the data to `chain::Filter` calls for users. --- lightning/src/chain/channelmonitor.rs | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/lightning/src/chain/channelmonitor.rs b/lightning/src/chain/channelmonitor.rs index 23526612..47ccdc16 100644 --- a/lightning/src/chain/channelmonitor.rs +++ b/lightning/src/chain/channelmonitor.rs @@ -45,6 +45,7 @@ use chain; use chain::chaininterface::{BroadcasterInterface, FeeEstimator}; use chain::transaction::{OutPoint, TransactionData}; use chain::keysinterface::{SpendableOutputDescriptor, StaticPaymentOutputDescriptor, DelayedPaymentOutputDescriptor, Sign, KeysInterface}; +use chain::Filter; use util::logger::Logger; use util::ser::{Readable, ReadableArgs, MaybeReadable, Writer, Writeable, U48}; use util::byte_utils; @@ -1171,6 +1172,20 @@ impl ChannelMonitor { self.inner.lock().unwrap().get_outputs_to_watch().clone() } + /// Loads the funding txo and outputs to watch into the given `chain::Filter` by repeatedly + /// calling `chain::Filter::register_output` and `chain::Filter::register_tx` until all outputs + /// have been registered. + pub fn load_outputs_to_watch(&self, filter: F) where F::Target: chain::Filter { + let lock = self.inner.lock().unwrap(); + filter.register_tx(&lock.get_funding_txo().0.txid, &lock.get_funding_txo().1); + for (txid, outputs) in lock.get_outputs_to_watch().iter() { + for (index, script_pubkey) in outputs.iter() { + assert!(*index <= u16::max_value() as u32); + filter.register_output(&OutPoint { txid: *txid, index: *index as u16 }, script_pubkey); + } + } + } + /// Get the list of HTLCs who's status has been updated on chain. This should be called by /// ChannelManager via [`chain::Watch::release_pending_monitor_events`]. /// -- 2.30.2