projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #223 from TheBlueMatt/2018-10-chanmanager-serialize
[rust-lightning]
/
src
/
chain
/
keysinterface.rs
diff --git
a/src/chain/keysinterface.rs
b/src/chain/keysinterface.rs
index 84ebde34252c95a530c4c0bb6c5f6ef63d9f64ac..18b069369b70e72455cee7cc80893a76bacb5195 100644
(file)
--- 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,
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],
}
/// 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
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 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 {
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,
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
}
}
commitment_seed: okm
}
}