nits

Author: devrandom

lightning/src/chain/keysinterface.rs

@@ -161,7 +161,7 @@ pub trait ChannelKeys : Send {
 	/// Set the remote funding key.  This is done immediately on incoming channels
 	/// and as soon as the channel is accepted on outgoing channels.
 	///
-	/// Must be called before any signatures are applied.
+	/// Will be called before any signatures are applied.
 	fn set_remote_funding_pubkey(&mut self, key: &PublicKey);
 }
 
@@ -196,7 +196,7 @@ impl ChannelKeys for InMemoryChannelKeys {
 		if commitment_tx.input.len() != 1 { return Err(()); }
 
 		let funding_pubkey = PublicKey::from_secret_key(secp_ctx, &self.funding_key);
-		let channel_funding_redeemscript = make_funding_redeemscript(funding_pubkey, self.remote_funding_pubkey.expect("must set remote funding key before signing"));
+		let channel_funding_redeemscript = make_funding_redeemscript(&funding_pubkey, &self.remote_funding_pubkey.expect("must set remote funding key before signing"));
 
 		let commitment_sighash = hash_to_message!(&bip143::SighashComponents::new(&commitment_tx).sighash_all(&commitment_tx.input[0], &channel_funding_redeemscript, channel_value_satoshis)[..]);
 		let commitment_sig = secp_ctx.sign(&commitment_sighash, &self.funding_key);
@@ -389,7 +389,6 @@ impl KeysInterface for KeysManager {
 		let payment_base_key = key_step!(b"payment base key", revocation_base_key);
 		let delayed_payment_base_key = key_step!(b"delayed payment base key", payment_base_key);
 		let htlc_base_key = key_step!(b"HTLC base key", delayed_payment_base_key);
-		let remote_funding_pubkey = None;
 
 		InMemoryChannelKeys {
 			funding_key,
@@ -398,7 +397,7 @@ impl KeysInterface for KeysManager {
 			delayed_payment_base_key,
 			htlc_base_key,
 			commitment_seed,
-			remote_funding_pubkey,
+			remote_funding_pubkey: None,
 		}
 	}
 

lightning/src/ln/chan_utils.rs

@@ -255,10 +255,11 @@ pub fn get_htlc_redeemscript(htlc: &HTLCOutputInCommitment, keys: &TxCreationKey
 	get_htlc_redeemscript_with_explicit_keys(htlc, &keys.a_htlc_key, &keys.b_htlc_key, &keys.revocation_key)
 }
 
-/// redeem script for funding transaction output
-pub fn make_funding_redeemscript(our_funding_pubkey: PublicKey, their_funding_pubkey: PublicKey) -> Script {
-	let our_funding_key = our_funding_pubkey.serialize();
-	let their_funding_key = their_funding_pubkey.serialize();
+/// Gets the redeemscript for a funding output from the two funding public keys.
+/// Note that the order of funding public keys does not matter.
+pub fn make_funding_redeemscript(a: &PublicKey, b: &PublicKey) -> Script {
+	let our_funding_key = a.serialize();
+	let their_funding_key = b.serialize();
 
 	let builder = Builder::new().push_opcode(opcodes::all::OP_PUSHNUM_2);
 	if our_funding_key[..] < their_funding_key[..] {

lightning/src/ln/channel.rs

@@ -1114,7 +1114,7 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 	pub fn get_funding_redeemscript(&self) -> Script {
 		let our_funding_key = PublicKey::from_secret_key(&self.secp_ctx, self.local_keys.funding_key());
 		let their_funding_key = self.their_funding_pubkey.expect("get_funding_redeemscript only allowed after accept_channel");
-		make_funding_redeemscript(our_funding_key, their_funding_key)
+		make_funding_redeemscript(&our_funding_key, &their_funding_key)
 	}
 
 	/// Builds the htlc-success or htlc-timeout transaction which spends a given HTLC output