X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fchan_utils.rs;h=e315398d52397bff904c34ef0a6504382fb918c2;hb=b3b4f434a2c384b4d37d7e7977ebd190377f2891;hp=6e29f22801a50ea4b1163233ab5ca63cecde5fc4;hpb=f60026387efc26b848f13c8615328873a22e7a0d;p=rust-lightning

diff --git a/lightning/src/ln/chan_utils.rs b/lightning/src/ln/chan_utils.rs
index 6e29f228..e315398d 100644
--- a/lightning/src/ln/chan_utils.rs
+++ b/lightning/src/ln/chan_utils.rs
@@ -317,7 +317,7 @@ impl PreCalculatedTxCreationKeys {
 	}
 
 	/// The transaction per-commitment point
-	pub fn per_comitment_point(&self) -> &PublicKey {
+	pub fn per_commitment_point(&self) -> &PublicKey {
 		&self.0.per_commitment_point
 	}
 }
@@ -599,11 +599,26 @@ impl LocalCommitmentTransaction {
 	}
 
 	/// Generate a new LocalCommitmentTransaction based on a raw commitment transaction,
-	/// remote signature and both parties keys
+	/// remote signature and both parties keys.
+	///
+	/// The unsigned transaction outputs must be consistent with htlc_data.  This function
+	/// only checks that the shape and amounts are consistent, but does not check the scriptPubkey.
 	pub fn new_missing_local_sig(unsigned_tx: Transaction, their_sig: Signature, our_funding_key: &PublicKey, their_funding_key: &PublicKey, local_keys: TxCreationKeys, feerate_per_kw: u32, htlc_data: Vec<(HTLCOutputInCommitment, Option<Signature>)>) -> LocalCommitmentTransaction {
 		if unsigned_tx.input.len() != 1 { panic!("Tried to store a commitment transaction that had input count != 1!"); }
 		if unsigned_tx.input[0].witness.len() != 0 { panic!("Tried to store a signed commitment transaction?"); }
 
+		for htlc in &htlc_data {
+			if let Some(index) = htlc.0.transaction_output_index {
+				let out = &unsigned_tx.output[index as usize];
+				if out.value != htlc.0.amount_msat / 1000 {
+					panic!("HTLC at index {} has incorrect amount", index);
+				}
+				if !out.script_pubkey.is_v0_p2wsh() {
+					panic!("HTLC at index {} doesn't have p2wsh scriptPubkey", index);
+				}
+			}
+		}
+
 		Self {
 			unsigned_tx,
 			their_sig,