Skip to content

chore: integrate rust-secp256k1 #1915

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rakita merged 7 commits into from
Dec 31, 2024
Merged

chore: integrate rust-secp256k1 #1915

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2324c9c
chore: integrate rust-secp256k1
stevencartavia Dec 15, 2024
265b3bd
parity version
stevencartavia Dec 16, 2024
6027fc3
fmt
stevencartavia Dec 16, 2024
5f3311b
dep
stevencartavia Dec 16, 2024
ec268ac
restructure,cleanup and order of activation
rakita Dec 31, 2024
c95c51a
rm comments
rakita Dec 31, 2024
9afbfbd
Merge remote-tracking branch 'origin/main' into secpt256
rakita Dec 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
rm comments
  • Loading branch information
@rakita
rakita committed Dec 31, 2024
commit c95c51a06ae74fc57eb5b032695ccd75823330f5
61 changes: 0 additions & 61 deletions crates/precompile/src/secp256k1.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,67 +15,6 @@ pub mod bitcoin_secp256k1;
#[cfg(feature = "libsecp256k1")]
pub mod parity_libsecp256k1;

// #[allow(clippy::module_inception)]
// mod secp256k1 {
// use primitives::{alloy_primitives::B512, keccak256, B256};

// #[cfg(feature = "secp256k1")]
// {
// use secp256k1::{
// ecdsa::{RecoverableSignature, RecoveryId},
// Message, SECP256K1,
// };

// // Silence the unused crate dependency warning.
// use k256 as _;

// pub fn ecrecover(sig: &B512, recid: u8, msg: &B256) -> Result<B256, secp256k1::Error> {
// let recid = RecoveryId::from_i32(recid as i32).expect("recovery ID is valid");
// let sig = RecoverableSignature::from_compact(sig.as_slice(), recid)?;

// let msg = Message::from_digest(msg.0);
// let public = SECP256K1.recover_ecdsa(&msg, &sig)?;

// let mut hash = keccak256(&public.serialize_uncompressed()[1..]);
// hash[..12].fill(0);
// Ok(hash)
// }
// }
// #[cfg(feature = "libsecp256k1")]
// {

// }
// #[cfg(feature = "k256")]
// {
// use k256::ecdsa::{Error, RecoveryId, Signature, VerifyingKey};

// pub fn ecrecover(sig: &B512, mut recid: u8, msg: &B256) -> Result<B256, Error> {
// // parse signature
// let mut sig = Signature::from_slice(sig.as_slice())?;

// // normalize signature and flip recovery id if needed.
// if let Some(sig_normalized) = sig.normalize_s() {
// sig = sig_normalized;
// recid ^= 1;
// }
// let recid = RecoveryId::from_byte(recid).expect("recovery ID is valid");

// // recover key
// let recovered_key = VerifyingKey::recover_from_prehash(&msg[..], &sig, recid)?;
// // hash it
// let mut hash = keccak256(
// &recovered_key
// .to_encoded_point(/* compress = */ false)
// .as_bytes()[1..],
// );

// // truncate to 20 bytes
// hash[..12].fill(0);
// Ok(hash)
// }
// }
// }

pub fn ec_recover_run(input: &Bytes, gas_limit: u64) -> PrecompileResult {
const ECRECOVER_BASE: u64 = 3_000;

Expand Down
2 changes: 1 addition & 1 deletion crates/precompile/src/secp256k1/parity_libsecp256k1.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ pub fn ecrecover(sig: &B512, recid: u8, msg: &B256) -> Result<B256, Error> {
let mut hash = keccak256(&public.serialize()[1..]);
hash[..12].fill(0);
Ok(hash)
}
}