X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fchain%2Fkeysinterface.rs;h=18b069369b70e72455cee7cc80893a76bacb5195;hb=8cc3be9eab9ff322d543e989f28c775a69d6b78f;hp=84ebde34252c95a530c4c0bb6c5f6ef63d9f64ac;hpb=32a937890956a459c499e76767671050b357f29a;p=rust-lightning

diff --git a/src/chain/keysinterface.rs b/src/chain/keysinterface.rs
index 84ebde34..18b06936 100644
--- a/src/chain/keysinterface.rs
+++ b/src/chain/keysinterface.rs
@@ -74,12 +74,19 @@ 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 in justice tx, claim tx and preimage tx outputs
-	pub channel_monitor_claim_key: SecretKey,
 	/// Commitment seed
 	pub commitment_seed: [u8; 32],
 }
 
+impl_writeable!(ChannelKeys, 0, {
+	funding_key,
+	revocation_base_key,
+	payment_base_key,
+	delayed_payment_base_key,
+	htlc_base_key,
+	commitment_seed
+});
+
 impl ChannelKeys {
 	/// Generate a set of lightning keys needed to operate a channel by HKDF-expanding a given
 	/// random 32-byte seed
@@ -104,9 +111,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 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 {
@@ -115,7 +119,6 @@ impl ChannelKeys {
 			payment_base_key: payment_base_key,
 			delayed_payment_base_key: delayed_payment_base_key,
 			htlc_base_key: htlc_base_key,
-			channel_monitor_claim_key: channel_monitor_claim_key,
 			commitment_seed: okm
 		}
 	}