X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning-c-bindings%2Fsrc%2Fc_types%2Fmod.rs;h=71616375aabfc10a5784650328cf0803f45c24f1;hb=5266836421190e74f893a3f9de5182057c2bd9b8;hp=f706b952456bce87448e707edc32526cdddb7ade;hpb=72fbdd92a0222420fe567ddf0743bc69f31fdd62;p=ldk-c-bindings

diff --git a/lightning-c-bindings/src/c_types/mod.rs b/lightning-c-bindings/src/c_types/mod.rs
index f706b95..7161637 100644
--- a/lightning-c-bindings/src/c_types/mod.rs
+++ b/lightning-c-bindings/src/c_types/mod.rs
@@ -11,6 +11,7 @@ use bitcoin::secp256k1::ecdsa::Signature as SecpSignature;
 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;
 
@@ -24,6 +25,8 @@ pub(crate) use core2::io::{self, Cursor, Read};
 #[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, `!`
@@ -53,10 +56,12 @@ impl Into<bech32::u5> for u5 {
 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)]
@@ -145,6 +150,28 @@ impl RecoverableSignature {
 	}
 }
 
+#[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
@@ -289,8 +316,8 @@ pub enum IOError {
 	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,
@@ -312,8 +339,11 @@ impl IOError {
 			_ => 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,
@@ -332,7 +362,10 @@ impl IOError {
 			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(), "")
 	}
 }
 
@@ -643,10 +676,10 @@ impl<O, E> Drop for CResultTempl<O, E> {
 	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) };
 		}
 	}
 }
@@ -747,7 +780,7 @@ impl<T> SmartPtr<T> {
 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) };
 		}
 	}
 }