X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=ldk-c-bindings;a=blobdiff_plain;f=lightning-c-bindings%2Fsrc%2Fc_types%2Fmod.rs;fp=lightning-c-bindings%2Fsrc%2Fc_types%2Fmod.rs;h=0c46581f20266e5abe23dfab1e1d151de0d2b40d;hp=f706b952456bce87448e707edc32526cdddb7ade;hb=c96981baf087d5441d079508ae71d2e046167ebf;hpb=eee35240eed2d8c8d104ed1b086fcd9b37f9db88

diff --git a/lightning-c-bindings/src/c_types/mod.rs b/lightning-c-bindings/src/c_types/mod.rs
index f706b95..0c46581 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,22 @@ 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")
+	}
+}
+
 #[repr(C)]
 #[derive(Copy, Clone)]
 /// Represents an error returned from libsecp256k1 during validation of some secp256k1 data