From b796a4112aeef344401b0c17e96ed1dbc6ea8c59 Mon Sep 17 00:00:00 2001 From: wujian0327 <353981613@qq.com> Date: Sun, 13 Oct 2024 11:31:57 +0800 Subject: [PATCH] update secp256k1 to 0.30.0 --- Cargo.toml | 1 + gemini/Cargo.toml | 2 +- gemini/src/nostr/event.rs | 9 +++++---- vault/Cargo.toml | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index c2d6fa8a9..0acf470c0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -83,3 +83,4 @@ git2 = "0.19.0" tempfile = "3.13.0" home = "0.5.9" ring = "0.17.8" +secp256k1 = "0.30.0" \ No newline at end of file diff --git a/gemini/Cargo.toml b/gemini/Cargo.toml index 461304253..a9d51c040 100644 --- a/gemini/Cargo.toml +++ b/gemini/Cargo.toml @@ -25,4 +25,4 @@ reqwest = { workspace = true } tracing = { workspace = true } tokio = { workspace = true, features = ["net"] } chrono = { workspace = true } -secp256k1 = { version = "0.29.0", features = ["serde", "rand","hashes"] } +secp256k1 = { workspace = true , features = ["serde", "rand","hashes"] } diff --git a/gemini/src/nostr/event.rs b/gemini/src/nostr/event.rs index 4f38d0a1c..ad8d9f418 100644 --- a/gemini/src/nostr/event.rs +++ b/gemini/src/nostr/event.rs @@ -241,7 +241,7 @@ impl NostrEvent { let hash = sha256::Hash::from_str(self.id.inner().clone().as_str())?; let message: Message = Message::from_digest(hash.to_byte_array()); // let message = Message::from_slice(hash.as_ref())?; - secp.verify_schnorr(&self.sig, &message, &self.pubkey) + secp.verify_schnorr(&self.sig, message.as_ref(), &self.pubkey) .map_err(|_| Error::InvalidSignature) } } @@ -250,15 +250,16 @@ pub fn sign_with_rng(id: String, keypair: &Keypair) -> Signature { let secp = Secp256k1::new(); let mut rng = rand::thread_rng(); let hash = sha256::Hash::from_str(id.as_str()).unwrap(); - let message: Message = Message::from_digest(hash.to_byte_array()); - secp.sign_schnorr_with_rng(&message, keypair, &mut rng) + let message = Message::from_digest(hash.to_byte_array()); + + secp.sign_schnorr_with_rng(message.as_ref(), keypair, &mut rng) } pub fn sign_without_rng(id: String, keypair: &Keypair) -> Signature { let secp = Secp256k1::new(); let hash = sha256::Hash::from_str(id.as_str()).unwrap(); let message: Message = Message::from_digest(hash.to_byte_array()); - secp.sign_schnorr_no_aux_rand(&message, keypair) + secp.sign_schnorr_no_aux_rand(message.as_ref(), keypair) } /// Event Id diff --git a/vault/Cargo.toml b/vault/Cargo.toml index 756756097..6950ac257 100644 --- a/vault/Cargo.toml +++ b/vault/Cargo.toml @@ -12,4 +12,4 @@ hex = "0.4.3" lazy_static = "1.5.0" bs58 = "0.5.1" serde = { version = "1.0.117", features = ["derive"] } -secp256k1 = { version = "0.29.0", features = ["serde", "rand"] } +secp256k1 = { workspace = true , features = ["serde", "rand","hashes"] }