X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fchannelmonitor.rs;h=b9527f599b246552056cd5b98a6866c0fb4514f8;hb=b2064927cbde275ce97c94a89f75fdf0b85065f0;hp=6ca9578b9a4beb1e715a5282a402b7ed75a951c7;hpb=feb472dc9ef971b926b19d27e1ad05a79423778f;p=rust-lightning

diff --git a/lightning/src/ln/channelmonitor.rs b/lightning/src/ln/channelmonitor.rs
index 6ca9578b..b9527f59 100644
--- a/lightning/src/ln/channelmonitor.rs
+++ b/lightning/src/ln/channelmonitor.rs
@@ -16,7 +16,7 @@ use bitcoin::blockdata::transaction::{TxIn,TxOut,SigHashType,Transaction};
 use bitcoin::blockdata::transaction::OutPoint as BitcoinOutPoint;
 use bitcoin::blockdata::script::{Script, Builder};
 use bitcoin::blockdata::opcodes;
-use bitcoin::consensus::encode::{self, Decodable, Encodable};
+use bitcoin::consensus::encode;
 use bitcoin::util::hash::BitcoinHash;
 use bitcoin::util::bip143;
 
@@ -31,17 +31,17 @@ use secp256k1;
 
 use ln::msgs::DecodeError;
 use ln::chan_utils;
-use ln::chan_utils::HTLCOutputInCommitment;
+use ln::chan_utils::{HTLCOutputInCommitment, LocalCommitmentTransaction};
 use ln::channelmanager::{HTLCSource, PaymentPreimage, PaymentHash};
 use ln::channel::{ACCEPTED_HTLC_SCRIPT_WEIGHT, OFFERED_HTLC_SCRIPT_WEIGHT};
 use chain::chaininterface::{ChainListener, ChainWatchInterface, BroadcasterInterface, FeeEstimator, ConfirmationTarget, MIN_RELAY_FEE_SAT_PER_1000_WEIGHT};
 use chain::transaction::OutPoint;
 use chain::keysinterface::SpendableOutputDescriptor;
 use util::logger::Logger;
-use util::ser::{ReadableArgs, Readable, Writer, Writeable, WriterWriteAdaptor, U48};
+use util::ser::{ReadableArgs, Readable, Writer, Writeable, U48};
 use util::{byte_utils, events};
 
-use std::collections::{HashMap, hash_map};
+use std::collections::{HashMap, hash_map, HashSet};
 use std::sync::{Arc,Mutex};
 use std::{hash,cmp, mem};
 
@@ -331,13 +331,12 @@ pub(crate) const ANTI_REORG_DELAY: u32 = 6;
 #[derive(Clone, PartialEq)]
 enum Storage {
 	Local {
+		funding_key: SecretKey,
 		revocation_base_key: SecretKey,
 		htlc_base_key: SecretKey,
 		delayed_payment_base_key: SecretKey,
 		payment_base_key: SecretKey,
 		shutdown_pubkey: PublicKey,
-		prev_latest_per_commitment_point: Option<PublicKey>,
-		latest_per_commitment_point: Option<PublicKey>,
 		funding_info: Option<(OutPoint, Script)>,
 		current_remote_commitment_txid: Option<Sha256dHash>,
 		prev_remote_commitment_txid: Option<Sha256dHash>,
@@ -352,13 +351,14 @@ enum Storage {
 struct LocalSignedTx {
 	/// txid of the transaction in tx, just used to make comparison faster
 	txid: Sha256dHash,
-	tx: Transaction,
+	tx: LocalCommitmentTransaction,
 	revocation_key: PublicKey,
 	a_htlc_key: PublicKey,
 	b_htlc_key: PublicKey,
 	delayed_payment_key: PublicKey,
+	per_commitment_point: PublicKey,
 	feerate_per_kw: u64,
-	htlc_outputs: Vec<(HTLCOutputInCommitment, Option<(Signature, Signature)>, Option<HTLCSource>)>,
+	htlc_outputs: Vec<(HTLCOutputInCommitment, Option<Signature>, Option<HTLCSource>)>,
 }
 
 #[derive(PartialEq)]
@@ -513,7 +513,7 @@ enum OnchainEvent {
 
 /// Higher-level cache structure needed to re-generate bumped claim txn if needed
 #[derive(Clone, PartialEq)]
-struct ClaimTxBumpMaterial {
+pub struct ClaimTxBumpMaterial {
 	// At every block tick, used to check if pending claiming tx is taking too
 	// much time for confirmation and we need to bump it.
 	height_timer: u32,
@@ -571,6 +571,8 @@ pub struct ChannelMonitor {
 	key_storage: Storage,
 	their_htlc_base_key: Option<PublicKey>,
 	their_delayed_payment_base_key: Option<PublicKey>,
+	funding_redeemscript: Option<Script>,
+	channel_value_satoshis: Option<u64>,
 	// first is the idx of the first of the two revocation points
 	their_cur_revocation_points: Option<(u64, PublicKey, Option<PublicKey>)>,
 
@@ -621,6 +623,9 @@ pub struct ChannelMonitor {
 	// Key is identifier of the pending claim request, i.e the txid of the initial claiming transaction generated by
 	// us and is immutable until all outpoint of the claimable set are post-anti-reorg-delay solved.
 	// Entry is cache of elements need to generate a bumped claiming transaction (see ClaimTxBumpMaterial)
+	#[cfg(test)] // Used in functional_test to verify sanitization
+	pub pending_claim_requests: HashMap<Sha256dHash, ClaimTxBumpMaterial>,
+	#[cfg(not(test))]
 	pending_claim_requests: HashMap<Sha256dHash, ClaimTxBumpMaterial>,
 
 	// Used to link outpoints claimed in a connected block to a pending claim request.
@@ -629,6 +634,9 @@ pub struct ChannelMonitor {
 	// is txid of the initial claiming transaction and is immutable until outpoint is
 	// post-anti-reorg-delay solved, confirmaiton_block is used to erase entry if
 	// block with output gets disconnected.
+	#[cfg(test)] // Used in functional_test to verify sanitization
+	pub claimable_outpoints: HashMap<BitcoinOutPoint, (Sha256dHash, u32)>,
+	#[cfg(not(test))]
 	claimable_outpoints: HashMap<BitcoinOutPoint, (Sha256dHash, u32)>,
 
 	// Used to track onchain events, i.e transactions parts of channels confirmed on chain, on which
@@ -690,6 +698,8 @@ impl PartialEq for ChannelMonitor {
 			self.key_storage != other.key_storage ||
 			self.their_htlc_base_key != other.their_htlc_base_key ||
 			self.their_delayed_payment_base_key != other.their_delayed_payment_base_key ||
+			self.funding_redeemscript != other.funding_redeemscript ||
+			self.channel_value_satoshis != other.channel_value_satoshis ||
 			self.their_cur_revocation_points != other.their_cur_revocation_points ||
 			self.our_to_self_delay != other.our_to_self_delay ||
 			self.their_to_self_delay != other.their_to_self_delay ||
@@ -719,24 +729,25 @@ impl PartialEq for ChannelMonitor {
 }
 
 impl ChannelMonitor {
-	pub(super) fn new(revocation_base_key: &SecretKey, delayed_payment_base_key: &SecretKey, htlc_base_key: &SecretKey, payment_base_key: &SecretKey, shutdown_pubkey: &PublicKey, our_to_self_delay: u16, destination_script: Script, logger: Arc<Logger>) -> ChannelMonitor {
+	pub(super) fn new(funding_key: &SecretKey, revocation_base_key: &SecretKey, delayed_payment_base_key: &SecretKey, htlc_base_key: &SecretKey, payment_base_key: &SecretKey, shutdown_pubkey: &PublicKey, our_to_self_delay: u16, destination_script: Script, logger: Arc<Logger>) -> ChannelMonitor {
 		ChannelMonitor {
 			commitment_transaction_number_obscure_factor: 0,
 
 			key_storage: Storage::Local {
+				funding_key: funding_key.clone(),
 				revocation_base_key: revocation_base_key.clone(),
 				htlc_base_key: htlc_base_key.clone(),
 				delayed_payment_base_key: delayed_payment_base_key.clone(),
 				payment_base_key: payment_base_key.clone(),
 				shutdown_pubkey: shutdown_pubkey.clone(),
-				prev_latest_per_commitment_point: None,
-				latest_per_commitment_point: None,
 				funding_info: None,
 				current_remote_commitment_txid: None,
 				prev_remote_commitment_txid: None,
 			},
 			their_htlc_base_key: None,
 			their_delayed_payment_base_key: None,
+			funding_redeemscript: None,
+			channel_value_satoshis: None,
 			their_cur_revocation_points: None,
 
 			our_to_self_delay: our_to_self_delay,
@@ -955,27 +966,20 @@ impl ChannelMonitor {
 	/// is important that any clones of this channel monitor (including remote clones) by kept
 	/// up-to-date as our local commitment transaction is updated.
 	/// Panics if set_their_to_self_delay has never been called.
-	/// Also update Storage with latest local per_commitment_point to derive local_delayedkey in
-	/// case of onchain HTLC tx
-	pub(super) fn provide_latest_local_commitment_tx_info(&mut self, signed_commitment_tx: Transaction, local_keys: chan_utils::TxCreationKeys, feerate_per_kw: u64, htlc_outputs: Vec<(HTLCOutputInCommitment, Option<(Signature, Signature)>, Option<HTLCSource>)>) {
+	pub(super) fn provide_latest_local_commitment_tx_info(&mut self, commitment_tx: LocalCommitmentTransaction, local_keys: chan_utils::TxCreationKeys, feerate_per_kw: u64, htlc_outputs: Vec<(HTLCOutputInCommitment, Option<Signature>, Option<HTLCSource>)>) {
 		assert!(self.their_to_self_delay.is_some());
 		self.prev_local_signed_commitment_tx = self.current_local_signed_commitment_tx.take();
 		self.current_local_signed_commitment_tx = Some(LocalSignedTx {
-			txid: signed_commitment_tx.txid(),
-			tx: signed_commitment_tx,
+			txid: commitment_tx.txid(),
+			tx: commitment_tx,
 			revocation_key: local_keys.revocation_key,
 			a_htlc_key: local_keys.a_htlc_key,
 			b_htlc_key: local_keys.b_htlc_key,
 			delayed_payment_key: local_keys.a_delayed_payment_key,
+			per_commitment_point: local_keys.per_commitment_point,
 			feerate_per_kw,
 			htlc_outputs,
 		});
-
-		if let Storage::Local { ref mut latest_per_commitment_point, .. } = self.key_storage {
-			*latest_per_commitment_point = Some(local_keys.per_commitment_point);
-		} else {
-			panic!("Channel somehow ended up with its internal ChannelMonitor being in Watchtower mode?");
-		}
 	}
 
 	/// Provides a payment_hash->payment_preimage mapping. Will be automatically pruned when all
@@ -1018,8 +1022,8 @@ impl ChannelMonitor {
 		}
 		if let Some(ref local_tx) = self.current_local_signed_commitment_tx {
 			if let Some(ref other_local_tx) = other.current_local_signed_commitment_tx {
-				let our_commitment_number = 0xffffffffffff - ((((local_tx.tx.input[0].sequence as u64 & 0xffffff) << 3*8) | (local_tx.tx.lock_time as u64 & 0xffffff)) ^ self.commitment_transaction_number_obscure_factor);
-				let other_commitment_number = 0xffffffffffff - ((((other_local_tx.tx.input[0].sequence as u64 & 0xffffff) << 3*8) | (other_local_tx.tx.lock_time as u64 & 0xffffff)) ^ other.commitment_transaction_number_obscure_factor);
+				let our_commitment_number = 0xffffffffffff - ((((local_tx.tx.without_valid_witness().input[0].sequence as u64 & 0xffffff) << 3*8) | (local_tx.tx.without_valid_witness().lock_time as u64 & 0xffffff)) ^ self.commitment_transaction_number_obscure_factor);
+				let other_commitment_number = 0xffffffffffff - ((((other_local_tx.tx.without_valid_witness().input[0].sequence as u64 & 0xffffff) << 3*8) | (other_local_tx.tx.without_valid_witness().lock_time as u64 & 0xffffff)) ^ other.commitment_transaction_number_obscure_factor);
 				if our_commitment_number >= other_commitment_number {
 					self.key_storage = other.key_storage;
 				}
@@ -1046,12 +1050,6 @@ impl ChannelMonitor {
 		Ok(())
 	}
 
-	/// Panics if commitment_transaction_number_obscure_factor doesn't fit in 48 bits
-	pub(super) fn set_commitment_obscure_factor(&mut self, commitment_transaction_number_obscure_factor: u64) {
-		assert!(commitment_transaction_number_obscure_factor < (1 << 48));
-		self.commitment_transaction_number_obscure_factor = commitment_transaction_number_obscure_factor;
-	}
-
 	/// Allows this monitor to scan only for transactions which are applicable. Note that this is
 	/// optional, without it this monitor cannot be used in an SPV client, but you may wish to
 	/// avoid this (or call unset_funding_info) on a monitor you wish to send to a watchtower as it
@@ -1070,13 +1068,15 @@ impl ChannelMonitor {
 	}
 
 	/// We log these base keys at channel opening to being able to rebuild redeemscript in case of leaked revoked commit tx
-	pub(super) fn set_their_base_keys(&mut self, their_htlc_base_key: &PublicKey, their_delayed_payment_base_key: &PublicKey) {
+	/// Panics if commitment_transaction_number_obscure_factor doesn't fit in 48 bits
+	pub(super) fn set_basic_channel_info(&mut self, their_htlc_base_key: &PublicKey, their_delayed_payment_base_key: &PublicKey, their_to_self_delay: u16, funding_redeemscript: Script, channel_value_satoshis: u64, commitment_transaction_number_obscure_factor: u64) {
 		self.their_htlc_base_key = Some(their_htlc_base_key.clone());
 		self.their_delayed_payment_base_key = Some(their_delayed_payment_base_key.clone());
-	}
-
-	pub(super) fn set_their_to_self_delay(&mut self, their_to_self_delay: u16) {
 		self.their_to_self_delay = Some(their_to_self_delay);
+		self.funding_redeemscript = Some(funding_redeemscript);
+		self.channel_value_satoshis = Some(channel_value_satoshis);
+		assert!(commitment_transaction_number_obscure_factor < (1 << 48));
+		self.commitment_transaction_number_obscure_factor = commitment_transaction_number_obscure_factor;
 	}
 
 	pub(super) fn unset_funding_info(&mut self) {
@@ -1142,15 +1142,14 @@ impl ChannelMonitor {
 		}
 
 		match self.key_storage {
-			Storage::Local { ref revocation_base_key, ref htlc_base_key, ref delayed_payment_base_key, ref payment_base_key, ref shutdown_pubkey, ref prev_latest_per_commitment_point, ref latest_per_commitment_point, ref funding_info, ref current_remote_commitment_txid, ref prev_remote_commitment_txid } => {
+			Storage::Local { ref funding_key, ref revocation_base_key, ref htlc_base_key, ref delayed_payment_base_key, ref payment_base_key, ref shutdown_pubkey, ref funding_info, ref current_remote_commitment_txid, ref prev_remote_commitment_txid } => {
 				writer.write_all(&[0; 1])?;
+				writer.write_all(&funding_key[..])?;
 				writer.write_all(&revocation_base_key[..])?;
 				writer.write_all(&htlc_base_key[..])?;
 				writer.write_all(&delayed_payment_base_key[..])?;
 				writer.write_all(&payment_base_key[..])?;
 				writer.write_all(&shutdown_pubkey.serialize())?;
-				prev_latest_per_commitment_point.write(writer)?;
-				latest_per_commitment_point.write(writer)?;
 				match funding_info  {
 					&Some((ref outpoint, ref script)) => {
 						writer.write_all(&outpoint.txid[..])?;
@@ -1169,6 +1168,8 @@ impl ChannelMonitor {
 
 		writer.write_all(&self.their_htlc_base_key.as_ref().unwrap().serialize())?;
 		writer.write_all(&self.their_delayed_payment_base_key.as_ref().unwrap().serialize())?;
+		self.funding_redeemscript.as_ref().unwrap().write(writer)?;
+		self.channel_value_satoshis.unwrap().write(writer)?;
 
 		match self.their_cur_revocation_points {
 			Some((idx, pubkey, second_option)) => {
@@ -1238,26 +1239,20 @@ impl ChannelMonitor {
 
 		macro_rules! serialize_local_tx {
 			($local_tx: expr) => {
-				if let Err(e) = $local_tx.tx.consensus_encode(&mut WriterWriteAdaptor(writer)) {
-					match e {
-						encode::Error::Io(e) => return Err(e),
-						_ => panic!("local tx must have been well-formed!"),
-					}
-				}
-
+				$local_tx.tx.write(writer)?;
 				writer.write_all(&$local_tx.revocation_key.serialize())?;
 				writer.write_all(&$local_tx.a_htlc_key.serialize())?;
 				writer.write_all(&$local_tx.b_htlc_key.serialize())?;
 				writer.write_all(&$local_tx.delayed_payment_key.serialize())?;
+				writer.write_all(&$local_tx.per_commitment_point.serialize())?;
 
 				writer.write_all(&byte_utils::be64_to_array($local_tx.feerate_per_kw))?;
 				writer.write_all(&byte_utils::be64_to_array($local_tx.htlc_outputs.len() as u64))?;
-				for &(ref htlc_output, ref sigs, ref htlc_source) in $local_tx.htlc_outputs.iter() {
+				for &(ref htlc_output, ref sig, ref htlc_source) in $local_tx.htlc_outputs.iter() {
 					serialize_htlc_in_commitment!(htlc_output);
-					if let &Some((ref their_sig, ref our_sig)) = sigs {
+					if let &Some(ref their_sig) = sig {
 						1u8.write(writer)?;
 						writer.write_all(&their_sig.serialize_compact())?;
-						writer.write_all(&our_sig.serialize_compact())?;
 					} else {
 						0u8.write(writer)?;
 					}
@@ -1391,7 +1386,7 @@ impl ChannelMonitor {
 
 	pub(super) fn get_cur_local_commitment_number(&self) -> u64 {
 		if let &Some(ref local_tx) = &self.current_local_signed_commitment_tx {
-			0xffff_ffff_ffff - ((((local_tx.tx.input[0].sequence as u64 & 0xffffff) << 3*8) | (local_tx.tx.lock_time as u64 & 0xffffff)) ^ self.commitment_transaction_number_obscure_factor)
+			0xffff_ffff_ffff - ((((local_tx.tx.without_valid_witness().input[0].sequence as u64 & 0xffffff) << 3*8) | (local_tx.tx.without_valid_witness().lock_time as u64 & 0xffffff)) ^ self.commitment_transaction_number_obscure_factor)
 		} else { 0xffff_ffff_ffff }
 	}
 
@@ -1977,6 +1972,7 @@ impl ChannelMonitor {
 
 	/// Attempts to claim a remote HTLC-Success/HTLC-Timeout's outputs using the revocation key
 	fn check_spend_remote_htlc(&mut self, tx: &Transaction, commitment_number: u64, height: u32, fee_estimator: &FeeEstimator) -> (Option<Transaction>, Option<SpendableOutputDescriptor>) {
+		//TODO: send back new outputs to guarantee pending_claim_request consistency
 		if tx.input.len() != 1 || tx.output.len() != 1 {
 			return (None, None)
 		}
@@ -2079,7 +2075,7 @@ impl ChannelMonitor {
 		} else { (None, None) }
 	}
 
-	fn broadcast_by_local_state(&self, local_tx: &LocalSignedTx, per_commitment_point: &Option<PublicKey>, delayed_payment_base_key: &Option<SecretKey>, height: u32) -> (Vec<Transaction>, Vec<SpendableOutputDescriptor>, Vec<TxOut>, Vec<(Sha256dHash, ClaimTxBumpMaterial)>) {
+	fn broadcast_by_local_state(&self, local_tx: &LocalSignedTx, delayed_payment_base_key: &SecretKey, height: u32) -> (Vec<Transaction>, Vec<SpendableOutputDescriptor>, Vec<TxOut>, Vec<(Sha256dHash, ClaimTxBumpMaterial)>) {
 		let mut res = Vec::with_capacity(local_tx.htlc_outputs.len());
 		let mut spendable_outputs = Vec::with_capacity(local_tx.htlc_outputs.len());
 		let mut watch_outputs = Vec::with_capacity(local_tx.htlc_outputs.len());
@@ -2087,85 +2083,71 @@ impl ChannelMonitor {
 
 		macro_rules! add_dynamic_output {
 			($father_tx: expr, $vout: expr) => {
-				if let Some(ref per_commitment_point) = *per_commitment_point {
-					if let Some(ref delayed_payment_base_key) = *delayed_payment_base_key {
-						if let Ok(local_delayedkey) = chan_utils::derive_private_key(&self.secp_ctx, per_commitment_point, delayed_payment_base_key) {
-							spendable_outputs.push(SpendableOutputDescriptor::DynamicOutputP2WSH {
-								outpoint: BitcoinOutPoint { txid: $father_tx.txid(), vout: $vout },
-								key: local_delayedkey,
-								witness_script: chan_utils::get_revokeable_redeemscript(&local_tx.revocation_key, self.our_to_self_delay, &local_tx.delayed_payment_key),
-								to_self_delay: self.our_to_self_delay,
-								output: $father_tx.output[$vout as usize].clone(),
-							});
-						}
-					}
+				if let Ok(local_delayedkey) = chan_utils::derive_private_key(&self.secp_ctx, &local_tx.per_commitment_point, delayed_payment_base_key) {
+					spendable_outputs.push(SpendableOutputDescriptor::DynamicOutputP2WSH {
+						outpoint: BitcoinOutPoint { txid: $father_tx.txid(), vout: $vout },
+						key: local_delayedkey,
+						witness_script: chan_utils::get_revokeable_redeemscript(&local_tx.revocation_key, self.our_to_self_delay, &local_tx.delayed_payment_key),
+						to_self_delay: self.our_to_self_delay,
+						output: $father_tx.output[$vout as usize].clone(),
+					});
 				}
 			}
 		}
 
 		let redeemscript = chan_utils::get_revokeable_redeemscript(&local_tx.revocation_key, self.their_to_self_delay.unwrap(), &local_tx.delayed_payment_key);
 		let revokeable_p2wsh = redeemscript.to_v0_p2wsh();
-		for (idx, output) in local_tx.tx.output.iter().enumerate() {
+		for (idx, output) in local_tx.tx.without_valid_witness().output.iter().enumerate() {
 			if output.script_pubkey == revokeable_p2wsh {
-				add_dynamic_output!(local_tx.tx, idx as u32);
+				add_dynamic_output!(local_tx.tx.without_valid_witness(), idx as u32);
 				break;
 			}
 		}
 
-		for &(ref htlc, ref sigs, _) in local_tx.htlc_outputs.iter() {
-			if let Some(transaction_output_index) = htlc.transaction_output_index {
-				if let &Some((ref their_sig, ref our_sig)) = sigs {
-					if htlc.offered {
-						log_trace!(self, "Broadcasting HTLC-Timeout transaction against local commitment transactions");
-						let mut htlc_timeout_tx = chan_utils::build_htlc_transaction(&local_tx.txid, local_tx.feerate_per_kw, self.their_to_self_delay.unwrap(), htlc, &local_tx.delayed_payment_key, &local_tx.revocation_key);
-
-						htlc_timeout_tx.input[0].witness.push(Vec::new()); // First is the multisig dummy
-
-						htlc_timeout_tx.input[0].witness.push(their_sig.serialize_der().to_vec());
-						htlc_timeout_tx.input[0].witness[1].push(SigHashType::All as u8);
-						htlc_timeout_tx.input[0].witness.push(our_sig.serialize_der().to_vec());
-						htlc_timeout_tx.input[0].witness[2].push(SigHashType::All as u8);
-
-						htlc_timeout_tx.input[0].witness.push(Vec::new());
-						let htlc_script = chan_utils::get_htlc_redeemscript_with_explicit_keys(htlc, &local_tx.a_htlc_key, &local_tx.b_htlc_key, &local_tx.revocation_key);
-						htlc_timeout_tx.input[0].witness.push(htlc_script.clone().into_bytes());
-
-						add_dynamic_output!(htlc_timeout_tx, 0);
-						let height_timer = Self::get_height_timer(height, htlc.cltv_expiry);
-						let mut per_input_material = HashMap::with_capacity(1);
-						per_input_material.insert(htlc_timeout_tx.input[0].previous_output, InputMaterial::LocalHTLC { script: htlc_script, sigs: (*their_sig, *our_sig), preimage: None, amount: htlc.amount_msat / 1000});
-						//TODO: with option_simplified_commitment track outpoint too
-						log_trace!(self, "Outpoint {}:{} is being being claimed, if it doesn't succeed, a bumped claiming txn is going to be broadcast at height {}", htlc_timeout_tx.input[0].previous_output.vout, htlc_timeout_tx.input[0].previous_output.txid, height_timer);
-						pending_claims.push((htlc_timeout_tx.txid(), ClaimTxBumpMaterial { height_timer, feerate_previous: 0, soonest_timelock: htlc.cltv_expiry, per_input_material }));
-						res.push(htlc_timeout_tx);
-					} else {
-						if let Some(payment_preimage) = self.payment_preimages.get(&htlc.payment_hash) {
-							log_trace!(self, "Broadcasting HTLC-Success transaction against local commitment transactions");
-							let mut htlc_success_tx = chan_utils::build_htlc_transaction(&local_tx.txid, local_tx.feerate_per_kw, self.their_to_self_delay.unwrap(), htlc, &local_tx.delayed_payment_key, &local_tx.revocation_key);
-
-							htlc_success_tx.input[0].witness.push(Vec::new()); // First is the multisig dummy
-
-							htlc_success_tx.input[0].witness.push(their_sig.serialize_der().to_vec());
-							htlc_success_tx.input[0].witness[1].push(SigHashType::All as u8);
-							htlc_success_tx.input[0].witness.push(our_sig.serialize_der().to_vec());
-							htlc_success_tx.input[0].witness[2].push(SigHashType::All as u8);
-
-							htlc_success_tx.input[0].witness.push(payment_preimage.0.to_vec());
-							let htlc_script = chan_utils::get_htlc_redeemscript_with_explicit_keys(htlc, &local_tx.a_htlc_key, &local_tx.b_htlc_key, &local_tx.revocation_key);
-							htlc_success_tx.input[0].witness.push(htlc_script.clone().into_bytes());
+		if let &Storage::Local { ref htlc_base_key, .. } = &self.key_storage {
+			for &(ref htlc, ref sigs, _) in local_tx.htlc_outputs.iter() {
+				if let Some(transaction_output_index) = htlc.transaction_output_index {
+					if let &Some(ref their_sig) = sigs {
+						if htlc.offered {
+							log_trace!(self, "Broadcasting HTLC-Timeout transaction against local commitment transactions");
+							let mut htlc_timeout_tx = chan_utils::build_htlc_transaction(&local_tx.txid, local_tx.feerate_per_kw, self.their_to_self_delay.unwrap(), htlc, &local_tx.delayed_payment_key, &local_tx.revocation_key);
+							let (our_sig, htlc_script) = match
+									chan_utils::sign_htlc_transaction(&mut htlc_timeout_tx, their_sig, &None, htlc, &local_tx.a_htlc_key, &local_tx.b_htlc_key, &local_tx.revocation_key, &local_tx.per_commitment_point, htlc_base_key, &self.secp_ctx) {
+								Ok(res) => res,
+								Err(_) => continue,
+							};
 
-							add_dynamic_output!(htlc_success_tx, 0);
+							add_dynamic_output!(htlc_timeout_tx, 0);
 							let height_timer = Self::get_height_timer(height, htlc.cltv_expiry);
 							let mut per_input_material = HashMap::with_capacity(1);
-							per_input_material.insert(htlc_success_tx.input[0].previous_output, InputMaterial::LocalHTLC { script: htlc_script, sigs: (*their_sig, *our_sig), preimage: Some(*payment_preimage), amount: htlc.amount_msat / 1000});
+							per_input_material.insert(htlc_timeout_tx.input[0].previous_output, InputMaterial::LocalHTLC { script: htlc_script, sigs: (*their_sig, our_sig), preimage: None, amount: htlc.amount_msat / 1000});
 							//TODO: with option_simplified_commitment track outpoint too
-							log_trace!(self, "Outpoint {}:{} is being being claimed, if it doesn't succeed, a bumped claiming txn is going to be broadcast at height {}", htlc_success_tx.input[0].previous_output.vout, htlc_success_tx.input[0].previous_output.txid, height_timer);
-							pending_claims.push((htlc_success_tx.txid(), ClaimTxBumpMaterial { height_timer, feerate_previous: 0, soonest_timelock: htlc.cltv_expiry, per_input_material }));
-							res.push(htlc_success_tx);
+							log_trace!(self, "Outpoint {}:{} is being being claimed, if it doesn't succeed, a bumped claiming txn is going to be broadcast at height {}", htlc_timeout_tx.input[0].previous_output.vout, htlc_timeout_tx.input[0].previous_output.txid, height_timer);
+							pending_claims.push((htlc_timeout_tx.txid(), ClaimTxBumpMaterial { height_timer, feerate_previous: 0, soonest_timelock: htlc.cltv_expiry, per_input_material }));
+							res.push(htlc_timeout_tx);
+						} else {
+							if let Some(payment_preimage) = self.payment_preimages.get(&htlc.payment_hash) {
+								log_trace!(self, "Broadcasting HTLC-Success transaction against local commitment transactions");
+								let mut htlc_success_tx = chan_utils::build_htlc_transaction(&local_tx.txid, local_tx.feerate_per_kw, self.their_to_self_delay.unwrap(), htlc, &local_tx.delayed_payment_key, &local_tx.revocation_key);
+								let (our_sig, htlc_script) = match
+										chan_utils::sign_htlc_transaction(&mut htlc_success_tx, their_sig, &Some(*payment_preimage), htlc, &local_tx.a_htlc_key, &local_tx.b_htlc_key, &local_tx.revocation_key, &local_tx.per_commitment_point, htlc_base_key, &self.secp_ctx) {
+									Ok(res) => res,
+									Err(_) => continue,
+								};
+
+								add_dynamic_output!(htlc_success_tx, 0);
+								let height_timer = Self::get_height_timer(height, htlc.cltv_expiry);
+								let mut per_input_material = HashMap::with_capacity(1);
+								per_input_material.insert(htlc_success_tx.input[0].previous_output, InputMaterial::LocalHTLC { script: htlc_script, sigs: (*their_sig, our_sig), preimage: Some(*payment_preimage), amount: htlc.amount_msat / 1000});
+								//TODO: with option_simplified_commitment track outpoint too
+								log_trace!(self, "Outpoint {}:{} is being being claimed, if it doesn't succeed, a bumped claiming txn is going to be broadcast at height {}", htlc_success_tx.input[0].previous_output.vout, htlc_success_tx.input[0].previous_output.txid, height_timer);
+								pending_claims.push((htlc_success_tx.txid(), ClaimTxBumpMaterial { height_timer, feerate_previous: 0, soonest_timelock: htlc.cltv_expiry, per_input_material }));
+								res.push(htlc_success_tx);
+							}
 						}
-					}
-					watch_outputs.push(local_tx.tx.output[transaction_output_index as usize].clone());
-				} else { panic!("Should have sigs for non-dust local tx outputs!") }
+						watch_outputs.push(local_tx.tx.without_valid_witness().output[transaction_output_index as usize].clone());
+					} else { panic!("Should have sigs for non-dust local tx outputs!") }
+				}
 			}
 		}
 
@@ -2221,17 +2203,36 @@ impl ChannelMonitor {
 		// HTLCs set may differ between last and previous local commitment txn, in case of one them hitting chain, ensure we cancel all HTLCs backward
 		let mut is_local_tx = false;
 
+		if let &mut Some(ref mut local_tx) = &mut self.current_local_signed_commitment_tx {
+			if local_tx.txid == commitment_txid {
+				match self.key_storage {
+					Storage::Local { ref funding_key, .. } => {
+						local_tx.tx.add_local_sig(funding_key, self.funding_redeemscript.as_ref().unwrap(), self.channel_value_satoshis.unwrap(), &self.secp_ctx);
+					},
+					_ => {},
+				}
+			}
+		}
 		if let &Some(ref local_tx) = &self.current_local_signed_commitment_tx {
 			if local_tx.txid == commitment_txid {
 				is_local_tx = true;
 				log_trace!(self, "Got latest local commitment tx broadcast, searching for available HTLCs to claim");
+				assert!(local_tx.tx.has_local_sig());
 				match self.key_storage {
-					Storage::Local { ref delayed_payment_base_key, ref latest_per_commitment_point, .. } => {
-						append_onchain_update!(self.broadcast_by_local_state(local_tx, latest_per_commitment_point, &Some(*delayed_payment_base_key), height));
+					Storage::Local { ref delayed_payment_base_key, .. } => {
+						append_onchain_update!(self.broadcast_by_local_state(local_tx, delayed_payment_base_key, height));
 					},
-					Storage::Watchtower { .. } => {
-						append_onchain_update!(self.broadcast_by_local_state(local_tx, &None, &None, height));
-					}
+					Storage::Watchtower { .. } => { }
+				}
+			}
+		}
+		if let &mut Some(ref mut local_tx) = &mut self.prev_local_signed_commitment_tx {
+			if local_tx.txid == commitment_txid {
+				match self.key_storage {
+					Storage::Local { ref funding_key, .. } => {
+						local_tx.tx.add_local_sig(funding_key, self.funding_redeemscript.as_ref().unwrap(), self.channel_value_satoshis.unwrap(), &self.secp_ctx);
+					},
+					_ => {},
 				}
 			}
 		}
@@ -2239,13 +2240,12 @@ impl ChannelMonitor {
 			if local_tx.txid == commitment_txid {
 				is_local_tx = true;
 				log_trace!(self, "Got previous local commitment tx broadcast, searching for available HTLCs to claim");
+				assert!(local_tx.tx.has_local_sig());
 				match self.key_storage {
-					Storage::Local { ref delayed_payment_base_key, ref prev_latest_per_commitment_point, .. } => {
-						append_onchain_update!(self.broadcast_by_local_state(local_tx, prev_latest_per_commitment_point, &Some(*delayed_payment_base_key), height));
+					Storage::Local { ref delayed_payment_base_key, .. } => {
+						append_onchain_update!(self.broadcast_by_local_state(local_tx, delayed_payment_base_key, height));
 					},
-					Storage::Watchtower { .. } => {
-						append_onchain_update!(self.broadcast_by_local_state(local_tx, &None, &None, height));
-					}
+					Storage::Watchtower { .. } => { }
 				}
 			}
 		}
@@ -2308,12 +2308,21 @@ impl ChannelMonitor {
 	/// substantial amount of time (a month or even a year) to get back funds. Best may be to contact
 	/// out-of-band the other node operator to coordinate with him if option is available to you.
 	/// In any-case, choice is up to the user.
-	pub fn get_latest_local_commitment_txn(&self) -> Vec<Transaction> {
+	pub fn get_latest_local_commitment_txn(&mut self) -> Vec<Transaction> {
+		log_trace!(self, "Getting signed latest local commitment transaction!");
+		if let &mut Some(ref mut local_tx) = &mut self.current_local_signed_commitment_tx {
+			match self.key_storage {
+				Storage::Local { ref funding_key, .. } => {
+					local_tx.tx.add_local_sig(funding_key, self.funding_redeemscript.as_ref().unwrap(), self.channel_value_satoshis.unwrap(), &self.secp_ctx);
+				},
+				_ => {},
+			}
+		}
 		if let &Some(ref local_tx) = &self.current_local_signed_commitment_tx {
-			let mut res = vec![local_tx.tx.clone()];
+			let mut res = vec![local_tx.tx.with_valid_witness().clone()];
 			match self.key_storage {
-				Storage::Local { ref delayed_payment_base_key, ref prev_latest_per_commitment_point, .. } => {
-					res.append(&mut self.broadcast_by_local_state(local_tx, prev_latest_per_commitment_point, &Some(*delayed_payment_base_key), 0).0);
+				Storage::Local { ref delayed_payment_base_key, .. } => {
+					res.append(&mut self.broadcast_by_local_state(local_tx, delayed_payment_base_key, 0).0);
 					// We throw away the generated waiting_first_conf data as we aren't (yet) confirmed and we don't actually know what the caller wants to do.
 					// The data will be re-generated and tracked in check_spend_local_transaction if we get a confirmation.
 				},
@@ -2326,10 +2335,11 @@ impl ChannelMonitor {
 	}
 
 	fn block_connected(&mut self, txn_matched: &[&Transaction], height: u32, block_hash: &Sha256dHash, broadcaster: &BroadcasterInterface, fee_estimator: &FeeEstimator)-> (Vec<(Sha256dHash, Vec<TxOut>)>, Vec<SpendableOutputDescriptor>, Vec<(HTLCSource, Option<PaymentPreimage>, PaymentHash)>) {
+		log_trace!(self, "Block {} at height {} connected with {} txn matched", block_hash, height, txn_matched.len());
 		let mut watch_outputs = Vec::new();
 		let mut spendable_outputs = Vec::new();
 		let mut htlc_updated = Vec::new();
-		let mut bump_candidates = Vec::new();
+		let mut bump_candidates = HashSet::new();
 		for tx in txn_matched {
 			if tx.input.len() == 1 {
 				// Assuming our keys were not leaked (in which case we're screwed no matter what),
@@ -2393,37 +2403,58 @@ impl ChannelMonitor {
 			}
 
 			// Scan all input to verify is one of the outpoint spent is of interest for us
-			let mut claimed_outpoints = Vec::new();
-			let mut claimed_input_material = Vec::new();
+			let mut claimed_outputs_material = Vec::new();
 			for inp in &tx.input {
-				if let Some(ancestor_claimable_txid) = self.claimable_outpoints.get(&inp.previous_output) {
+				if let Some(first_claim_txid_height) = self.claimable_outpoints.get(&inp.previous_output) {
 					// If outpoint has claim request pending on it...
-					if let Some(claim_material) = self.pending_claim_requests.get_mut(&ancestor_claimable_txid.0) {
+					if let Some(claim_material) = self.pending_claim_requests.get_mut(&first_claim_txid_height.0) {
 						//... we need to verify equality between transaction outpoints and claim request
 						// outpoints to know if transaction is the original claim or a bumped one issued
 						// by us.
-						for claim_inp in claim_material.per_input_material.keys() {
-							if *claim_inp == inp.previous_output {
-								claimed_outpoints.push(inp.previous_output.clone());
+						let mut set_equality = true;
+						if claim_material.per_input_material.len() != tx.input.len() {
+							set_equality = false;
+						} else {
+							for (claim_inp, tx_inp) in claim_material.per_input_material.keys().zip(tx.input.iter()) {
+								if *claim_inp != tx_inp.previous_output {
+									set_equality = false;
+								}
 							}
 						}
-						if claimed_outpoints.len() == 0 && claim_material.per_input_material.len() == tx.input.len() { // If true, register claim request to be removed after reaching a block security height
-							match self.onchain_events_waiting_threshold_conf.entry(height + ANTI_REORG_DELAY - 1) {
-								hash_map::Entry::Occupied(_) => {},
-								hash_map::Entry::Vacant(entry) => {
-									entry.insert(vec![OnchainEvent::Claim { claim_request: ancestor_claimable_txid.0.clone()}]);
+
+						macro_rules! clean_claim_request_after_safety_delay {
+							() => {
+								let new_event = OnchainEvent::Claim { claim_request: first_claim_txid_height.0.clone() };
+								match self.onchain_events_waiting_threshold_conf.entry(height + ANTI_REORG_DELAY - 1) {
+									hash_map::Entry::Occupied(mut entry) => {
+										if !entry.get().contains(&new_event) {
+											entry.get_mut().push(new_event);
+										}
+									},
+									hash_map::Entry::Vacant(entry) => {
+										entry.insert(vec![new_event]);
+									}
 								}
 							}
+						}
+
+						// If this is our transaction (or our counterparty spent all the outputs
+						// before we could anyway with same inputs order than us), wait for
+						// ANTI_REORG_DELAY and clean the RBF tracking map.
+						if set_equality {
+							clean_claim_request_after_safety_delay!();
 						} else { // If false, generate new claim request with update outpoint set
-							for already_claimed in claimed_outpoints.iter() {
-								if let Some(input_material) = claim_material.per_input_material.remove(&already_claimed) {
-									claimed_input_material.push(input_material);
+							for input in tx.input.iter() {
+								if let Some(input_material) = claim_material.per_input_material.remove(&input.previous_output) {
+									claimed_outputs_material.push((input.previous_output, input_material));
+								}
+								// If there are no outpoints left to claim in this request, drop it entirely after ANTI_REORG_DELAY.
+								if claim_material.per_input_material.is_empty() {
+									clean_claim_request_after_safety_delay!();
 								}
 							}
-							// Avoid bump engine using inaccurate feerate due to new transaction size
-							claim_material.feerate_previous = 0;
 							//TODO: recompute soonest_timelock to avoid wasting a bit on fees
-							bump_candidates.push((ancestor_claimable_txid.0.clone(), claim_material.clone()));
+							bump_candidates.insert(first_claim_txid_height.0.clone());
 						}
 						break; //No need to iterate further, either tx is our or their
 					} else {
@@ -2431,22 +2462,40 @@ impl ChannelMonitor {
 					}
 				}
 			}
-			for (outpoint, input_material) in claimed_outpoints.iter().zip(claimed_input_material.drain(..)) {
+			for (outpoint, input_material) in claimed_outputs_material.drain(..) {
+				let new_event = OnchainEvent::ContentiousOutpoint { outpoint, input_material };
 				match self.onchain_events_waiting_threshold_conf.entry(height + ANTI_REORG_DELAY - 1) {
-					hash_map::Entry::Occupied(_) => {},
+					hash_map::Entry::Occupied(mut entry) => {
+						if !entry.get().contains(&new_event) {
+							entry.get_mut().push(new_event);
+						}
+					},
 					hash_map::Entry::Vacant(entry) => {
-						entry.insert(vec![OnchainEvent::ContentiousOutpoint { outpoint: *outpoint, input_material: input_material }]);
+						entry.insert(vec![new_event]);
 					}
 				}
 			}
 		}
+		let should_broadcast = if let Some(_) = self.current_local_signed_commitment_tx {
+			self.would_broadcast_at_height(height)
+		} else { false };
+		if let Some(ref mut cur_local_tx) = self.current_local_signed_commitment_tx {
+			if should_broadcast {
+				match self.key_storage {
+					Storage::Local { ref funding_key, .. } => {
+						cur_local_tx.tx.add_local_sig(funding_key, self.funding_redeemscript.as_ref().unwrap(), self.channel_value_satoshis.unwrap(), &self.secp_ctx);
+					},
+					_ => {}
+				}
+			}
+		}
 		if let Some(ref cur_local_tx) = self.current_local_signed_commitment_tx {
-			if self.would_broadcast_at_height(height) {
-				log_trace!(self, "Broadcast onchain {}", log_tx!(cur_local_tx.tx));
-				broadcaster.broadcast_transaction(&cur_local_tx.tx);
+			if should_broadcast {
+				log_trace!(self, "Broadcast onchain {}", log_tx!(cur_local_tx.tx.with_valid_witness()));
+				broadcaster.broadcast_transaction(&cur_local_tx.tx.with_valid_witness());
 				match self.key_storage {
-					Storage::Local { ref delayed_payment_base_key, ref latest_per_commitment_point, .. } => {
-						let (txs, mut spendable_output, new_outputs, _) = self.broadcast_by_local_state(&cur_local_tx, latest_per_commitment_point, &Some(*delayed_payment_base_key), height);
+					Storage::Local { ref delayed_payment_base_key, .. } => {
+						let (txs, mut spendable_output, new_outputs, _) = self.broadcast_by_local_state(&cur_local_tx, delayed_payment_base_key, height);
 						spendable_outputs.append(&mut spendable_output);
 						if !new_outputs.is_empty() {
 							watch_outputs.push((cur_local_tx.txid.clone(), new_outputs));
@@ -2456,17 +2505,7 @@ impl ChannelMonitor {
 							broadcaster.broadcast_transaction(&tx);
 						}
 					},
-					Storage::Watchtower { .. } => {
-						let (txs, mut spendable_output, new_outputs, _) = self.broadcast_by_local_state(&cur_local_tx, &None, &None, height);
-						spendable_outputs.append(&mut spendable_output);
-						if !new_outputs.is_empty() {
-							watch_outputs.push((cur_local_tx.txid.clone(), new_outputs));
-						}
-						for tx in txs {
-							log_trace!(self, "Broadcast onchain {}", log_tx!(tx));
-							broadcaster.broadcast_transaction(&tx);
-						}
-					}
+					Storage::Watchtower { .. } => { },
 				}
 			}
 		}
@@ -2474,8 +2513,13 @@ impl ChannelMonitor {
 			for ev in events {
 				match ev {
 					OnchainEvent::Claim { claim_request } => {
-						// We may remove a whole set of claim outpoints here, as these one may have been aggregated in a single tx and claimed so atomically
-						self.pending_claim_requests.remove(&claim_request);
+						// We may remove a whole set of claim outpoints here, as these one may have
+						// been aggregated in a single tx and claimed so atomically
+						if let Some(bump_material) = self.pending_claim_requests.remove(&claim_request) {
+							for outpoint in bump_material.per_input_material.keys() {
+								self.claimable_outpoints.remove(&outpoint);
+							}
+						}
 					},
 					OnchainEvent::HTLCUpdate { htlc_update } => {
 						log_trace!(self, "HTLC {} failure update has got enough confirmations to be passed upstream", log_bytes!((htlc_update.1).0));
@@ -2487,21 +2531,26 @@ impl ChannelMonitor {
 				}
 			}
 		}
-		for (ancestor_claim_txid, ref mut cached_claim_datas) in self.pending_claim_requests.iter_mut() {
+		for (first_claim_txid, ref mut cached_claim_datas) in self.pending_claim_requests.iter_mut() {
 			if cached_claim_datas.height_timer == height {
-				bump_candidates.push((ancestor_claim_txid.clone(), cached_claim_datas.clone()));
+				bump_candidates.insert(first_claim_txid.clone());
 			}
 		}
-		for &mut (_, ref mut cached_claim_datas) in bump_candidates.iter_mut() {
-			if let Some((new_timer, new_feerate, bump_tx)) = self.bump_claim_tx(height, &cached_claim_datas, fee_estimator) {
-				cached_claim_datas.height_timer = new_timer;
-				cached_claim_datas.feerate_previous = new_feerate;
-				broadcaster.broadcast_transaction(&bump_tx);
+		for first_claim_txid in bump_candidates.iter() {
+			if let Some((new_timer, new_feerate)) = {
+				if let Some(claim_material) = self.pending_claim_requests.get(first_claim_txid) {
+					if let Some((new_timer, new_feerate, bump_tx)) = self.bump_claim_tx(height, &claim_material, fee_estimator) {
+						broadcaster.broadcast_transaction(&bump_tx);
+						Some((new_timer, new_feerate))
+					} else { None }
+				} else { unreachable!(); }
+			} {
+				if let Some(claim_material) = self.pending_claim_requests.get_mut(first_claim_txid) {
+					claim_material.height_timer = new_timer;
+					claim_material.feerate_previous = new_feerate;
+				} else { unreachable!(); }
 			}
 		}
-		for (ancestor_claim_txid, cached_claim_datas) in bump_candidates.drain(..) {
-			self.pending_claim_requests.insert(ancestor_claim_txid, cached_claim_datas);
-		}
 		self.last_block_hash = block_hash.clone();
 		(watch_outputs, spendable_outputs, htlc_updated)
 	}
@@ -2518,8 +2567,6 @@ impl ChannelMonitor {
 					OnchainEvent::ContentiousOutpoint { outpoint, input_material } => {
 						if let Some(ancestor_claimable_txid) = self.claimable_outpoints.get(&outpoint) {
 							if let Some(claim_material) = self.pending_claim_requests.get_mut(&ancestor_claimable_txid.0) {
-								// Avoid bump engine using inaccurate feerate due to new transaction size
-								claim_material.feerate_previous = 0;
 								claim_material.per_input_material.insert(outpoint, input_material);
 								// Using a HashMap guarantee us than if we have multiple outpoints getting
 								// resurrected only one bump claim tx is going to be broadcast
@@ -2917,13 +2964,12 @@ impl<R: ::std::io::Read> ReadableArgs<R, Arc<Logger>> for (Sha256dHash, ChannelM
 
 		let key_storage = match <u8 as Readable<R>>::read(reader)? {
 			0 => {
+				let funding_key = Readable::read(reader)?;
 				let revocation_base_key = Readable::read(reader)?;
 				let htlc_base_key = Readable::read(reader)?;
 				let delayed_payment_base_key = Readable::read(reader)?;
 				let payment_base_key = Readable::read(reader)?;
 				let shutdown_pubkey = Readable::read(reader)?;
-				let prev_latest_per_commitment_point = Readable::read(reader)?;
-				let latest_per_commitment_point = Readable::read(reader)?;
 				// Technically this can fail and serialize fail a round-trip, but only for serialization of
 				// barely-init'd ChannelMonitors that we can't do anything with.
 				let outpoint = OutPoint {
@@ -2934,13 +2980,12 @@ impl<R: ::std::io::Read> ReadableArgs<R, Arc<Logger>> for (Sha256dHash, ChannelM
 				let current_remote_commitment_txid = Readable::read(reader)?;
 				let prev_remote_commitment_txid = Readable::read(reader)?;
 				Storage::Local {
+					funding_key,
 					revocation_base_key,
 					htlc_base_key,
 					delayed_payment_base_key,
 					payment_base_key,
 					shutdown_pubkey,
-					prev_latest_per_commitment_point,
-					latest_per_commitment_point,
 					funding_info,
 					current_remote_commitment_txid,
 					prev_remote_commitment_txid,
@@ -2951,6 +2996,8 @@ impl<R: ::std::io::Read> ReadableArgs<R, Arc<Logger>> for (Sha256dHash, ChannelM
 
 		let their_htlc_base_key = Some(Readable::read(reader)?);
 		let their_delayed_payment_base_key = Some(Readable::read(reader)?);
+		let funding_redeemscript = Some(Readable::read(reader)?);
+		let channel_value_satoshis = Some(Readable::read(reader)?);
 
 		let their_cur_revocation_points = {
 			let first_idx = <U48 as Readable<R>>::read(reader)?.0;
@@ -3034,23 +3081,12 @@ impl<R: ::std::io::Read> ReadableArgs<R, Arc<Logger>> for (Sha256dHash, ChannelM
 		macro_rules! read_local_tx {
 			() => {
 				{
-					let tx = match Transaction::consensus_decode(reader.by_ref()) {
-						Ok(tx) => tx,
-						Err(e) => match e {
-							encode::Error::Io(ioe) => return Err(DecodeError::Io(ioe)),
-							_ => return Err(DecodeError::InvalidValue),
-						},
-					};
-
-					if tx.input.is_empty() {
-						// Ensure tx didn't hit the 0-input ambiguity case.
-						return Err(DecodeError::InvalidValue);
-					}
-
+					let tx = <LocalCommitmentTransaction as Readable<R>>::read(reader)?;
 					let revocation_key = Readable::read(reader)?;
 					let a_htlc_key = Readable::read(reader)?;
 					let b_htlc_key = Readable::read(reader)?;
 					let delayed_payment_key = Readable::read(reader)?;
+					let per_commitment_point = Readable::read(reader)?;
 					let feerate_per_kw: u64 = Readable::read(reader)?;
 
 					let htlcs_len: u64 = Readable::read(reader)?;
@@ -3059,7 +3095,7 @@ impl<R: ::std::io::Read> ReadableArgs<R, Arc<Logger>> for (Sha256dHash, ChannelM
 						let htlc = read_htlc_in_commitment!();
 						let sigs = match <u8 as Readable<R>>::read(reader)? {
 							0 => None,
-							1 => Some((Readable::read(reader)?, Readable::read(reader)?)),
+							1 => Some(Readable::read(reader)?),
 							_ => return Err(DecodeError::InvalidValue),
 						};
 						htlcs.push((htlc, sigs, Readable::read(reader)?));
@@ -3067,7 +3103,7 @@ impl<R: ::std::io::Read> ReadableArgs<R, Arc<Logger>> for (Sha256dHash, ChannelM
 
 					LocalSignedTx {
 						txid: tx.txid(),
-						tx, revocation_key, a_htlc_key, b_htlc_key, delayed_payment_key, feerate_per_kw,
+						tx, revocation_key, a_htlc_key, b_htlc_key, delayed_payment_key, per_commitment_point, feerate_per_kw,
 						htlc_outputs: htlcs
 					}
 				}
@@ -3171,6 +3207,8 @@ impl<R: ::std::io::Read> ReadableArgs<R, Arc<Logger>> for (Sha256dHash, ChannelM
 			key_storage,
 			their_htlc_base_key,
 			their_delayed_payment_base_key,
+			funding_redeemscript,
+			channel_value_satoshis,
 			their_cur_revocation_points,
 
 			our_to_self_delay,
@@ -3219,7 +3257,7 @@ mod tests {
 	use ln::channelmanager::{PaymentPreimage, PaymentHash};
 	use ln::channelmonitor::{ChannelMonitor, InputDescriptors};
 	use ln::chan_utils;
-	use ln::chan_utils::{HTLCOutputInCommitment, TxCreationKeys};
+	use ln::chan_utils::{HTLCOutputInCommitment, TxCreationKeys, LocalCommitmentTransaction};
 	use util::test_utils::TestLogger;
 	use secp256k1::key::{SecretKey,PublicKey};
 	use secp256k1::Secp256k1;
@@ -3248,7 +3286,7 @@ mod tests {
 
 		{
 			// insert_secret correct sequence
-			monitor = ChannelMonitor::new(&SecretKey::from_slice(&[42; 32]).unwrap(), &SecretKey::from_slice(&[43; 32]).unwrap(), &SecretKey::from_slice(&[44; 32]).unwrap(), &SecretKey::from_slice(&[44; 32]).unwrap(), &PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[45; 32]).unwrap()), 0, Script::new(), logger.clone());
+			monitor = ChannelMonitor::new(&SecretKey::from_slice(&[41; 32]).unwrap(), &SecretKey::from_slice(&[42; 32]).unwrap(), &SecretKey::from_slice(&[43; 32]).unwrap(), &SecretKey::from_slice(&[44; 32]).unwrap(), &SecretKey::from_slice(&[44; 32]).unwrap(), &PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[45; 32]).unwrap()), 0, Script::new(), logger.clone());
 			secrets.clear();
 
 			secrets.push([0; 32]);
@@ -3294,7 +3332,7 @@ mod tests {
 
 		{
 			// insert_secret #1 incorrect
-			monitor = ChannelMonitor::new(&SecretKey::from_slice(&[42; 32]).unwrap(), &SecretKey::from_slice(&[43; 32]).unwrap(), &SecretKey::from_slice(&[44; 32]).unwrap(), &SecretKey::from_slice(&[44; 32]).unwrap(), &PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[45; 32]).unwrap()), 0, Script::new(), logger.clone());
+			monitor = ChannelMonitor::new(&SecretKey::from_slice(&[41; 32]).unwrap(), &SecretKey::from_slice(&[42; 32]).unwrap(), &SecretKey::from_slice(&[43; 32]).unwrap(), &SecretKey::from_slice(&[44; 32]).unwrap(), &SecretKey::from_slice(&[44; 32]).unwrap(), &PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[45; 32]).unwrap()), 0, Script::new(), logger.clone());
 			secrets.clear();
 
 			secrets.push([0; 32]);
@@ -3310,7 +3348,7 @@ mod tests {
 
 		{
 			// insert_secret #2 incorrect (#1 derived from incorrect)
-			monitor = ChannelMonitor::new(&SecretKey::from_slice(&[42; 32]).unwrap(), &SecretKey::from_slice(&[43; 32]).unwrap(), &SecretKey::from_slice(&[44; 32]).unwrap(), &SecretKey::from_slice(&[44; 32]).unwrap(), &PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[45; 32]).unwrap()), 0, Script::new(), logger.clone());
+			monitor = ChannelMonitor::new(&SecretKey::from_slice(&[41; 32]).unwrap(), &SecretKey::from_slice(&[42; 32]).unwrap(), &SecretKey::from_slice(&[43; 32]).unwrap(), &SecretKey::from_slice(&[44; 32]).unwrap(), &SecretKey::from_slice(&[44; 32]).unwrap(), &PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[45; 32]).unwrap()), 0, Script::new(), logger.clone());
 			secrets.clear();
 
 			secrets.push([0; 32]);
@@ -3336,7 +3374,7 @@ mod tests {
 
 		{
 			// insert_secret #3 incorrect
-			monitor = ChannelMonitor::new(&SecretKey::from_slice(&[42; 32]).unwrap(), &SecretKey::from_slice(&[43; 32]).unwrap(), &SecretKey::from_slice(&[44; 32]).unwrap(), &SecretKey::from_slice(&[44; 32]).unwrap(), &PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[45; 32]).unwrap()), 0, Script::new(), logger.clone());
+			monitor = ChannelMonitor::new(&SecretKey::from_slice(&[41; 32]).unwrap(), &SecretKey::from_slice(&[42; 32]).unwrap(), &SecretKey::from_slice(&[43; 32]).unwrap(), &SecretKey::from_slice(&[44; 32]).unwrap(), &SecretKey::from_slice(&[44; 32]).unwrap(), &PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[45; 32]).unwrap()), 0, Script::new(), logger.clone());
 			secrets.clear();
 
 			secrets.push([0; 32]);
@@ -3362,7 +3400,7 @@ mod tests {
 
 		{
 			// insert_secret #4 incorrect (1,2,3 derived from incorrect)
-			monitor = ChannelMonitor::new(&SecretKey::from_slice(&[42; 32]).unwrap(), &SecretKey::from_slice(&[43; 32]).unwrap(), &SecretKey::from_slice(&[44; 32]).unwrap(), &SecretKey::from_slice(&[44; 32]).unwrap(), &PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[45; 32]).unwrap()), 0, Script::new(), logger.clone());
+			monitor = ChannelMonitor::new(&SecretKey::from_slice(&[41; 32]).unwrap(), &SecretKey::from_slice(&[42; 32]).unwrap(), &SecretKey::from_slice(&[43; 32]).unwrap(), &SecretKey::from_slice(&[44; 32]).unwrap(), &SecretKey::from_slice(&[44; 32]).unwrap(), &PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[45; 32]).unwrap()), 0, Script::new(), logger.clone());
 			secrets.clear();
 
 			secrets.push([0; 32]);
@@ -3408,7 +3446,7 @@ mod tests {
 
 		{
 			// insert_secret #5 incorrect
-			monitor = ChannelMonitor::new(&SecretKey::from_slice(&[42; 32]).unwrap(), &SecretKey::from_slice(&[43; 32]).unwrap(), &SecretKey::from_slice(&[44; 32]).unwrap(), &SecretKey::from_slice(&[44; 32]).unwrap(), &PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[45; 32]).unwrap()), 0, Script::new(), logger.clone());
+			monitor = ChannelMonitor::new(&SecretKey::from_slice(&[41; 32]).unwrap(), &SecretKey::from_slice(&[42; 32]).unwrap(), &SecretKey::from_slice(&[43; 32]).unwrap(), &SecretKey::from_slice(&[44; 32]).unwrap(), &SecretKey::from_slice(&[44; 32]).unwrap(), &PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[45; 32]).unwrap()), 0, Script::new(), logger.clone());
 			secrets.clear();
 
 			secrets.push([0; 32]);
@@ -3444,7 +3482,7 @@ mod tests {
 
 		{
 			// insert_secret #6 incorrect (5 derived from incorrect)
-			monitor = ChannelMonitor::new(&SecretKey::from_slice(&[42; 32]).unwrap(), &SecretKey::from_slice(&[43; 32]).unwrap(), &SecretKey::from_slice(&[44; 32]).unwrap(), &SecretKey::from_slice(&[44; 32]).unwrap(), &PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[45; 32]).unwrap()), 0, Script::new(), logger.clone());
+			monitor = ChannelMonitor::new(&SecretKey::from_slice(&[41; 32]).unwrap(), &SecretKey::from_slice(&[42; 32]).unwrap(), &SecretKey::from_slice(&[43; 32]).unwrap(), &SecretKey::from_slice(&[44; 32]).unwrap(), &SecretKey::from_slice(&[44; 32]).unwrap(), &PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[45; 32]).unwrap()), 0, Script::new(), logger.clone());
 			secrets.clear();
 
 			secrets.push([0; 32]);
@@ -3490,7 +3528,7 @@ mod tests {
 
 		{
 			// insert_secret #7 incorrect
-			monitor = ChannelMonitor::new(&SecretKey::from_slice(&[42; 32]).unwrap(), &SecretKey::from_slice(&[43; 32]).unwrap(), &SecretKey::from_slice(&[44; 32]).unwrap(), &SecretKey::from_slice(&[44; 32]).unwrap(), &PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[45; 32]).unwrap()), 0, Script::new(), logger.clone());
+			monitor = ChannelMonitor::new(&SecretKey::from_slice(&[41; 32]).unwrap(), &SecretKey::from_slice(&[42; 32]).unwrap(), &SecretKey::from_slice(&[43; 32]).unwrap(), &SecretKey::from_slice(&[44; 32]).unwrap(), &SecretKey::from_slice(&[44; 32]).unwrap(), &PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[45; 32]).unwrap()), 0, Script::new(), logger.clone());
 			secrets.clear();
 
 			secrets.push([0; 32]);
@@ -3536,7 +3574,7 @@ mod tests {
 
 		{
 			// insert_secret #8 incorrect
-			monitor = ChannelMonitor::new(&SecretKey::from_slice(&[42; 32]).unwrap(), &SecretKey::from_slice(&[43; 32]).unwrap(), &SecretKey::from_slice(&[44; 32]).unwrap(), &SecretKey::from_slice(&[44; 32]).unwrap(), &PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[45; 32]).unwrap()), 0, Script::new(), logger.clone());
+			monitor = ChannelMonitor::new(&SecretKey::from_slice(&[41; 32]).unwrap(), &SecretKey::from_slice(&[42; 32]).unwrap(), &SecretKey::from_slice(&[43; 32]).unwrap(), &SecretKey::from_slice(&[44; 32]).unwrap(), &SecretKey::from_slice(&[44; 32]).unwrap(), &PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[45; 32]).unwrap()), 0, Script::new(), logger.clone());
 			secrets.clear();
 
 			secrets.push([0; 32]);
@@ -3651,10 +3689,10 @@ mod tests {
 
 		// Prune with one old state and a local commitment tx holding a few overlaps with the
 		// old state.
-		let mut monitor = ChannelMonitor::new(&SecretKey::from_slice(&[42; 32]).unwrap(), &SecretKey::from_slice(&[43; 32]).unwrap(), &SecretKey::from_slice(&[44; 32]).unwrap(), &SecretKey::from_slice(&[44; 32]).unwrap(), &PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[45; 32]).unwrap()), 0, Script::new(), logger.clone());
-		monitor.set_their_to_self_delay(10);
+		let mut monitor = ChannelMonitor::new(&SecretKey::from_slice(&[41; 32]).unwrap(), &SecretKey::from_slice(&[42; 32]).unwrap(), &SecretKey::from_slice(&[43; 32]).unwrap(), &SecretKey::from_slice(&[44; 32]).unwrap(), &SecretKey::from_slice(&[44; 32]).unwrap(), &PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[45; 32]).unwrap()), 0, Script::new(), logger.clone());
+		monitor.their_to_self_delay = Some(10);
 
-		monitor.provide_latest_local_commitment_tx_info(dummy_tx.clone(), dummy_keys!(), 0, preimages_to_local_htlcs!(preimages[0..10]));
+		monitor.provide_latest_local_commitment_tx_info(LocalCommitmentTransaction::dummy(), dummy_keys!(), 0, preimages_to_local_htlcs!(preimages[0..10]));
 		monitor.provide_latest_remote_commitment_tx_info(&dummy_tx, preimages_slice_to_htlc_outputs!(preimages[5..15]), 281474976710655, dummy_key);
 		monitor.provide_latest_remote_commitment_tx_info(&dummy_tx, preimages_slice_to_htlc_outputs!(preimages[15..20]), 281474976710654, dummy_key);
 		monitor.provide_latest_remote_commitment_tx_info(&dummy_tx, preimages_slice_to_htlc_outputs!(preimages[17..20]), 281474976710653, dummy_key);
@@ -3680,7 +3718,7 @@ mod tests {
 
 		// Now update local commitment tx info, pruning only element 18 as we still care about the
 		// previous commitment tx's preimages too
-		monitor.provide_latest_local_commitment_tx_info(dummy_tx.clone(), dummy_keys!(), 0, preimages_to_local_htlcs!(preimages[0..5]));
+		monitor.provide_latest_local_commitment_tx_info(LocalCommitmentTransaction::dummy(), dummy_keys!(), 0, preimages_to_local_htlcs!(preimages[0..5]));
 		secret[0..32].clone_from_slice(&hex::decode("2273e227a5b7449b6e70f1fb4652864038b1cbf9cd7c043a7d6456b7fc275ad8").unwrap());
 		monitor.provide_secret(281474976710653, secret.clone()).unwrap();
 		assert_eq!(monitor.payment_preimages.len(), 12);
@@ -3688,7 +3726,7 @@ mod tests {
 		test_preimages_exist!(&preimages[18..20], monitor);
 
 		// But if we do it again, we'll prune 5-10
-		monitor.provide_latest_local_commitment_tx_info(dummy_tx.clone(), dummy_keys!(), 0, preimages_to_local_htlcs!(preimages[0..3]));
+		monitor.provide_latest_local_commitment_tx_info(LocalCommitmentTransaction::dummy(), dummy_keys!(), 0, preimages_to_local_htlcs!(preimages[0..3]));
 		secret[0..32].clone_from_slice(&hex::decode("27cddaa5624534cb6cb9d7da077cf2b22ab21e9b506fd4998a51d54502e99116").unwrap());
 		monitor.provide_secret(281474976710652, secret.clone()).unwrap();
 		assert_eq!(monitor.payment_preimages.len(), 5);