Add ecdsa module to openvm_k256

Author: Avaneesh-axiom

benchmarks/guest/ecrecover/Cargo.toml

@@ -5,7 +5,6 @@ version = "0.0.0"
 edition = "2021"
 
 [dependencies]
-k256 = { version = "0.13.3", default-features = false, features = ["ecdsa"] }
 ecdsa = { version = "0.16.9", default-features = false }
 openvm = { path = "../../../crates/toolchain/openvm", features = ["std"] }
 openvm-platform = { path = "../../../crates/toolchain/platform", default-features = false }
@@ -14,7 +13,7 @@ openvm-ecc-guest = { path = "../../../extensions/ecc/guest", default-features =
     "k256",
 ] }
 openvm-keccak256 = { path = "../../../guest-libs/keccak256/guest", default-features = false }
-openvm-k256 = { path = "../../../guest-libs/k256/guest", default-features = false }
+k256 = { path = "../../../guest-libs/k256/guest", default-features = false, features = ["ecdsa"], package = "openvm-k256" }
 # We do not patch revm-precompile so that the benchmark only depends on this repo.
 revm-precompile = { version = "14.0.0", default-features = false }
 alloy-primitives = { version = "0.8.10", default-features = false, features = [

benchmarks/guest/ecrecover/src/main.rs

@@ -1,10 +1,11 @@
 use alloy_primitives::{Bytes, B256, B512};
 // Be careful not to import k256::ecdsa::{Signature, VerifyingKey}
 // because those are type aliases that their (non-zkvm) implementations
-use ecdsa::{Signature, VerifyingKey};
-use k256::ecdsa::{Error, RecoveryId};
+use k256::{
+    ecdsa::{Error, RecoveryId, Signature, VerifyingKey},
+    Secp256k1Point,
+};
 use openvm::io::read_vec;
-use openvm_k256::{Secp256k1, Secp256k1Point};
 #[allow(unused_imports, clippy::single_component_path_imports)]
 use openvm_keccak256::keccak256;
 // export native keccak
@@ -32,7 +33,7 @@ fn ecrecover(sig: &B512, mut recid: u8, msg: &B256) -> Result<B256, Error> {
     }
     let recid = RecoveryId::from_byte(recid).expect("recovery ID is valid");
 
-    let recovered_key = VerifyingKey::<Secp256k1>::recover_from_prehash(&msg[..], &sig, recid)?;
+    let recovered_key = VerifyingKey::recover_from_prehash(&msg[..], &sig, recid)?;
     let mut hash = keccak256(
         &recovered_key
             .to_encoded_point(/* compress = */ false)

guest-libs/k256/guest/Cargo.toml

@@ -21,9 +21,15 @@ ecdsa = { workspace = true }
 serde = { workspace = true }
 hex-literal = { workspace = true }
 ff = { workspace = true }
+k256 = { workspace = true }
 
 [target.'cfg(not(target_os = "zkvm"))'.dependencies]
 num-bigint = { workspace = true }
 
+[features]
+default = ["ecdsa"]
+ecdsa = ["k256/ecdsa", "ecdsa-core"]
+ecdsa-core = ["k256/ecdsa-core"]
+
 [package.metadata.cargo-shear]
 ignored = ["openvm", "num-bigint", "serde"]

guest-libs/k256/guest/src/ecdsa.rs

@@ -0,0 +1,14 @@
+// re-export types that are visible in the k256 crate for API compatibility
+
+pub use k256::ecdsa::{Error, RecoveryId};
+
+/// ECDSA/secp256k1 signature (fixed-size)
+pub type Signature = ecdsa::Signature<crate::Secp256k1>;
+
+/// ECDSA/secp256k1 signing key
+#[cfg(feature = "ecdsa")]
+pub type SigningKey = ecdsa::SigningKey<crate::Secp256k1>;
+
+/// ECDSA/secp256k1 verification key (i.e. public key)
+#[cfg(feature = "ecdsa")]
+pub type VerifyingKey = ecdsa::VerifyingKey<crate::Secp256k1>;

guest-libs/k256/guest/src/lib.rs

@@ -13,6 +13,9 @@ mod internal;
 mod point;
 mod scalar;
 
+#[cfg(feature = "ecdsa-core")]
+pub mod ecdsa;
+
 // Needs to be public so that the `sw_init` macro can access it
 pub use internal::{
     Secp256k1Point, Secp256k1Point as AffinePoint, Secp256k1Point as ProjectivePoint,