X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Fmessage_signing.rs;h=0a45af26f8633e27fa97ad783f2a7e32079bd94f;hb=65efd92c4a931b3b3622c84c6055bc015152fde0;hp=477cbcbdd9aa93493de6703e0d4d57cd81c135d2;hpb=32a0113fda05f6c7c8b7b12359c9ef82ab999e07;p=rust-lightning

diff --git a/lightning/src/util/message_signing.rs b/lightning/src/util/message_signing.rs
index 477cbcbd..0a45af26 100644
--- a/lightning/src/util/message_signing.rs
+++ b/lightning/src/util/message_signing.rs
@@ -20,6 +20,7 @@
 //! <https://lightning.readthedocs.io/lightning-signmessage.7.html>
 //! <https://api.lightning.community/#signmessage>
 
+#[allow(unused)]
 use crate::prelude::*;
 use crate::util::base32;
 use bitcoin::hashes::{sha256d, Hash};
@@ -53,12 +54,12 @@ fn sigrec_decode(sig_rec: Vec<u8>) -> Result<RecoverableSignature, Error> {
 /// Creates a digital signature of a message given a SecretKey, like the node's secret.
 /// A receiver knowing the PublicKey (e.g. the node's id) and the message can be sure that the signature was generated by the caller.
 /// Signatures are EC recoverable, meaning that given the message and the signature the PublicKey of the signer can be extracted.
-pub fn sign(msg: &[u8], sk: &SecretKey) -> Result<String, Error> {
+pub fn sign(msg: &[u8], sk: &SecretKey) -> String {
 	let secp_ctx = Secp256k1::signing_only();
 	let msg_hash = sha256d::Hash::hash(&[LN_MESSAGE_PREFIX, msg].concat());
 
-	let sig = secp_ctx.sign_ecdsa_recoverable(&Message::from_slice(&msg_hash)?, sk);
-	Ok(base32::Alphabet::ZBase32.encode(&sigrec_encode(sig)))
+	let sig = secp_ctx.sign_ecdsa_recoverable(&Message::from_digest(msg_hash.to_byte_array()), sk);
+	base32::Alphabet::ZBase32.encode(&sigrec_encode(sig))
 }
 
 /// Recovers the PublicKey of the signer of the message given the message and the signature.
@@ -69,7 +70,7 @@ pub fn recover_pk(msg: &[u8], sig: &str) ->  Result<PublicKey, Error> {
 	match base32::Alphabet::ZBase32.decode(&sig) {
 		Ok(sig_rec) => {
 			match sigrec_decode(sig_rec) {
-				Ok(sig) => secp_ctx.recover_ecdsa(&Message::from_slice(&msg_hash)?, &sig),
+				Ok(sig) => secp_ctx.recover_ecdsa(&Message::from_digest(msg_hash.to_byte_array()), &sig),
 				Err(e) => Err(e)
 			}
 		},
@@ -90,31 +91,34 @@ pub fn verify(msg: &[u8], sig: &str, pk: &PublicKey) -> bool {
 mod test {
 	use core::str::FromStr;
 	use crate::util::message_signing::{sign, recover_pk, verify};
-	use bitcoin::secp256k1::ONE_KEY;
-	use bitcoin::secp256k1::{PublicKey, Secp256k1};
+	use bitcoin::secp256k1::constants::ONE;
+	use bitcoin::secp256k1::{PublicKey, SecretKey, Secp256k1};
 
 	#[test]
 	fn test_sign() {
 		let message = "test message";
-		let zbase32_sig = sign(message.as_bytes(), &ONE_KEY);
+		let one_key = SecretKey::from_slice(&ONE).unwrap();
+		let zbase32_sig = sign(message.as_bytes(), &one_key);
 
-		assert_eq!(zbase32_sig.unwrap(), "d9tibmnic9t5y41hg7hkakdcra94akas9ku3rmmj4ag9mritc8ok4p5qzefs78c9pqfhpuftqqzhydbdwfg7u6w6wdxcqpqn4sj4e73e")
+		assert_eq!(zbase32_sig, "d9tibmnic9t5y41hg7hkakdcra94akas9ku3rmmj4ag9mritc8ok4p5qzefs78c9pqfhpuftqqzhydbdwfg7u6w6wdxcqpqn4sj4e73e")
 	}
 
 	#[test]
 	fn test_recover_pk() {
 		let message = "test message";
+		let one_key = SecretKey::from_slice(&ONE).unwrap();
 		let sig = "d9tibmnic9t5y41hg7hkakdcra94akas9ku3rmmj4ag9mritc8ok4p5qzefs78c9pqfhpuftqqzhydbdwfg7u6w6wdxcqpqn4sj4e73e";
 		let pk = recover_pk(message.as_bytes(), sig);
 
-		assert_eq!(pk.unwrap(), PublicKey::from_secret_key(&Secp256k1::signing_only(), &ONE_KEY))
+		assert_eq!(pk.unwrap(), PublicKey::from_secret_key(&Secp256k1::signing_only(), &one_key))
 	}
 
 	#[test]
 	fn test_verify() {
 		let message = "another message";
-		let sig = sign(message.as_bytes(), &ONE_KEY).unwrap();
-		let pk = PublicKey::from_secret_key(&Secp256k1::signing_only(), &ONE_KEY);
+		let one_key = SecretKey::from_slice(&ONE).unwrap();
+		let sig = sign(message.as_bytes(), &one_key);
+		let pk = PublicKey::from_secret_key(&Secp256k1::signing_only(), &one_key);
 
 		assert!(verify(message.as_bytes(), &sig, &pk))
 	}