projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrade to secp256k1 v12, bitcoin v16, and crates bitcoin_hashes
[rust-lightning]
/
src
/
ln
/
channelmanager.rs
diff --git
a/src/ln/channelmanager.rs
b/src/ln/channelmanager.rs
index 0b7def9ad87bf8b02a9ae22565d9854de2617144..f3d51e4bb1d3d841cd8049177a460d96b13e78fd 100644
(file)
--- a/
src/ln/channelmanager.rs
+++ b/
src/ln/channelmanager.rs
@@
-108,7
+108,7
@@
impl HTLCSource {
pub fn dummy() -> Self {
HTLCSource::OutboundRoute {
route: Route { hops: Vec::new() },
pub fn dummy() -> Self {
HTLCSource::OutboundRoute {
route: Route { hops: Vec::new() },
- session_priv: SecretKey::from_slice(&
::secp256k1::Secp256k1::without_caps(), &
[1; 32]).unwrap(),
+ session_priv: SecretKey::from_slice(&[1; 32]).unwrap(),
first_hop_htlc_msat: 0,
}
}
first_hop_htlc_msat: 0,
}
}
@@
-733,7
+733,7
@@
impl ChannelManager {
let shared_secret = {
let mut arr = [0; 32];
let shared_secret = {
let mut arr = [0; 32];
- arr.copy_from_slice(&SharedSecret::new(&
self.secp_ctx, &
msg.onion_routing_packet.public_key.unwrap(), &self.our_network_key)[..]);
+ arr.copy_from_slice(&SharedSecret::new(&msg.onion_routing_packet.public_key.unwrap(), &self.our_network_key)[..]);
arr
};
let (rho, mu) = onion_utils::gen_rho_mu_from_shared_secret(&shared_secret);
arr
};
let (rho, mu) = onion_utils::gen_rho_mu_from_shared_secret(&shared_secret);
@@
-827,10
+827,10
@@
impl ChannelManager {
let mut sha = Sha256::engine();
sha.input(&new_pubkey.serialize()[..]);
sha.input(&shared_secret);
let mut sha = Sha256::engine();
sha.input(&new_pubkey.serialize()[..]);
sha.input(&shared_secret);
- S
ecretKey::from_slice(&self.secp_ctx, &Sha256::from_engine(sha).into_inner()).expect("SHA-256 is broken?"
)
+ S
ha256::from_engine(sha).into_inner(
)
};
};
- let public_key = if let Err(e) = new_pubkey.mul_assign(&self.secp_ctx, &blinding_factor) {
+ let public_key = if let Err(e) = new_pubkey.mul_assign(&self.secp_ctx, &blinding_factor
[..]
) {
Err(e)
} else { Ok(new_pubkey) };
Err(e)
} else { Ok(new_pubkey) };