X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fchain%2Fchannelmonitor.rs;h=748adbd035983b574bccd4836e2f6aecd48a9323;hb=2a8179edb79268b6804417f07f55706b23354097;hp=857495630259d542af26e96d7cd80a59e90f713e;hpb=5aae0ab721fd703633f25b9587876b1911f910a9;p=rust-lightning

diff --git a/lightning/src/chain/channelmonitor.rs b/lightning/src/chain/channelmonitor.rs
index 85749563..748adbd0 100644
--- a/lightning/src/chain/channelmonitor.rs
+++ b/lightning/src/chain/channelmonitor.rs
@@ -37,7 +37,7 @@ 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::chan_utils::{CounterpartyCommitmentSecrets, HTLCOutputInCommitment, HTLCClaim, ChannelTransactionParameters, HolderCommitmentTransaction};
 use ln::channelmanager::HTLCSource;
 use chain;
 use chain::{BestBlock, WatchedOutput};
@@ -3159,25 +3159,17 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 	fn is_resolving_htlc_output<L: Deref>(&mut self, tx: &Transaction, height: u32, logger: &L) where L::Target: Logger {
 		'outer_loop: for input in &tx.input {
 			let mut payment_data = None;
-			let witness_items = input.witness.len();
-			let htlctype = input.witness.last().map(|w| w.len()).and_then(HTLCType::scriptlen_to_htlctype);
-			let prev_last_witness_len = input.witness.second_to_last().map(|w| w.len()).unwrap_or(0);
-			let revocation_sig_claim = (witness_items == 3 && htlctype == Some(HTLCType::OfferedHTLC) && prev_last_witness_len == 33)
-				|| (witness_items == 3 && htlctype == Some(HTLCType::AcceptedHTLC) && prev_last_witness_len == 33);
-			let accepted_preimage_claim = witness_items == 5 && htlctype == Some(HTLCType::AcceptedHTLC)
-				&& input.witness.second_to_last().unwrap().len() == 32;
+			let htlc_claim = HTLCClaim::from_witness(&input.witness);
+			let revocation_sig_claim = htlc_claim == Some(HTLCClaim::Revocation);
+			let accepted_preimage_claim = htlc_claim == Some(HTLCClaim::AcceptedPreimage);
 			#[cfg(not(fuzzing))]
-			let accepted_timeout_claim = witness_items == 3 && htlctype == Some(HTLCType::AcceptedHTLC) && !revocation_sig_claim;
-			let offered_preimage_claim = witness_items == 3 && htlctype == Some(HTLCType::OfferedHTLC) &&
-				!revocation_sig_claim && input.witness.second_to_last().unwrap().len() == 32;
-
+			let accepted_timeout_claim = htlc_claim == Some(HTLCClaim::AcceptedTimeout);
+			let offered_preimage_claim = htlc_claim == Some(HTLCClaim::OfferedPreimage);
 			#[cfg(not(fuzzing))]
-			let offered_timeout_claim = witness_items == 5 && htlctype == Some(HTLCType::OfferedHTLC);
+			let offered_timeout_claim = htlc_claim == Some(HTLCClaim::OfferedTimeout);
 
 			let mut payment_preimage = PaymentPreimage([0; 32]);
-			if accepted_preimage_claim {
-				payment_preimage.0.copy_from_slice(input.witness.second_to_last().unwrap());
-			} else if offered_preimage_claim {
+			if offered_preimage_claim || accepted_preimage_claim {
 				payment_preimage.0.copy_from_slice(input.witness.second_to_last().unwrap());
 			}
 
@@ -3775,8 +3767,7 @@ mod tests {
 	use ln::{PaymentPreimage, PaymentHash};
 	use ln::chan_utils;
 	use ln::chan_utils::{HTLCOutputInCommitment, ChannelPublicKeys, ChannelTransactionParameters, HolderCommitmentTransaction, CounterpartyChannelTransactionParameters};
-	use ln::channelmanager::PaymentSendFailure;
-	use ln::features::InitFeatures;
+	use ln::channelmanager::{self, PaymentSendFailure};
 	use ln::functional_test_utils::*;
 	use ln::script::ShutdownScript;
 	use util::errors::APIError;
@@ -3805,9 +3796,9 @@ mod tests {
 		let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &[None, None, None]);
 		let nodes = create_network(3, &node_cfgs, &node_chanmgrs);
 		let channel = create_announced_chan_between_nodes(
-			&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
+			&nodes, 0, 1, channelmanager::provided_init_features(), channelmanager::provided_init_features());
 		create_announced_chan_between_nodes(
-			&nodes, 1, 2, InitFeatures::known(), InitFeatures::known());
+			&nodes, 1, 2, channelmanager::provided_init_features(), channelmanager::provided_init_features());
 
 		// Rebalance somewhat
 		send_payment(&nodes[0], &[&nodes[1]], 10_000_000);