X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fchain%2Fchannelmonitor.rs;h=cc88a0119fc95cf972680e7fcb4e5eb63495130c;hb=5671d2930d996e864614703696ed2cba5e47e4f0;hp=bee2bfd012e0ff3efc628b4954883804f5d6a0c7;hpb=21804de70c3ff37970ead98e5e72c4fccd14b1fb;p=rust-lightning

diff --git a/lightning/src/chain/channelmonitor.rs b/lightning/src/chain/channelmonitor.rs
index bee2bfd0..cc88a011 100644
--- a/lightning/src/chain/channelmonitor.rs
+++ b/lightning/src/chain/channelmonitor.rs
@@ -2443,8 +2443,8 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 			let secret = self.get_secret(commitment_number).unwrap();
 			let per_commitment_key = ignore_error!(SecretKey::from_slice(&secret));
 			let per_commitment_point = PublicKey::from_secret_key(&self.secp_ctx, &per_commitment_key);
-			let revocation_pubkey = ignore_error!(chan_utils::derive_public_revocation_key(&self.secp_ctx, &per_commitment_point, &self.holder_revocation_basepoint));
-			let delayed_key = ignore_error!(chan_utils::derive_public_key(&self.secp_ctx, &PublicKey::from_secret_key(&self.secp_ctx, &per_commitment_key), &self.counterparty_commitment_params.counterparty_delayed_payment_base_key));
+			let revocation_pubkey = chan_utils::derive_public_revocation_key(&self.secp_ctx, &per_commitment_point, &self.holder_revocation_basepoint);
+			let delayed_key = chan_utils::derive_public_key(&self.secp_ctx, &PublicKey::from_secret_key(&self.secp_ctx, &per_commitment_key), &self.counterparty_commitment_params.counterparty_delayed_payment_base_key);
 
 			let revokeable_redeemscript = chan_utils::get_revokeable_redeemscript(&revocation_pubkey, self.counterparty_commitment_params.on_counterparty_tx_csv, &delayed_key);
 			let revokeable_p2wsh = revokeable_redeemscript.to_v0_p2wsh();
@@ -2556,31 +2556,18 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 			} else { return (claimable_outpoints, to_counterparty_output_info); };
 
 		if let Some(transaction) = tx {
-			let revokeable_p2wsh_opt =
-				if let Ok(revocation_pubkey) = chan_utils::derive_public_revocation_key(
-					&self.secp_ctx, &per_commitment_point, &self.holder_revocation_basepoint)
-				{
-					if let Ok(delayed_key) = chan_utils::derive_public_key(&self.secp_ctx,
-						&per_commitment_point,
-						&self.counterparty_commitment_params.counterparty_delayed_payment_base_key)
-					{
-						Some(chan_utils::get_revokeable_redeemscript(&revocation_pubkey,
-							self.counterparty_commitment_params.on_counterparty_tx_csv,
-							&delayed_key).to_v0_p2wsh())
-					} else {
-						debug_assert!(false, "Failed to derive a delayed payment key for a commitment state we accepted");
-						None
-					}
-				} else {
-					debug_assert!(false, "Failed to derive a revocation pubkey key for a commitment state we accepted");
-					None
-				};
-			if let Some(revokeable_p2wsh) = revokeable_p2wsh_opt {
-				for (idx, outp) in transaction.output.iter().enumerate() {
-					if outp.script_pubkey == revokeable_p2wsh {
-						to_counterparty_output_info =
-							Some((idx.try_into().expect("Can't have > 2^32 outputs"), outp.value));
-					}
+			let revocation_pubkey = chan_utils::derive_public_revocation_key(
+				&self.secp_ctx, &per_commitment_point, &self.holder_revocation_basepoint);
+			let delayed_key = chan_utils::derive_public_key(&self.secp_ctx,
+				&per_commitment_point,
+				&self.counterparty_commitment_params.counterparty_delayed_payment_base_key);
+			let revokeable_p2wsh = chan_utils::get_revokeable_redeemscript(&revocation_pubkey,
+				self.counterparty_commitment_params.on_counterparty_tx_csv,
+				&delayed_key).to_v0_p2wsh();
+			for (idx, outp) in transaction.output.iter().enumerate() {
+				if outp.script_pubkey == revokeable_p2wsh {
+					to_counterparty_output_info =
+						Some((idx.try_into().expect("Can't have > 2^32 outputs"), outp.value));
 				}
 			}
 		}
@@ -3150,10 +3137,24 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 		F::Target: FeeEstimator,
 		L::Target: Logger,
 	{
-		self.onchain_events_awaiting_threshold_conf.retain(|ref entry| if entry.txid == *txid {
-			log_info!(logger, "Removing onchain event with txid {}", txid);
-			false
-		} else { true });
+		let mut removed_height = None;
+		for entry in self.onchain_events_awaiting_threshold_conf.iter() {
+			if entry.txid == *txid {
+				removed_height = Some(entry.height);
+				break;
+			}
+		}
+
+		if let Some(removed_height) = removed_height {
+			log_info!(logger, "transaction_unconfirmed of txid {} implies height {} was reorg'd out", txid, removed_height);
+			self.onchain_events_awaiting_threshold_conf.retain(|ref entry| if entry.height >= removed_height {
+				log_info!(logger, "Transaction {} reorg'd out", entry.txid);
+				false
+			} else { true });
+		}
+
+		debug_assert!(!self.onchain_events_awaiting_threshold_conf.iter().any(|ref entry| entry.txid == *txid));
+
 		self.onchain_tx_handler.transaction_unconfirmed(txid, broadcaster, fee_estimator, logger);
 	}
 
@@ -4072,7 +4073,7 @@ mod tests {
 			SecretKey::from_slice(&[41; 32]).unwrap(),
 			[41; 32],
 			0,
-			[0; 32]
+			[0; 32],
 		);
 
 		let counterparty_pubkeys = ChannelPublicKeys {
@@ -4093,6 +4094,7 @@ mod tests {
 			}),
 			funding_outpoint: Some(funding_outpoint),
 			opt_anchors: None,
+			opt_non_zero_fee_anchors: None,
 		};
 		// Prune with one old state and a holder commitment tx holding a few overlaps with the
 		// old state.