fix(primitives): revert changes to crypto.rs (#975)

Author: Zk2u

bin/alpen-cli/src/cmd/deposit.rs

@@ -3,7 +3,12 @@ use std::{str::FromStr, time::Duration};
 use alloy::{primitives::Address as AlpenAddress, providers::WalletProvider};
 use argh::FromArgs;
 use bdk_wallet::{
-    bitcoin::{script::PushBytesBuf, secp256k1::SECP256K1, PrivateKey, XOnlyPublicKey},
+    bitcoin::{
+        key::Keypair,
+        script::PushBytesBuf,
+        secp256k1::{SecretKey, SECP256K1},
+        PrivateKey, XOnlyPublicKey,
+    },
     chain::ChainOracle,
     coin_selection::InsufficientFunds,
     descriptor::IntoWalletDescriptor,
@@ -16,7 +21,7 @@ use indicatif::ProgressBar;
 use rand_core::OsRng;
 use shrex::encode;
 use strata_cli_common::errors::{DisplayableError, DisplayedError};
-use strata_primitives::crypto::even_kp;
+use strata_primitives::crypto::EvenSecretKey;
 
 use crate::{
     alpen::AlpenWallet,
@@ -73,15 +78,19 @@ pub async fn deposit(
         alpen_address.to_string().cyan(),
     );
 
-    let (secret_key, recovery_public_key) = even_kp(SECP256K1.generate_keypair(&mut OsRng));
-    let recovery_public_key = recovery_public_key.x_only_public_key().0;
+    let secret_key: EvenSecretKey = {
+        let keypair = Keypair::new(SECP256K1, &mut OsRng);
+        SecretKey::from_keypair(&keypair).into()
+    };
+
+    let recovery_public_key = secret_key.x_only_public_key(SECP256K1).0;
 
     println!(
         "Recovery public key: {}",
         encode(&recovery_public_key.serialize()).yellow()
     );
 
-    let recovery_private_key = PrivateKey::new(secret_key.into(), settings.network);
+    let recovery_private_key = PrivateKey::new(*secret_key, settings.network);
 
     let bridge_in_desc = bridge_in_descriptor(
         settings.bridge_musig2_pubkey,

crates/primitives/src/crypto.rs

@@ -2,7 +2,7 @@
 use std::ops::Deref;
 
 use secp256k1::{
-    schnorr::Signature, Keypair, Message, Parity, PublicKey, SecretKey, XOnlyPublicKey, SECP256K1,
+    schnorr::Signature, Keypair, Message, Parity, SecretKey, XOnlyPublicKey, SECP256K1,
 };
 
 use crate::buf::{Buf32, Buf64};
@@ -79,56 +79,6 @@ impl From<SecretKey> for EvenSecretKey {
     }
 }
 
-impl From<EvenSecretKey> for SecretKey {
-    fn from(value: EvenSecretKey) -> Self {
-        value.0
-    }
-}
-
-/// A public key with guaranteed even parity
-#[derive(Debug)]
-pub struct EvenPublicKey(PublicKey);
-
-impl Deref for EvenPublicKey {
-    type Target = PublicKey;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl AsRef<PublicKey> for EvenPublicKey {
-    fn as_ref(&self) -> &PublicKey {
-        &self.0
-    }
-}
-
-impl From<PublicKey> for EvenPublicKey {
-    fn from(value: PublicKey) -> Self {
-        match value.x_only_public_key().1 == Parity::Odd {
-            true => Self(value.negate(SECP256K1)),
-            false => Self(value),
-        }
-    }
-}
-
-impl From<EvenPublicKey> for PublicKey {
-    fn from(value: EvenPublicKey) -> Self {
-        value.0
-    }
-}
-
-/// Ensures a keypair is even by checking the public key's parity and negating if odd.
-pub fn even_kp((sk, pk): (SecretKey, PublicKey)) -> (EvenSecretKey, EvenPublicKey) {
-    match (sk, pk) {
-        (sk, pk) if pk.x_only_public_key().1 == Parity::Odd => (
-            EvenSecretKey(sk.negate()),
-            EvenPublicKey(pk.negate(SECP256K1)),
-        ),
-        (sk, pk) => (EvenSecretKey(sk), EvenPublicKey(pk)),
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use rand::{rngs::OsRng, Rng};