chore: update secp256k1 to 0.22.1

Author: tmpolaczyk

Cargo.lock

@@ -22,7 +22,7 @@ hmac = "0.7.1"
 memzero = "0.1.0"
 rand = "0.7.3"
 ring = "0.16.11"
-secp256k1 = "0.20.3"
+secp256k1 = "0.22.1"
 serde = { version = "1.0.104", optional = true }
 sha2 = "0.8.1"
 tiny-bip39 = "0.7.0"

crypto/Cargo.toml

@@ -4,7 +4,7 @@ use crate::key::CryptoEngine;
 use secp256k1::{Error, Message, SecretKey};
 
 /// Signature
-pub type Signature = secp256k1::Signature;
+pub type Signature = secp256k1::ecdsa::Signature;
 
 /// PublicKey
 pub type PublicKey = secp256k1::PublicKey;
@@ -15,7 +15,7 @@ pub type PublicKey = secp256k1::PublicKey;
 pub fn sign(secp: &CryptoEngine, secret_key: SecretKey, data: &[u8]) -> Result<Signature, Error> {
     let msg = Message::from_slice(data)?;
 
-    Ok(secp.sign(&msg, &secret_key))
+    Ok(secp.sign_ecdsa(&msg, &secret_key))
 }
 /// Verify signature with a provided public key.
 /// - Returns an Error if data is not a 32-byte array
@@ -27,14 +27,14 @@ pub fn verify(
 ) -> Result<(), Error> {
     let msg = Message::from_slice(data)?;
 
-    secp.verify(&msg, sig, public_key)
+    secp.verify_ecdsa(&msg, sig, public_key)
 }
 
 #[cfg(test)]
 mod tests {
     use crate::hash::{calculate_sha256, Sha256};
     use crate::signature::{sign, verify};
-    use secp256k1::{PublicKey, Secp256k1, SecretKey, Signature};
+    use secp256k1::{ecdsa::Signature, PublicKey, Secp256k1, SecretKey};
 
     #[test]
     fn test_sign_and_verify() {

crypto/src/signature.rs

@@ -26,8 +26,8 @@ use witnet_crypto::{
     key::ExtendedSK,
     merkle::merkle_tree_root as crypto_merkle_tree_root,
     secp256k1::{
-        PublicKey as Secp256k1_PublicKey, SecretKey as Secp256k1_SecretKey,
-        Signature as Secp256k1_Signature,
+        ecdsa::Signature as Secp256k1_Signature, PublicKey as Secp256k1_PublicKey,
+        SecretKey as Secp256k1_SecretKey,
     },
 };
 use witnet_protected::Protected;
@@ -4397,16 +4397,16 @@ mod tests {
     fn secp256k1_from_into_secpk256k1_signatures() {
         use crate::chain::Secp256k1Signature;
         use witnet_crypto::secp256k1::{
-            Message as Secp256k1_Message, Secp256k1, SecretKey as Secp256k1_SecretKey,
-            Signature as Secp256k1_Signature,
+            ecdsa::Signature as Secp256k1_Signature, Message as Secp256k1_Message, Secp256k1,
+            SecretKey as Secp256k1_SecretKey,
         };
 
         let data = [0xab; 32];
         let secp = Secp256k1::new();
         let secret_key =
             Secp256k1_SecretKey::from_slice(&[0xcd; 32]).expect("32 bytes, within curve order");
         let msg = Secp256k1_Message::from_slice(&data).unwrap();
-        let signature = secp.sign(&msg, &secret_key);
+        let signature = secp.sign_ecdsa(&msg, &secret_key);
 
         let witnet_signature = Secp256k1Signature::from(signature);
         let signature_into: Secp256k1_Signature = witnet_signature.try_into().unwrap();
@@ -4418,16 +4418,16 @@ mod tests {
     fn secp256k1_from_into_signatures() {
         use crate::chain::Signature;
         use witnet_crypto::secp256k1::{
-            Message as Secp256k1_Message, Secp256k1, SecretKey as Secp256k1_SecretKey,
-            Signature as Secp256k1_Signature,
+            ecdsa::Signature as Secp256k1_Signature, Message as Secp256k1_Message, Secp256k1,
+            SecretKey as Secp256k1_SecretKey,
         };
 
         let data = [0xab; 32];
         let secp = Secp256k1::new();
         let secret_key =
             Secp256k1_SecretKey::from_slice(&[0xcd; 32]).expect("32 bytes, within curve order");
         let msg = Secp256k1_Message::from_slice(&data).unwrap();
-        let signature = secp.sign(&msg, &secret_key);
+        let signature = secp.sign_ecdsa(&msg, &secret_key);
 
         let witnet_signature = Signature::from(signature);
         let signature_into: Secp256k1_Signature = witnet_signature.try_into().unwrap();