X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=ldk-c-bindings;a=blobdiff_plain;f=lightning-c-bindings%2Fsrc%2Flightning%2Fln%2Fscript.rs;h=fe5c68110db96e0d945e71b0595b3eb811e56e6a;hp=dcb49ddf51dddb80f54edee13e373c04e4cf86ec;hb=1eaf50a3d9f777b462ff1817678473567a00eb75;hpb=696382c9fbc707aa5226f73910625136adb724fd diff --git a/lightning-c-bindings/src/lightning/ln/script.rs b/lightning-c-bindings/src/lightning/ln/script.rs index dcb49dd..fe5c681 100644 --- a/lightning-c-bindings/src/lightning/ln/script.rs +++ b/lightning-c-bindings/src/lightning/ln/script.rs @@ -8,14 +8,17 @@ //! Abstractions for scripts used in the Lightning Network. -use std::str::FromStr; -use std::ffi::c_void; +use alloc::str::FromStr; +use core::ffi::c_void; +use core::convert::Infallible; use bitcoin::hashes::Hash; use crate::c_types::*; +#[cfg(feature="no-std")] +use alloc::{vec::Vec, boxed::Box}; use lightning::ln::script::ShutdownScript as nativeShutdownScriptImport; -type nativeShutdownScript = nativeShutdownScriptImport; +pub(crate) type nativeShutdownScript = nativeShutdownScriptImport; /// A script pubkey for shutting down a channel as defined by [BOLT #2]. /// @@ -47,7 +50,7 @@ impl Drop for ShutdownScript { pub extern "C" fn ShutdownScript_free(this_obj: ShutdownScript) { } #[allow(unused)] /// Used only if an object of this type is returned as a trait impl by a method -extern "C" fn ShutdownScript_free_void(this_ptr: *mut c_void) { +pub(crate) extern "C" fn ShutdownScript_free_void(this_ptr: *mut c_void) { unsafe { let _ = Box::from_raw(this_ptr as *mut nativeShutdownScript); } } #[allow(unused)] @@ -62,14 +65,14 @@ impl ShutdownScript { pub(crate) fn take_inner(mut self) -> *mut nativeShutdownScript { assert!(self.is_owned); let ret = ObjOps::untweak_ptr(self.inner); - self.inner = std::ptr::null_mut(); + self.inner = core::ptr::null_mut(); ret } } impl Clone for ShutdownScript { fn clone(&self) -> Self { Self { - inner: if <*mut nativeShutdownScript>::is_null(self.inner) { std::ptr::null_mut() } else { + inner: if <*mut nativeShutdownScript>::is_null(self.inner) { core::ptr::null_mut() } else { ObjOps::heap_alloc(unsafe { &*ObjOps::untweak_ptr(self.inner) }.clone()) }, is_owned: true, } @@ -87,7 +90,7 @@ pub extern "C" fn ShutdownScript_clone(orig: &ShutdownScript) -> ShutdownScript } use lightning::ln::script::InvalidShutdownScript as nativeInvalidShutdownScriptImport; -type nativeInvalidShutdownScript = nativeInvalidShutdownScriptImport; +pub(crate) type nativeInvalidShutdownScript = nativeInvalidShutdownScriptImport; /// An error occurring when converting from [`Script`] to [`ShutdownScript`]. #[must_use] @@ -117,7 +120,7 @@ impl Drop for InvalidShutdownScript { pub extern "C" fn InvalidShutdownScript_free(this_obj: InvalidShutdownScript) { } #[allow(unused)] /// Used only if an object of this type is returned as a trait impl by a method -extern "C" fn InvalidShutdownScript_free_void(this_ptr: *mut c_void) { +pub(crate) extern "C" fn InvalidShutdownScript_free_void(this_ptr: *mut c_void) { unsafe { let _ = Box::from_raw(this_ptr as *mut nativeInvalidShutdownScript); } } #[allow(unused)] @@ -132,7 +135,7 @@ impl InvalidShutdownScript { pub(crate) fn take_inner(mut self) -> *mut nativeInvalidShutdownScript { assert!(self.is_owned); let ret = ObjOps::untweak_ptr(self.inner); - self.inner = std::ptr::null_mut(); + self.inner = core::ptr::null_mut(); ret } } @@ -159,6 +162,25 @@ pub extern "C" fn InvalidShutdownScript_new(mut script_arg: crate::c_types::deri script: ::bitcoin::blockdata::script::Script::from(script_arg.into_rust()), }), is_owned: true } } +impl Clone for InvalidShutdownScript { + fn clone(&self) -> Self { + Self { + inner: if <*mut nativeInvalidShutdownScript>::is_null(self.inner) { core::ptr::null_mut() } else { + ObjOps::heap_alloc(unsafe { &*ObjOps::untweak_ptr(self.inner) }.clone()) }, + is_owned: true, + } + } +} +#[allow(unused)] +/// Used only if an object of this type is returned as a trait impl by a method +pub(crate) extern "C" fn InvalidShutdownScript_clone_void(this_ptr: *const c_void) -> *mut c_void { + Box::into_raw(Box::new(unsafe { (*(this_ptr as *mut nativeInvalidShutdownScript)).clone() })) as *mut c_void +} +#[no_mangle] +/// Creates a copy of the InvalidShutdownScript +pub extern "C" fn InvalidShutdownScript_clone(orig: &InvalidShutdownScript) -> InvalidShutdownScript { + orig.clone() +} #[no_mangle] /// Serialize the ShutdownScript object into a byte array which can be read by ShutdownScript_read pub extern "C" fn ShutdownScript_write(obj: &ShutdownScript) -> crate::c_types::derived::CVec_u8Z { @@ -171,26 +193,10 @@ pub(crate) extern "C" fn ShutdownScript_write_void(obj: *const c_void) -> crate: #[no_mangle] /// Read a ShutdownScript from a byte array, created by ShutdownScript_write pub extern "C" fn ShutdownScript_read(ser: crate::c_types::u8slice) -> crate::c_types::derived::CResult_ShutdownScriptDecodeErrorZ { - let res = crate::c_types::deserialize_obj(ser); + let res: Result = crate::c_types::deserialize_obj(ser); let mut local_res = match res { Ok(mut o) => crate::c_types::CResultTempl::ok( { crate::lightning::ln::script::ShutdownScript { inner: ObjOps::heap_alloc(o), is_owned: true } }).into(), Err(mut e) => crate::c_types::CResultTempl::err( { crate::lightning::ln::msgs::DecodeError { inner: ObjOps::heap_alloc(e), is_owned: true } }).into() }; local_res } -/// Generates a P2PKH script pubkey from the given [`PubkeyHash`]. -#[must_use] -#[no_mangle] -pub extern "C" fn ShutdownScript_new_p2pkh(pubkey_hash: *const [u8; 20]) -> ShutdownScript { - let mut ret = lightning::ln::script::ShutdownScript::new_p2pkh(&bitcoin::hash_types::PubkeyHash::from_hash(bitcoin::hashes::Hash::from_inner(unsafe { *pubkey_hash }.clone()))); - ShutdownScript { inner: ObjOps::heap_alloc(ret), is_owned: true } -} - -/// Generates a P2SH script pubkey from the given [`ScriptHash`]. -#[must_use] -#[no_mangle] -pub extern "C" fn ShutdownScript_new_p2sh(script_hash: *const [u8; 20]) -> ShutdownScript { - let mut ret = lightning::ln::script::ShutdownScript::new_p2sh(&bitcoin::hash_types::ScriptHash::from_hash(bitcoin::hashes::Hash::from_inner(unsafe { *script_hash }.clone()))); - ShutdownScript { inner: ObjOps::heap_alloc(ret), is_owned: true } -} - /// Generates a P2WPKH script pubkey from the given [`WPubkeyHash`]. #[must_use] #[no_mangle] @@ -207,7 +213,10 @@ pub extern "C" fn ShutdownScript_new_p2wsh(script_hash: *const [u8; 32]) -> Shut ShutdownScript { inner: ObjOps::heap_alloc(ret), is_owned: true } } -/// Generates a P2WSH script pubkey from the given segwit version and program. +/// Generates a witness script pubkey from the given segwit version and program. +/// +/// Note for version-zero witness scripts you must use [`ShutdownScript::new_p2wpkh`] or +/// [`ShutdownScript::new_p2wsh`] instead. /// /// # Errors ///