X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fchain%2Fchannelmonitor.rs;h=f63e4d12d55adc59fa1f81270aea9f669d03a65f;hb=refs%2Ftags%2Fv0.0.14;hp=573d19df50f94a9062af19b82988b18185cb1241;hpb=ffedc055b586cc0dd0cb6aac3263a4b28c69efb4;p=rust-lightning

diff --git a/lightning/src/chain/channelmonitor.rs b/lightning/src/chain/channelmonitor.rs
index 573d19df..f63e4d12 100644
--- a/lightning/src/chain/channelmonitor.rs
+++ b/lightning/src/chain/channelmonitor.rs
@@ -34,10 +34,11 @@ use bitcoin::secp256k1::{Secp256k1,Signature};
 use bitcoin::secp256k1::key::{SecretKey,PublicKey};
 use bitcoin::secp256k1;
 
+use ln::{PaymentHash, PaymentPreimage};
 use ln::msgs::DecodeError;
 use ln::chan_utils;
 use ln::chan_utils::{CounterpartyCommitmentSecrets, HTLCOutputInCommitment, HTLCType, ChannelTransactionParameters, HolderCommitmentTransaction};
-use ln::channelmanager::{BestBlock, HTLCSource, PaymentPreimage, PaymentHash};
+use ln::channelmanager::{BestBlock, HTLCSource};
 use ln::onchaintx::{OnchainTxHandler, InputDescriptors};
 use chain;
 use chain::WatchedOutput;
@@ -1311,11 +1312,9 @@ impl<Signer: Sign> ChannelMonitor<Signer> {
 	/// outputs to watch. See [`block_connected`] for details.
 	///
 	/// Used instead of [`block_connected`] by clients that are notified of transactions rather than
-	/// blocks. May be called before or after [`update_best_block`] for transactions in the
-	/// corresponding block. See [`update_best_block`] for further calling expectations. 
+	/// blocks. See [`chain::Confirm`] for calling expectations.
 	///
 	/// [`block_connected`]: Self::block_connected
-	/// [`update_best_block`]: Self::update_best_block
 	pub fn transactions_confirmed<B: Deref, F: Deref, L: Deref>(
 		&self,
 		header: &BlockHeader,
@@ -1337,11 +1336,9 @@ impl<Signer: Sign> ChannelMonitor<Signer> {
 	/// Processes a transaction that was reorganized out of the chain.
 	///
 	/// Used instead of [`block_disconnected`] by clients that are notified of transactions rather
-	/// than blocks. May be called before or after [`update_best_block`] for transactions in the
-	/// corresponding block. See [`update_best_block`] for further calling expectations.
+	/// than blocks. See [`chain::Confirm`] for calling expectations.
 	///
 	/// [`block_disconnected`]: Self::block_disconnected
-	/// [`update_best_block`]: Self::update_best_block
 	pub fn transaction_unconfirmed<B: Deref, F: Deref, L: Deref>(
 		&self,
 		txid: &Txid,
@@ -1361,18 +1358,10 @@ impl<Signer: Sign> ChannelMonitor<Signer> {
 	/// [`block_connected`] for details.
 	///
 	/// Used instead of [`block_connected`] by clients that are notified of transactions rather than
-	/// blocks. May be called before or after [`transactions_confirmed`] for the corresponding
-	/// block.
-	///
-	/// Must be called after new blocks become available for the most recent block. Intermediary
-	/// blocks, however, may be safely skipped. In the event of a chain re-organization, this only
-	/// needs to be called for the most recent block assuming `transaction_unconfirmed` is called
-	/// for any affected transactions.
+	/// blocks. See [`chain::Confirm`] for calling expectations.
 	///
 	/// [`block_connected`]: Self::block_connected
-	/// [`transactions_confirmed`]: Self::transactions_confirmed
-	/// [`transaction_unconfirmed`]: Self::transaction_unconfirmed
-	pub fn update_best_block<B: Deref, F: Deref, L: Deref>(
+	pub fn best_block_updated<B: Deref, F: Deref, L: Deref>(
 		&self,
 		header: &BlockHeader,
 		height: u32,
@@ -1385,7 +1374,7 @@ impl<Signer: Sign> ChannelMonitor<Signer> {
 		F::Target: FeeEstimator,
 		L::Target: Logger,
 	{
-		self.inner.lock().unwrap().update_best_block(
+		self.inner.lock().unwrap().best_block_updated(
 			header, height, broadcaster, fee_estimator, logger)
 	}
 
@@ -2109,7 +2098,7 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 		self.transactions_confirmed(header, txdata, height, broadcaster, fee_estimator, logger)
 	}
 
-	fn update_best_block<B: Deref, F: Deref, L: Deref>(
+	fn best_block_updated<B: Deref, F: Deref, L: Deref>(
 		&mut self,
 		header: &BlockHeader,
 		height: u32,
@@ -2675,7 +2664,7 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 /// transaction and losing money. This is a risk because previous channel states
 /// are toxic, so it's important that whatever channel state is persisted is
 /// kept up-to-date.
-pub trait Persist<ChannelSigner: Sign>: Send + Sync {
+pub trait Persist<ChannelSigner: Sign> {
 	/// Persist a new channel's data. The data can be stored any way you want, but
 	/// the identifier provided by Rust-Lightning is the channel's outpoint (and
 	/// it is up to you to maintain a correct mapping between the outpoint and the
@@ -2727,6 +2716,29 @@ where
 	}
 }
 
+impl<Signer: Sign, T: Deref, F: Deref, L: Deref> chain::Confirm for (ChannelMonitor<Signer>, T, F, L)
+where
+	T::Target: BroadcasterInterface,
+	F::Target: FeeEstimator,
+	L::Target: Logger,
+{
+	fn transactions_confirmed(&self, header: &BlockHeader, txdata: &TransactionData, height: u32) {
+		self.0.transactions_confirmed(header, txdata, height, &*self.1, &*self.2, &*self.3);
+	}
+
+	fn transaction_unconfirmed(&self, txid: &Txid) {
+		self.0.transaction_unconfirmed(txid, &*self.1, &*self.2, &*self.3);
+	}
+
+	fn best_block_updated(&self, header: &BlockHeader, height: u32) {
+		self.0.best_block_updated(header, height, &*self.1, &*self.2, &*self.3);
+	}
+
+	fn get_relevant_txids(&self) -> Vec<Txid> {
+		self.0.get_relevant_txids()
+	}
+}
+
 const MAX_ALLOC_SIZE: usize = 64*1024;
 
 impl<'a, Signer: Sign, K: KeysInterface<Signer = Signer>> ReadableArgs<&'a K>
@@ -3037,7 +3049,8 @@ mod tests {
 	use hex;
 	use chain::channelmonitor::ChannelMonitor;
 	use chain::transaction::OutPoint;
-	use ln::channelmanager::{BestBlock, PaymentPreimage, PaymentHash};
+	use ln::{PaymentPreimage, PaymentHash};
+	use ln::channelmanager::BestBlock;
 	use ln::onchaintx::{OnchainTxHandler, InputDescriptors};
 	use ln::chan_utils;
 	use ln::chan_utils::{HTLCOutputInCommitment, ChannelPublicKeys, ChannelTransactionParameters, HolderCommitmentTransaction, CounterpartyChannelTransactionParameters};