X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fchannel.rs;h=0cda76fd5e4306396bd72c3240eb74a4ec83e2fb;hb=0882655680040a0226b1790b6558150324a288f4;hp=071e1ee5d319f0b6acffc7893f0e88a628f6431c;hpb=f2c1712bdd8bac5172d6948690540dd51bf0a3ab;p=rust-lightning

diff --git a/lightning/src/ln/channel.rs b/lightning/src/ln/channel.rs
index 071e1ee5..0cda76fd 100644
--- a/lightning/src/ln/channel.rs
+++ b/lightning/src/ln/channel.rs
@@ -1216,18 +1216,6 @@ impl<Signer: Sign> Channel<Signer> {
 		make_funding_redeemscript(&self.get_holder_pubkeys().funding_pubkey, self.counterparty_funding_pubkey())
 	}
 
-	/// Builds the htlc-success or htlc-timeout transaction which spends a given HTLC output
-	/// @local is used only to convert relevant internal structures which refer to remote vs local
-	/// to decide value of outputs and direction of HTLCs.
-	fn build_htlc_transaction(&self, prev_hash: &Txid, htlc: &HTLCOutputInCommitment, local: bool, keys: &TxCreationKeys, feerate_per_kw: u32) -> Transaction {
-		chan_utils::build_htlc_transaction(prev_hash, feerate_per_kw,
-			if local {
-				self.get_counterparty_selected_contest_delay().unwrap()
-			} else {
-				self.get_holder_selected_contest_delay()
-			}, htlc, &keys.broadcaster_delayed_payment_key, &keys.revocation_key)
-	}
-
 	/// Per HTLC, only one get_update_fail_htlc or get_update_fulfill_htlc call may be made.
 	/// In such cases we debug_assert!(false) and return a ChannelError::Ignore. Thus, will always
 	/// return Ok(_) if debug assertions are turned on or preconditions are met.
@@ -1796,8 +1784,22 @@ impl<Signer: Sign> Channel<Signer> {
 	/// corner case properly.
 	pub fn get_inbound_outbound_available_balance_msat(&self) -> (u64, u64) {
 		// Note that we have to handle overflow due to the above case.
-		(cmp::max(self.channel_value_satoshis as i64 * 1000 - self.value_to_self_msat as i64 - self.get_inbound_pending_htlc_stats().1 as i64, 0) as u64,
-		cmp::max(self.value_to_self_msat as i64 - self.get_outbound_pending_htlc_stats().1 as i64, 0) as u64)
+		(
+			cmp::max(self.channel_value_satoshis as i64 * 1000
+				- self.value_to_self_msat as i64
+				- self.get_inbound_pending_htlc_stats().1 as i64
+				- Self::get_holder_selected_channel_reserve_satoshis(self.channel_value_satoshis) as i64 * 1000,
+			0) as u64,
+			cmp::max(self.value_to_self_msat as i64
+				- self.get_outbound_pending_htlc_stats().1 as i64
+				- self.counterparty_selected_channel_reserve_satoshis.unwrap_or(0) as i64 * 1000,
+			0) as u64
+		)
+	}
+
+	pub fn get_holder_counterparty_selected_channel_reserve_satoshis(&self) -> (u64, Option<u64>) {
+		(Self::get_holder_selected_channel_reserve_satoshis(self.channel_value_satoshis),
+		self.counterparty_selected_channel_reserve_satoshis)
 	}
 
 	// Get the fee cost of a commitment tx with a given number of HTLC outputs.
@@ -2247,7 +2249,10 @@ impl<Signer: Sign> Channel<Signer> {
 		let mut htlcs_and_sigs = Vec::with_capacity(htlcs_cloned.len());
 		for (idx, (htlc, source)) in htlcs_cloned.drain(..).enumerate() {
 			if let Some(_) = htlc.transaction_output_index {
-				let htlc_tx = self.build_htlc_transaction(&commitment_txid, &htlc, true, &keys, feerate_per_kw);
+				let htlc_tx = chan_utils::build_htlc_transaction(&commitment_txid, feerate_per_kw,
+					self.get_counterparty_selected_contest_delay().unwrap(), &htlc,
+					&keys.broadcaster_delayed_payment_key, &keys.revocation_key);
+
 				let htlc_redeemscript = chan_utils::get_htlc_redeemscript(&htlc, &keys);
 				let htlc_sighash = hash_to_message!(&bip143::SigHashCache::new(&htlc_tx).signature_hash(0, &htlc_redeemscript, htlc.amount_msat / 1000, SigHashType::All)[..]);
 				log_trace!(logger, "Checking HTLC tx signature {} by key {} against tx {} (sighash {}) with redeemscript {} in channel {}.",
@@ -3347,6 +3352,10 @@ impl<Signer: Sign> Channel<Signer> {
 		self.channel_id
 	}
 
+	pub fn minimum_depth(&self) -> Option<u32> {
+		self.minimum_depth
+	}
+
 	/// Gets the "user_id" value passed into the construction of this channel. It has no special
 	/// meaning and exists only to allow users to have a persistent identifier of a channel.
 	pub fn get_user_id(&self) -> u64 {
@@ -3374,7 +3383,7 @@ impl<Signer: Sign> Channel<Signer> {
 		&self.channel_transaction_parameters.holder_pubkeys
 	}
 
-	fn get_counterparty_selected_contest_delay(&self) -> Option<u16> {
+	pub fn get_counterparty_selected_contest_delay(&self) -> Option<u16> {
 		self.channel_transaction_parameters.counterparty_parameters
 			.as_ref().map(|params| params.selected_contest_delay)
 	}
@@ -5420,7 +5429,9 @@ mod tests {
 					let remote_signature = Signature::from_der(&hex::decode($counterparty_htlc_sig_hex).unwrap()[..]).unwrap();
 
 					let ref htlc = htlcs[$htlc_idx];
-					let htlc_tx = chan.build_htlc_transaction(&unsigned_tx.txid, &htlc, true, &keys, chan.feerate_per_kw);
+					let htlc_tx = chan_utils::build_htlc_transaction(&unsigned_tx.txid, chan.feerate_per_kw,
+						chan.get_counterparty_selected_contest_delay().unwrap(),
+						&htlc, &keys.broadcaster_delayed_payment_key, &keys.revocation_key);
 					let htlc_redeemscript = chan_utils::get_htlc_redeemscript(&htlc, &keys);
 					let htlc_sighash = Message::from_slice(&bip143::SigHashCache::new(&htlc_tx).signature_hash(0, &htlc_redeemscript, htlc.amount_msat / 1000, SigHashType::All)[..]).unwrap();
 					secp_ctx.verify(&htlc_sighash, &remote_signature, &keys.countersignatory_htlc_key).unwrap();