Merge pull request #227 from p2pderivatives/chore/port-back-lightning…

…-changes

Port back changes from lightning experiment branch

dlc-manager/src/chain_monitor.rs

@@ -2,48 +2,47 @@
 
 use std::collections::HashMap;
 
-use bitcoin::{Block, BlockHash, Transaction, Txid};
+use bitcoin::{Block, OutPoint, Transaction, Txid};
 use dlc_messages::ser_impls::{
-    read_ecdsa_adaptor_signature, read_hash_map, read_vec, write_ecdsa_adaptor_signature,
-    write_hash_map, write_vec,
+    read_ecdsa_adaptor_signature, read_hash_map, write_ecdsa_adaptor_signature, write_hash_map,
 };
 use lightning::ln::msgs::DecodeError;
 use lightning::util::ser::{Readable, Writeable, Writer};
 use secp256k1_zkp::EcdsaAdaptorSignature;
 
 use crate::ChannelId;
 
-const NB_SAVED_BLOCK_HASHES: usize = 6;
-
 /// A `ChainMonitor` keeps a list of transaction ids to watch for in the blockchain,
 /// and some associated information used to apply an action when the id is seen.
 #[derive(Debug, PartialEq, Eq)]
 pub struct ChainMonitor {
-    watched_tx: HashMap<Txid, ChannelInfo>,
+    pub(crate) watched_tx: HashMap<Txid, WatchState>,
+    pub(crate) watched_txo: HashMap<OutPoint, WatchState>,
     pub(crate) last_height: u64,
-    pub(crate) last_block_hashes: Vec<BlockHash>,
 }
 
-impl_dlc_writeable!(ChainMonitor, { (watched_tx, { cb_writeable, write_hash_map, read_hash_map}), (last_height, writeable), (last_block_hashes, { cb_writeable, write_vec, read_vec}) });
+impl_dlc_writeable!(ChainMonitor, { (watched_tx, { cb_writeable, write_hash_map, read_hash_map}), (watched_txo, { cb_writeable, write_hash_map, read_hash_map}), (last_height, writeable) });
 
-#[derive(Clone, Debug, PartialEq, Eq)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub(crate) struct ChannelInfo {
     pub channel_id: ChannelId,
     pub tx_type: TxType,
 }
 
 impl_dlc_writeable!(ChannelInfo, { (channel_id, writeable), (tx_type, writeable) });
 
-#[derive(Clone, Debug, PartialEq, Eq)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub(crate) enum TxType {
     Revoked {
         update_idx: u64,
         own_adaptor_signature: EcdsaAdaptorSignature,
         is_offer: bool,
         revoked_tx_type: RevokedTxType,
     },
-    Current,
+    BufferTx,
     CollaborativeClose,
+    SettleTx,
+    Cet,
 }
 
 impl_dlc_writeable_enum!(TxType,;
@@ -53,10 +52,10 @@ impl_dlc_writeable_enum!(TxType,;
         (is_offer, writeable),
         (revoked_tx_type, writeable)
     });;
-    (1, Current), (2, CollaborativeClose)
+    (1, BufferTx), (2, CollaborativeClose), (3, SettleTx), (4, Cet)
 );
 
-#[derive(Clone, Debug, PartialEq, Eq)]
+#[derive(Clone, Debug, PartialEq, Eq, Copy)]
 pub(crate) enum RevokedTxType {
     Buffer,
     Settle,
@@ -69,50 +68,156 @@ impl ChainMonitor {
     pub fn new(init_height: u64) -> Self {
         ChainMonitor {
             watched_tx: HashMap::new(),
+            watched_txo: HashMap::new(),
             last_height: init_height,
-            last_block_hashes: Vec::with_capacity(NB_SAVED_BLOCK_HASHES),
         }
     }
 
+    /// Returns true if the monitor doesn't contain any transaction to be watched.
+    pub fn is_empty(&self) -> bool {
+        self.watched_tx.is_empty()
+    }
+
     pub(crate) fn add_tx(&mut self, txid: Txid, channel_info: ChannelInfo) {
-        self.watched_tx.insert(txid, channel_info);
+        log::debug!("Watching transaction {txid}: {channel_info:?}");
+        self.watched_tx.insert(txid, WatchState::new(channel_info));
+
+        // When we watch a buffer transaction we also want to watch
+        // the buffer transaction _output_ so that we can detect when
+        // a CET spends it without having to watch every possible CET
+        if channel_info.tx_type == TxType::BufferTx {
+            let outpoint = OutPoint {
+                txid,
+                // We can safely assume that the buffer transaction
+                // only has one output
+                vout: 0,
+            };
+            self.add_txo(
+                outpoint,
+                ChannelInfo {
+                    channel_id: channel_info.channel_id,
+                    tx_type: TxType::Cet,
+                },
+            );
+        }
+    }
+
+    fn add_txo(&mut self, outpoint: OutPoint, channel_info: ChannelInfo) {
+        log::debug!("Watching transaction output {outpoint}: {channel_info:?}");
+        self.watched_txo
+            .insert(outpoint, WatchState::new(channel_info));
+    }
+
+    pub(crate) fn cleanup_channel(&mut self, channel_id: ChannelId) {
+        log::debug!("Cleaning up data related to channel {channel_id:?}");
+
+        self.watched_tx
+            .retain(|_, state| state.channel_id() != channel_id);
+
+        self.watched_txo
+            .retain(|_, state| state.channel_id() != channel_id);
     }
 
     pub(crate) fn remove_tx(&mut self, txid: &Txid) {
+        log::debug!("Stopped watching transaction {txid}");
         self.watched_tx.remove(txid);
     }
 
-    pub(crate) fn process_block(
-        &self,
-        block: &Block,
-        height: u64,
-    ) -> Vec<(Transaction, ChannelInfo)> {
-        let mut res = Vec::new();
-
+    /// Check if any watched transactions are part of the block, confirming them if so.
+    ///
+    /// # Panics
+    ///
+    /// Panics if the new block's height is not exactly one more than the last processed height.
+    pub(crate) fn process_block(&mut self, block: &Block, height: u64) {
         assert_eq!(self.last_height + 1, height);
 
-        for tx in &block.txdata {
-            let txid = tx.txid();
-            if self.watched_tx.contains_key(&txid) {
-                let channel_info = self
-                    .watched_tx
-                    .get(&txid)
-                    .expect("to be able to retrieve the channel info");
-                res.push((tx.clone(), channel_info.clone()));
+        for tx in block.txdata.iter() {
+            if let Some(state) = self.watched_tx.get_mut(&tx.txid()) {
+                state.confirm(tx.clone());
+            }
+
+            for txin in tx.input.iter() {
+                if let Some(state) = self.watched_txo.get_mut(&txin.previous_output) {
+                    state.confirm(tx.clone())
+                }
             }
         }
 
-        res
+        self.last_height += 1;
     }
 
-    /// To be safe this is a separate function from process block to make sure updates are
-    /// saved before we update the state. It is better to re-process a block than not
-    /// process it at all.
-    pub(crate) fn increment_height(&mut self, last_block_hash: &BlockHash) {
-        self.last_height += 1;
-        self.last_block_hashes.push(*last_block_hash);
-        if self.last_block_hashes.len() > NB_SAVED_BLOCK_HASHES {
-            self.last_block_hashes.remove(0);
+    /// All the currently watched transactions which have been confirmed.
+    pub(crate) fn confirmed_txs(&self) -> Vec<(Transaction, ChannelInfo)> {
+        (self.watched_tx.values())
+            .chain(self.watched_txo.values())
+            .filter_map(|state| match state {
+                WatchState::Registered { .. } => None,
+                WatchState::Confirmed {
+                    channel_info,
+                    transaction,
+                } => Some((transaction.clone(), *channel_info)),
+            })
+            .collect()
+    }
+}
+
+/// The state of a watched transaction or transaction output.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub(crate) enum WatchState {
+    /// It has been registered but we are not aware of any
+    /// confirmations.
+    Registered { channel_info: ChannelInfo },
+    /// It has received at least one confirmation.
+    Confirmed {
+        channel_info: ChannelInfo,
+        transaction: Transaction,
+    },
+}
+
+impl_dlc_writeable_enum!(
+    WatchState,;
+    (0, Registered, {(channel_info, writeable)}),
+    (1, Confirmed, {(channel_info, writeable), (transaction, writeable)});;
+);
+
+impl WatchState {
+    fn new(channel_info: ChannelInfo) -> Self {
+        Self::Registered { channel_info }
+    }
+
+    fn confirm(&mut self, transaction: Transaction) {
+        match self {
+            WatchState::Registered { ref channel_info } => {
+                log::info!(
+                    "Transaction {} confirmed: {channel_info:?}",
+                    transaction.txid()
+                );
+
+                *self = WatchState::Confirmed {
+                    channel_info: *channel_info,
+                    transaction,
+                }
+            }
+            WatchState::Confirmed {
+                channel_info,
+                transaction,
+            } => {
+                log::error!(
+                    "Transaction {} already confirmed: {channel_info:?}",
+                    transaction.txid()
+                );
+            }
         }
     }
+
+    fn channel_info(&self) -> ChannelInfo {
+        match self {
+            WatchState::Registered { channel_info }
+            | WatchState::Confirmed { channel_info, .. } => *channel_info,
+        }
+    }
+
+    fn channel_id(&self) -> ChannelId {
+        self.channel_info().channel_id
+    }
 }