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=09c8a5147d4c096fea4c1313af2497a659072269;hp=b6b1bbf0ac85a60025ee97aa5a578059ab973f71;hb=ed6eb46f7b4e0d4c869ad08dffc600b4e93e2129;hpb=47b7d6e36914774534f4a80315c8d38e0424a2db

diff --git a/lightning-c-bindings/src/c_types/mod.rs b/lightning-c-bindings/src/c_types/mod.rs
index b6b1bbf..09c8a51 100644
--- a/lightning-c-bindings/src/c_types/mod.rs
+++ b/lightning-c-bindings/src/c_types/mod.rs
@@ -114,6 +114,7 @@ impl RecoverableSignature {
 }
 
 #[repr(C)]
+#[derive(Copy, Clone)]
 /// Represents an error returned from libsecp256k1 during validation of some secp256k1 data
 pub enum Secp256k1Error {
 	/// Signature failed verification
@@ -153,6 +154,7 @@ impl Secp256k1Error {
 
 #[repr(C)]
 #[allow(missing_docs)] // If there's no docs upstream, that's good enough for us
+#[derive(Clone, Copy, PartialEq)]
 /// Represents an IO Error. Note that some information is lost in the conversion from Rust.
 pub enum IOError {
 	NotFound,
@@ -247,12 +249,7 @@ pub struct Transaction {
 	pub data_is_owned: bool,
 }
 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()
-	}
-	pub(crate) fn from_bitcoin(btc: &BitcoinTransaction) -> Self {
-		let vec = ::bitcoin::consensus::encode::serialize(btc);
+	fn from_vec(vec: Vec<u8>) -> Self {
 		let datalen = vec.len();
 		let data = Box::into_raw(vec.into_boxed_slice());
 		Self {
@@ -261,6 +258,14 @@ impl Transaction {
 			data_is_owned: true,
 		}
 	}
+	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()
+	}
+	pub(crate) fn from_bitcoin(btc: &BitcoinTransaction) -> Self {
+		let vec = ::bitcoin::consensus::encode::serialize(btc);
+		Self::from_vec(vec)
+	}
 }
 impl Drop for Transaction {
 	fn drop(&mut self) {
@@ -269,6 +274,14 @@ 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 mut v = Vec::new();
+		v.extend_from_slice(&sl);
+		Self::from_vec(v)
+	}
+}
 #[no_mangle]
 /// Frees the data buffer, if data_is_owned is set and datalen > 0.
 pub extern "C" fn Transaction_free(_res: Transaction) { }
@@ -302,6 +315,12 @@ impl TxOut {
 		}
 	}
 }
+
+#[no_mangle]
+/// Convenience function for constructing a new TxOut
+pub extern "C" fn TxOut_new(script_pubkey: derived::CVec_u8Z, value: u64) -> TxOut {
+	TxOut { script_pubkey, value }
+}
 #[no_mangle]
 /// Frees the data pointed to by script_pubkey.
 pub extern "C" fn TxOut_free(_res: TxOut) { }
@@ -508,3 +527,51 @@ impl<T> TakePointer<*mut T> for *mut T {
 		ret
 	}
 }
+
+
+pub(crate) mod ObjOps {
+	#[inline]
+	#[must_use = "returns new dangling pointer"]
+	pub(crate) fn heap_alloc<T>(obj: T) -> *mut T {
+		let ptr = Box::into_raw(Box::new(obj));
+		nonnull_ptr_to_inner(ptr)
+	}
+	#[inline]
+	pub(crate) fn nonnull_ptr_to_inner<T>(ptr: *const T) -> *mut T {
+		if core::mem::size_of::<T>() == 0 {
+			// We map `None::<T>` as `T { inner: null, .. }` which works great for all
+			// non-Zero-Sized-Types `T`.
+			// For ZSTs, we need to differentiate between null implying `None` and null implying
+			// `Some` with no allocation.
+			// Thus, for ZSTs, we add one (usually) page here, which should always be aligned.
+			// Note that this relies on undefined behavior! A pointer to NULL may be valid, but a
+			// pointer to NULL + 4096 is almost certainly not. That said, Rust's existing use of
+			// `(*mut T)1` for the pointer we're adding to is also not defined, so we should be
+			// fine.
+			// Note that we add 4095 here as at least the Java client assumes that the low bit on
+			// any heap pointer is 0, which is generally provided by malloc, but which is not true
+			// for ZSTs "allocated" by `Box::new`.
+			debug_assert_eq!(ptr as usize, 1);
+			unsafe { (ptr as *mut T).cast::<u8>().add(4096 - 1).cast::<T>() }
+		} else {
+			// In order to get better test coverage, also increment non-ZST pointers with
+			// --cfg=test_mod_pointers, which is set in genbindings.sh for debug builds.
+			#[cfg(test_mod_pointers)]
+			unsafe { (ptr as *mut T).cast::<u8>().add(4096).cast::<T>() }
+			#[cfg(not(test_mod_pointers))]
+			unsafe { ptr as *mut T }
+		}
+	}
+	#[inline]
+	/// Invert nonnull_ptr_to_inner
+	pub(crate) fn untweak_ptr<T>(ptr: *mut T) -> *mut T {
+		if core::mem::size_of::<T>() == 0 {
+			unsafe { ptr.cast::<u8>().sub(4096 - 1).cast::<T>() }
+		} else {
+			#[cfg(test_mod_pointers)]
+			unsafe { ptr.cast::<u8>().sub(4096).cast::<T>() }
+			#[cfg(not(test_mod_pointers))]
+			ptr
+		}
+	}
+}