update

Author: joemphilips

bindings/src/adaptors/primitives.rs

@@ -8,9 +8,15 @@ use bitcoin_hashes::sha256d::Hash as Sha256dHash;
 macro_rules! array_struct{
     ($name:ident, $ty:ty) => {
         #[repr(C)]
-        pub struct $name {
+        pub struct $name<'a> {
             ptr: *const $ty,
             len: u64,
+            _marker: std::marker::PhantomData<&'a $ty>
+        }
+        unsafe_impl!("Simulate the effect with `Unique<T>`" => impl<'a> Send for $name<'a> where $ty: Send{});
+        unsafe_impl!("Simulate the effect with `Unique<T>`" => impl<'a> Sync for $name<'a> where $ty: Sync{});
+        impl<'a> $name<'a> {
+            fn new(ptr: *const $ty, len: u64) -> Self { $name{ ptr: ptr, len: len, _marker: std::marker::PhantomData } }
         }
     }
 }
@@ -23,62 +29,62 @@ array_struct!(PublicKey, u8);
 
 array_struct!(FFISha256dHash, u8);
 
-impl From<&Sha256dHash> for FFISha256dHash {
+impl<'a> From<&Sha256dHash> for FFISha256dHash<'a> {
     fn from(hash: &Sha256dHash) -> Self {
         let len = hash.len() as u64;
         let ptr = hash.as_ptr();
-        FFISha256dHash { ptr: ptr, len: len, }
+        FFISha256dHash::new(ptr, len)
     }
 }
 
-impl From<Sha256dHash> for FFISha256dHash {
+impl<'a> From<Sha256dHash> for FFISha256dHash<'a> {
     fn from(hash: Sha256dHash) -> Self {
         let len = hash.len() as u64; let ptr = hash.as_ptr();
-        FFISha256dHash{ ptr: ptr, len: len, }
+        FFISha256dHash::new(ptr, len)
     }
 }
 
 
 array_struct!(FFIScript, u8);
 
-impl From<Script> for FFIScript {
+impl<'a> From<Script> for FFIScript<'a> {
     fn from(script: Script) -> Self {
         let len = script.len() as u64;
         let ptr = script.as_bytes().as_ptr();
-        FFIScript { ptr: ptr, len: len, }
+        FFIScript::new(ptr, len)
     }
 }
-impl From<&Script> for FFIScript {
+impl<'a> From<&Script> for FFIScript<'a> {
     fn from(script: &Script) -> Self {
         let len = script.len() as u64;
         let ptr = script.as_bytes().as_ptr();
-        FFIScript { ptr: ptr, len: len, }
+        FFIScript::new(ptr, len)
     }
 }
 
 #[repr(C)]
-pub struct FFIOutPoint {
-	pub txid: FFISha256dHash,
+pub struct FFIOutPoint<'a> {
+	pub txid: FFISha256dHash<'a>,
 	pub index: u16,
 }
 
 #[repr(C)]
-pub struct FFITxOut {
+pub struct FFITxOut<'a> {
     value: u64,
-    script_pubkey: FFIScript,
+    script_pubkey: FFIScript<'a>,
 }
 
 array_struct!(FFITransaction, u8);
-impl From<Transaction> for FFITransaction {
+impl<'a> From<Transaction> for FFITransaction<'a> {
     fn from(tx: Transaction) -> Self {
         let txb = serialize(&tx);
-        FFITransaction {
-            ptr: txb.as_ptr(),
-            len: txb.len() as u64,
-        }
+        FFITransaction::new(
+            txb.as_ptr(),
+            txb.len() as u64,
+        )
     }
 }
-impl From<&Transaction> for FFITransaction {
+impl<'a> From<&Transaction> for FFITransaction<'a> {
     fn from(tx: &Transaction) -> Self {
         Self::from(tx.clone())
     }

bindings/src/broadcaster.rs

@@ -9,16 +9,18 @@ use bitcoin::Transaction;
 use crate::handle::{Ref, Out, HandleShared};
 use crate::error::FFIResult;
 
+use lightning::chain::chaininterface::{BroadcasterInterface};
+
 #[cfg(feature = "debug_assertions")]
 #[repr(C)]
-struct BroadcasterWrapper {
+pub struct BroadcasterWrapper {
     broadcaster: Arc<FFIBroadCaster>,
 }
 
 #[cfg(feature = "debug_assertions")]
 impl BroadcasterWrapper {
     pub fn broadcast(&self, tx: &Transaction) {
-        self.broadcaster.broadcast_transaction(&tx)
+        self.broadcaster.as_ref().broadcast_transaction(&tx)
     }
 }
 type FFIBroadCasterHandle<'a> = HandleShared<'a, FFIBroadCaster>;
@@ -39,7 +41,7 @@ ffi! {
 }
 #[cfg(feature = "debug_assertions")]
 ffi! {
-    fn ffi_test_broadcaster(broadcaster_ptr: Ref<FFIBroadCaster>) -> FFIResult {
+    fn ffi_test_broadcaster(broadcaster_ptr: FFIBroadCasterHandle) -> FFIResult {
         let broadcaster = unsafe_block!("" => broadcaster_ptr.as_ref());
         let tx: Transaction = bitcoin::consensus::deserialize(&hex::decode("020000000001031cfbc8f54fbfa4a33a30068841371f80dbfe166211242213188428f437445c91000000006a47304402206fbcec8d2d2e740d824d3d36cc345b37d9f65d665a99f5bd5c9e8d42270a03a8022013959632492332200c2908459547bf8dbf97c65ab1a28dec377d6f1d41d3d63e012103d7279dfb90ce17fe139ba60a7c41ddf605b25e1c07a4ddcb9dfef4e7d6710f48feffffff476222484f5e35b3f0e43f65fc76e21d8be7818dd6a989c160b1e5039b7835fc00000000171600140914414d3c94af70ac7e25407b0689e0baa10c77feffffffa83d954a62568bbc99cc644c62eb7383d7c2a2563041a0aeb891a6a4055895570000000017160014795d04cc2d4f31480d9a3710993fbd80d04301dffeffffff06fef72f000000000017a91476fd7035cd26f1a32a5ab979e056713aac25796887a5000f00000000001976a914b8332d502a529571c6af4be66399cd33379071c588ac3fda0500000000001976a914fc1d692f8de10ae33295f090bea5fe49527d975c88ac522e1b00000000001976a914808406b54d1044c429ac54c0e189b0d8061667e088ac6eb68501000000001976a914dfab6085f3a8fb3e6710206a5a959313c5618f4d88acbba20000000000001976a914eb3026552d7e3f3073457d0bee5d4757de48160d88ac0002483045022100bee24b63212939d33d513e767bc79300051f7a0d433c3fcf1e0e3bf03b9eb1d70220588dc45a9ce3a939103b4459ce47500b64e23ab118dfc03c9caa7d6bfc32b9c601210354fd80328da0f9ae6eef2b3a81f74f9a6f66761fadf96f1d1d22b1fd6845876402483045022100e29c7e3a5efc10da6269e5fc20b6a1cb8beb92130cc52c67e46ef40aaa5cac5f0220644dd1b049727d991aece98a105563416e10a5ac4221abac7d16931842d5c322012103960b87412d6e169f30e12106bdf70122aabb9eb61f455518322a18b920a4dfa887d30700")?)?;
         broadcaster.broadcast_transaction(&tx);
@@ -48,9 +50,7 @@ ffi! {
     fn ffi_test_broadcaster_in_wrapper(broadcaster_ptr: Ref<FFIBroadCaster>, out: Out<BroadcasterWrapper>) -> FFIResult {
         let broadcaster = unsafe_block!("" => broadcaster_ptr.as_arc());
         let wrapper_raw = BroadcasterWrapper{ broadcaster: broadcaster };
-        let tx: Transaction = bitcoin::consensus::deserialize(&hex::decode("020000000001031cfbc8f54fbfa4a33a30068841371f80dbfe166211242213188428f437445c91000000006a47304402206fbcec8d2d2e740d824d3d36cc345b37d9f65d665a99f5bd5c9e8d42270a03a8022013959632492332200c2908459547bf8dbf97c65ab1a28dec377d6f1d41d3d63e012103d7279dfb90ce17fe139ba60a7c41ddf605b25e1c07a4ddcb9dfef4e7d6710f48feffffff476222484f5e35b3f0e43f65fc76e21d8be7818dd6a989c160b1e5039b7835fc00000000171600140914414d3c94af70ac7e25407b0689e0baa10c77feffffffa83d954a62568bbc99cc644c62eb7383d7c2a2563041a0aeb891a6a4055895570000000017160014795d04cc2d4f31480d9a3710993fbd80d04301dffeffffff06fef72f000000000017a91476fd7035cd26f1a32a5ab979e056713aac25796887a5000f00000000001976a914b8332d502a529571c6af4be66399cd33379071c588ac3fda0500000000001976a914fc1d692f8de10ae33295f090bea5fe49527d975c88ac522e1b00000000001976a914808406b54d1044c429ac54c0e189b0d8061667e088ac6eb68501000000001976a914dfab6085f3a8fb3e6710206a5a959313c5618f4d88acbba20000000000001976a914eb3026552d7e3f3073457d0bee5d4757de48160d88ac0002483045022100bee24b63212939d33d513e767bc79300051f7a0d433c3fcf1e0e3bf03b9eb1d70220588dc45a9ce3a939103b4459ce47500b64e23ab118dfc03c9caa7d6bfc32b9c601210354fd80328da0f9ae6eef2b3a81f74f9a6f66761fadf96f1d1d22b1fd6845876402483045022100e29c7e3a5efc10da6269e5fc20b6a1cb8beb92130cc52c67e46ef40aaa5cac5f0220644dd1b049727d991aece98a105563416e10a5ac4221abac7d16931842d5c322012103960b87412d6e169f30e12106bdf70122aabb9eb61f455518322a18b920a4dfa887d30700")?)?;
-        let wrapper = out.init(wrapper_raw);
-        wrapper_raw.broadcast(&tx);
+        unsafe_block!("" => out.init(wrapper_raw));
         FFIResult::ok()
     }