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;h=1e88f0521e53c8ce56372278b3dcb17d3e4db3e5;hp=98e964ff6efb5b7d20ec7fe419103ee25f98c6f0;hb=d4f7ca4bd4e16b9311b4d6bcd518e6bac2778fe4;hpb=4a8a65a3455e8164509ac48069a010e7c72fc639 diff --git a/lightning-c-bindings/src/c_types/mod.rs b/lightning-c-bindings/src/c_types/mod.rs index 98e964f..1e88f05 100644 --- a/lightning-c-bindings/src/c_types/mod.rs +++ b/lightning-c-bindings/src/c_types/mod.rs @@ -13,9 +13,15 @@ use bitcoin::secp256k1::recovery::RecoveryId; use bitcoin::secp256k1::recovery::RecoverableSignature as SecpRecoverableSignature; use bitcoin::bech32; -use std::convert::TryInto; // Bindings need at least rustc 1.34 +use core::convert::TryInto; // Bindings need at least rustc 1.34 use core::ffi::c_void; -use std::io::{Cursor, Read}; // TODO: We should use core2 here when we support no_std + +#[cfg(feature = "std")] +pub(crate) use std::io::{self, Cursor, Read}; +#[cfg(feature = "no-std")] +pub(crate) use core2::io::{self, Cursor, Read}; +#[cfg(feature = "no-std")] +use alloc::{boxed::Box, vec::Vec, string::String}; #[repr(C)] /// A dummy struct of which an instance must never exist. @@ -61,6 +67,7 @@ impl PublicKey { } #[repr(C)] +#[derive(Clone)] /// Represents a valid secp256k1 secret key serialized as a 32 byte array. pub struct SecretKey { /// The bytes of the secret key @@ -162,6 +169,77 @@ impl Secp256k1Error { SecpError::NotEnoughMemory => Secp256k1Error::NotEnoughMemory, } } + pub(crate) fn into_rust(self) -> SecpError { + match self { + Secp256k1Error::IncorrectSignature => SecpError::IncorrectSignature, + Secp256k1Error::InvalidMessage => SecpError::InvalidMessage, + Secp256k1Error::InvalidPublicKey => SecpError::InvalidPublicKey, + Secp256k1Error::InvalidSignature => SecpError::InvalidSignature, + Secp256k1Error::InvalidSecretKey => SecpError::InvalidSecretKey, + Secp256k1Error::InvalidRecoveryId => SecpError::InvalidRecoveryId, + Secp256k1Error::InvalidTweak => SecpError::InvalidTweak, + Secp256k1Error::TweakCheckFailed => SecpError::TweakCheckFailed, + Secp256k1Error::NotEnoughMemory => SecpError::NotEnoughMemory, + } + } +} + +#[repr(C)] +#[derive(Copy, Clone)] +/// Represents an error returned from the bech32 library during validation of some bech32 data +pub enum Bech32Error { + /// String does not contain the separator character + MissingSeparator, + /// The checksum does not match the rest of the data + InvalidChecksum, + /// The data or human-readable part is too long or too short + InvalidLength, + /// Some part of the string contains an invalid character + InvalidChar(u32), + /// Some part of the data has an invalid value + InvalidData(u8), + /// The bit conversion failed due to a padding issue + InvalidPadding, + /// The whole string must be of one case + MixedCase, +} +impl Bech32Error { + pub(crate) fn from_rust(err: bech32::Error) -> Self { + match err { + bech32::Error::MissingSeparator => Self::MissingSeparator, + bech32::Error::InvalidChecksum => Self::InvalidChecksum, + bech32::Error::InvalidLength => Self::InvalidLength, + bech32::Error::InvalidChar(c) => Self::InvalidChar(c as u32), + bech32::Error::InvalidData(d) => Self::InvalidData(d), + bech32::Error::InvalidPadding => Self::InvalidPadding, + bech32::Error::MixedCase => Self::MixedCase, + } + } + pub(crate) fn into_rust(self) -> bech32::Error { + match self { + Self::MissingSeparator => bech32::Error::MissingSeparator, + Self::InvalidChecksum => bech32::Error::InvalidChecksum, + Self::InvalidLength => bech32::Error::InvalidLength, + Self::InvalidChar(c) => bech32::Error::InvalidChar(core::char::from_u32(c).expect("Invalid UTF-8 character in Bech32Error::InvalidChar")), + Self::InvalidData(d) => bech32::Error::InvalidData(d), + Self::InvalidPadding => bech32::Error::InvalidPadding, + Self::MixedCase => bech32::Error::MixedCase, + } + } +} +#[no_mangle] +/// Creates a new Bech32Error which has the same data as `orig` +pub extern "C" fn Bech32Error_clone(orig: &Bech32Error) -> Bech32Error { orig.clone() } +#[no_mangle] +/// Releases any memory held by the given `Bech32Error` (which is currently none) +pub extern "C" fn Bech32Error_free(o: Bech32Error) { } + +#[repr(C)] +#[derive(Clone, Copy, PartialEq)] +/// Sub-errors which don't have specific information in them use this type. +pub struct Error { + /// Zero-Sized_types aren't consistent across Rust/C/C++, so we add some size here + pub _dummy: u8, } #[repr(C)] @@ -188,6 +266,7 @@ pub enum IOError { Other, UnexpectedEof, } +#[cfg(feature = "std")] impl IOError { pub(crate) fn from_rust(err: std::io::Error) -> Self { match err.kind() { @@ -272,7 +351,7 @@ impl Transaction { } pub(crate) fn into_bitcoin(&self) -> BitcoinTransaction { if self.datalen == 0 { panic!("0-length buffer can never represent a valid Transaction"); } - ::bitcoin::consensus::encode::deserialize(unsafe { std::slice::from_raw_parts(self.data, self.datalen) }).unwrap() + ::bitcoin::consensus::encode::deserialize(unsafe { core::slice::from_raw_parts(self.data, self.datalen) }).unwrap() } pub(crate) fn from_bitcoin(btc: &BitcoinTransaction) -> Self { let vec = ::bitcoin::consensus::encode::serialize(btc); @@ -288,7 +367,7 @@ impl Drop for Transaction { } impl Clone for Transaction { fn clone(&self) -> Self { - let sl = unsafe { std::slice::from_raw_parts(self.data, self.datalen) }; + let sl = unsafe { core::slice::from_raw_parts(self.data, self.datalen) }; let mut v = Vec::new(); v.extend_from_slice(&sl); Self::from_vec(v) @@ -365,7 +444,7 @@ impl u8slice { } pub(crate) fn to_slice(&self) -> &[u8] { if self.datalen == 0 { return &[]; } - unsafe { std::slice::from_raw_parts(self.data, self.datalen) } + unsafe { core::slice::from_raw_parts(self.data, self.datalen) } } pub(crate) fn to_reader<'a>(&'a self) -> Cursor<&'a [u8]> { let sl = self.to_slice(); @@ -404,8 +483,8 @@ pub struct ThreeBytes { /** The three bytes */ pub data: [u8; 3], } pub struct FourBytes { /** The four bytes */ pub data: [u8; 4], } #[derive(Clone)] #[repr(C)] -/// A 10-byte byte array. -pub struct TenBytes { /** The ten bytes */ pub data: [u8; 10], } +/// A 12-byte byte array. +pub struct TwelveBytes { /** The twelve bytes */ pub data: [u8; 12], } #[derive(Clone)] #[repr(C)] /// A 16-byte byte array. @@ -417,7 +496,7 @@ pub struct TwentyBytes { /** The twenty bytes */ pub data: [u8; 20], } pub(crate) struct VecWriter(pub Vec); impl lightning::util::ser::Writer for VecWriter { - fn write_all(&mut self, buf: &[u8]) -> Result<(), ::std::io::Error> { + fn write_all(&mut self, buf: &[u8]) -> Result<(), io::Error> { self.0.extend_from_slice(buf); Ok(()) } @@ -463,20 +542,20 @@ impl Into for &mut &'static str { impl Str { pub(crate) fn into_str(&self) -> &'static str { if self.len == 0 { return ""; } - std::str::from_utf8(unsafe { std::slice::from_raw_parts(self.chars, self.len) }).unwrap() + core::str::from_utf8(unsafe { core::slice::from_raw_parts(self.chars, self.len) }).unwrap() } pub(crate) fn into_string(mut self) -> String { let bytes = if self.len == 0 { Vec::new() } else if self.chars_is_owned { let ret = unsafe { - Box::from_raw(std::slice::from_raw_parts_mut(unsafe { self.chars as *mut u8 }, self.len)) + Box::from_raw(core::slice::from_raw_parts_mut(unsafe { self.chars as *mut u8 }, self.len)) }.into(); self.chars_is_owned = false; ret } else { let mut ret = Vec::with_capacity(self.len); - ret.extend_from_slice(unsafe { std::slice::from_raw_parts(self.chars, self.len) }); + ret.extend_from_slice(unsafe { core::slice::from_raw_parts(self.chars, self.len) }); ret }; String::from_utf8(bytes).unwrap() @@ -558,20 +637,23 @@ pub(crate) trait TakePointer { impl TakePointer<*const T> for *const T { fn take_ptr(&mut self) -> *const T { let ret = *self; - *self = std::ptr::null(); + *self = core::ptr::null(); ret } } impl TakePointer<*mut T> for *mut T { fn take_ptr(&mut self) -> *mut T { let ret = *self; - *self = std::ptr::null_mut(); + *self = core::ptr::null_mut(); ret } } pub(crate) mod ObjOps { + #[cfg(feature = "no-std")] + use alloc::boxed::Box; + #[inline] #[must_use = "returns new dangling pointer"] pub(crate) fn heap_alloc(obj: T) -> *mut T { @@ -638,17 +720,17 @@ impl SmartPtr { Self { ptr: Box::into_raw(Box::new(o)) } } pub(crate) fn null() -> Self { - Self { ptr: std::ptr::null_mut() } + Self { ptr: core::ptr::null_mut() } } } impl Drop for SmartPtr { fn drop(&mut self) { - if self.ptr != std::ptr::null_mut() { + if self.ptr != core::ptr::null_mut() { unsafe { Box::from_raw(self.ptr); } } } } -impl std::ops::Deref for SmartPtr { +impl core::ops::Deref for SmartPtr { type Target = *mut T; fn deref(&self) -> &*mut T { &self.ptr