Update rust upstream

Author: sanket1729

Cargo.toml

@@ -30,7 +30,7 @@ use-serde = ["serde", "secp256k1/serde"]
 use-rand = ["rand", "secp256k1/rand"]
 
 [dependencies]
-secp256k1 = "0.20.0"
+secp256k1 = "0.22.1"
 secp256k1-zkp-sys = { version = "0.5.0", default-features = false, path = "./secp256k1-zkp-sys" }
 rand = { version = "0.6", default-features = false, optional = true }
 serde = { version = "1.0", default-features = false, optional = true }

secp256k1-zkp-sys/Cargo.toml

@@ -23,7 +23,7 @@ features = [ "recovery", "lowmemory" ]
 cc = "1.0.28"
 
 [dependencies]
-secp256k1-sys = "0.4"
+secp256k1-sys = "0.5"
 
 [features]
 default = ["std"]

src/lib.rs

@@ -44,7 +44,7 @@ pub use secp256k1_zkp_sys as ffi;
 extern crate secp256k1;
 
 #[cfg(feature = "bitcoin_hashes")]
-pub use secp256k1::bitcoin_hashes as hashes;
+pub use secp256k1::hashes;
 #[cfg(any(test, feature = "std"))]
 extern crate core;
 #[cfg(any(test, feature = "rand"))]
@@ -65,12 +65,10 @@ use core::{fmt, str};
 
 pub use secp256k1::constants;
 pub use secp256k1::ecdh;
-pub use secp256k1::key;
-#[cfg(feature = "recovery")]
-pub use secp256k1::recovery;
-pub use secp256k1::schnorrsig;
+pub use secp256k1::ecdsa;
+pub use secp256k1::schnorr;
 
-pub use key::{PublicKey, SecretKey};
+pub use {PublicKey, SecretKey};
 
 pub use secp256k1::*;
 

src/zkp/ecdsa_adaptor.rs

@@ -16,7 +16,7 @@ use rand::{CryptoRng, Rng};
 use {constants, PublicKey, Secp256k1, SecretKey};
 use {from_hex, Error};
 use {Message, Signing};
-use {Signature, Verification};
+use {ecdsa::Signature, Verification};
 
 /// Represents an adaptor signature and dleq proof.
 #[derive(Debug, PartialEq, Clone, Copy, Eq)]
@@ -309,7 +309,7 @@ mod tests {
             .decrypt(&adaptor_secret)
             .expect("to be able to decrypt using the correct secret");
         SECP256K1
-            .verify(&msg, &sig, &pubkey)
+            .verify_ecdsa(&msg, &sig, &pubkey)
             .expect("signature to be valid");
         let recovered = adaptor_sig
             .recover(&SECP256K1, &sig, &adaptor)

src/zkp/rangeproof.rs

@@ -203,7 +203,7 @@ impl RangeProof {
 #[cfg(feature = "bitcoin_hashes")]
 impl ::core::fmt::Display for RangeProof {
     fn fmt(&self, f: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result {
-        use bitcoin_hashes::hex::format_hex;
+        use hashes::hex::format_hex;
 
         format_hex(self.serialize().as_slice(), f)
     }

src/zkp/surjection_proof.rs

@@ -183,7 +183,7 @@ impl SurjectionProof {
 #[cfg(feature = "bitcoin_hashes")]
 impl ::core::fmt::Display for SurjectionProof {
     fn fmt(&self, f: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result {
-        use bitcoin_hashes::hex::format_hex;
+        use hashes::hex::format_hex;
 
         format_hex(self.serialize().as_slice(), f)
     }