Skip to content

Improve RecoveryId conversion functions #800

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
merged 2 commits into from
Jun 13, 2025
Merged

Improve RecoveryId conversion functions #800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b4fa8b
Add RecoveryId getter
tcharding Jun 12, 2025
fed623e
Implement From on u8 for RecoveryId instead of i32
tcharding Jun 12, 2025
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
5 changes: 1 addition & 4 deletions examples/sign_verify_recovery.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,5 @@ fn main() {

let (recovery_id, serialize_sig) = signature.serialize_compact();

assert_eq!(
recover(&secp, msg, serialize_sig, Into::<i32>::into(recovery_id) as u8),
Ok(pubkey)
);
assert_eq!(recover(&secp, msg, serialize_sig, recovery_id.to_u8()), Ok(pubkey));
}
20 changes: 15 additions & 5 deletions src/ecdsa/recovery.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,16 @@ impl RecoveryId {
_ => RecoveryId::Three,
}
}

/// Returns the `RecoveryId` as an integer.
pub const fn to_u8(self) -> u8 {
match self {
RecoveryId::Zero => 0,
RecoveryId::One => 1,
RecoveryId::Two => 2,
RecoveryId::Three => 3,
}
}
}

impl TryFrom<i32> for RecoveryId {
Expand All @@ -52,7 +62,7 @@ impl TryFrom<i32> for RecoveryId {
}
}

impl From<RecoveryId> for i32 {
impl From<RecoveryId> for u8 {
#[inline]
fn from(val: RecoveryId) -> Self {
match val {
Expand Down Expand Up @@ -86,7 +96,7 @@ impl RecoverableSignature {
super_ffi::secp256k1_context_no_precomp,
&mut ret,
data.as_c_ptr(),
recid.into(),
i32::from(recid.to_u8()),
) == 1
{
Ok(RecoverableSignature(ret))
Expand All @@ -113,7 +123,7 @@ impl RecoverableSignature {
/// Serializes the recoverable signature in compact format.
pub fn serialize_compact(&self) -> (RecoveryId, [u8; 64]) {
let mut ret = [0u8; 64];
let mut recid = RecoveryId::Zero.into();
let mut recid = i32::from(RecoveryId::Zero.to_u8());
unsafe {
let err = ffi::secp256k1_ecdsa_recoverable_signature_serialize_compact(
super_ffi::secp256k1_context_no_precomp,
Expand Down Expand Up @@ -451,9 +461,9 @@ mod tests {
assert!(RecoveryId::try_from(3i32).is_ok());
assert!(RecoveryId::try_from(4i32).is_err());
let id0 = RecoveryId::Zero;
assert_eq!(Into::<i32>::into(id0), 0i32);
assert_eq!(Into::<u8>::into(id0), 0u8);
let id1 = RecoveryId::One;
assert_eq!(Into::<i32>::into(id1), 1i32);
assert_eq!(Into::<u8>::into(id1), 1u8);
}
}

Expand Down
Loading