use bitcoin::secp256k1::Error as SecpError;
use bitcoin::secp256k1::ecdsa::RecoveryId;
use bitcoin::secp256k1::ecdsa::RecoverableSignature as SecpRecoverableSignature;
+use bitcoin::secp256k1::Scalar as SecpScalar;
use bitcoin::bech32;
use bitcoin::util::address;
#[cfg(feature = "no-std")]
use alloc::{boxed::Box, vec::Vec, string::String};
+use core::convert::TryFrom;
+
#[repr(C)]
/// A dummy struct of which an instance must never exist.
/// This corresponds to the Rust type `Infallible`, or, in unstable rust, `!`
pub struct WitnessVersion(u8);
impl From<address::WitnessVersion> for WitnessVersion {
- fn from(o: address::WitnessVersion) -> Self { Self(o.into_num()) }
+ fn from(o: address::WitnessVersion) -> Self { Self(o.to_num()) }
}
impl Into<address::WitnessVersion> for WitnessVersion {
- fn into(self) -> address::WitnessVersion { address::WitnessVersion::from_num(self.0).expect("WitnessVersion objects must be in the range 0..=16") }
+ fn into(self) -> address::WitnessVersion {
+ address::WitnessVersion::try_from(self.0).expect("WitnessVersion objects must be in the range 0..=16")
+ }
}
#[derive(Clone)]
}
}
+#[repr(C)]
+#[derive(Clone)]
+/// Represents a scalar value between zero and the secp256k1 curve order, in big endian.
+pub struct BigEndianScalar {
+ /// The bytes of the scalar value.
+ pub big_endian_bytes: [u8; 32],
+}
+impl BigEndianScalar {
+ pub(crate) fn from_rust(scalar: &SecpScalar) -> Self {
+ Self { big_endian_bytes: scalar.to_be_bytes() }
+ }
+ pub(crate) fn into_rust(&self) -> SecpScalar {
+ SecpScalar::from_be_bytes(self.big_endian_bytes).expect("Scalar greater than the curve order")
+ }
+}
+
+#[no_mangle]
+/// Convenience function for constructing a new BigEndianScalar
+pub extern "C" fn BigEndianScalar_new(big_endian_bytes: ThirtyTwoBytes) -> BigEndianScalar {
+ BigEndianScalar { big_endian_bytes: big_endian_bytes.data }
+}
+
#[repr(C)]
#[derive(Copy, Clone)]
/// Represents an error returned from libsecp256k1 during validation of some secp256k1 data
UnexpectedEof,
}
impl IOError {
- pub(crate) fn from_rust(err: io::Error) -> Self {
- match err.kind() {
+ pub(crate) fn from_rust_kind(err: io::ErrorKind) -> Self {
+ match err {
io::ErrorKind::NotFound => IOError::NotFound,
io::ErrorKind::PermissionDenied => IOError::PermissionDenied,
io::ErrorKind::ConnectionRefused => IOError::ConnectionRefused,
_ => IOError::Other,
}
}
- pub(crate) fn to_rust(&self) -> io::Error {
- io::Error::new(match self {
+ pub(crate) fn from_rust(err: io::Error) -> Self {
+ Self::from_rust_kind(err.kind())
+ }
+ pub(crate) fn to_rust_kind(&self) -> io::ErrorKind {
+ match self {
IOError::NotFound => io::ErrorKind::NotFound,
IOError::PermissionDenied => io::ErrorKind::PermissionDenied,
IOError::ConnectionRefused => io::ErrorKind::ConnectionRefused,
IOError::Interrupted => io::ErrorKind::Interrupted,
IOError::Other => io::ErrorKind::Other,
IOError::UnexpectedEof => io::ErrorKind::UnexpectedEof,
- }, "")
+ }
+ }
+ pub(crate) fn to_rust(&self) -> io::Error {
+ io::Error::new(self.to_rust_kind(), "")
}
}
fn drop(&mut self) {
if self.result_ok {
if unsafe { !self.contents.result.is_null() } {
- unsafe { Box::from_raw(self.contents.result) };
+ let _ = unsafe { Box::from_raw(self.contents.result) };
}
} else if unsafe { !self.contents.err.is_null() } {
- unsafe { Box::from_raw(self.contents.err) };
+ let _ = unsafe { Box::from_raw(self.contents.err) };
}
}
}
impl<T> Drop for SmartPtr<T> {
fn drop(&mut self) {
if self.ptr != core::ptr::null_mut() {
- unsafe { Box::from_raw(self.ptr); }
+ let _ = unsafe { Box::from_raw(self.ptr) };
}
}
}