X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fchain%2Fkeysinterface.rs;h=b3823e2156106ac79573e9b56a529ab33002a197;hb=434211434540ab348d5a6937b5d9157eeb6f11bc;hp=3e4ff0e36991320fb67f4be28f4fa460f05408c1;hpb=6d5dc6c9b49b8ddffe8110fefffcc8f313a9c10b;p=rust-lightning

diff --git a/src/chain/keysinterface.rs b/src/chain/keysinterface.rs
index 3e4ff0e3..b3823e21 100644
--- a/src/chain/keysinterface.rs
+++ b/src/chain/keysinterface.rs
@@ -62,6 +62,7 @@ pub trait KeysInterface: Send + Sync {
 }
 
 /// Set of lightning keys needed to operate a channel as described in BOLT 3
+#[derive(Clone)]
 pub struct ChannelKeys {
 	/// Private key of anchor tx
 	pub funding_key: SecretKey,
@@ -73,10 +74,6 @@ pub struct ChannelKeys {
 	pub delayed_payment_base_key: SecretKey,
 	/// Local htlc secret key used in commitment tx htlc outputs
 	pub htlc_base_key: SecretKey,
-	/// Local secret key used for closing tx
-	pub channel_close_key: SecretKey,
-	/// Local secret key used in justice tx, claim tx and preimage tx outputs
-	pub channel_monitor_claim_key: SecretKey,
 	/// Commitment seed
 	pub commitment_seed: [u8; 32],
 }
@@ -105,12 +102,6 @@ impl ChannelKeys {
 		hkdf_expand(Sha256::new(), &prk, b"rust-lightning htlc base key info", &mut okm);
 		let htlc_base_key = SecretKey::from_slice(&secp_ctx, &okm).expect("Sha256 is broken");
 
-		hkdf_expand(Sha256::new(), &prk, b"rust-lightning channel close key info", &mut okm);
-		let channel_close_key = SecretKey::from_slice(&secp_ctx, &okm).expect("Sha256 is broken");
-
-		hkdf_expand(Sha256::new(), &prk, b"rust-lightning channel monitor claim key info", &mut okm);
-		let channel_monitor_claim_key = SecretKey::from_slice(&secp_ctx, &okm).expect("Sha256 is broken");
-
 		hkdf_expand(Sha256::new(), &prk, b"rust-lightning local commitment seed info", &mut okm);
 
 		ChannelKeys {
@@ -119,8 +110,6 @@ impl ChannelKeys {
 			payment_base_key: payment_base_key,
 			delayed_payment_base_key: delayed_payment_base_key,
 			htlc_base_key: htlc_base_key,
-			channel_close_key: channel_close_key,
-			channel_monitor_claim_key: channel_monitor_claim_key,
 			commitment_seed: okm
 		}
 	}