Add support for witnesses via a manual mapping

[ldk-c-bindings] / c-bindings-gen / src / types.rs

diff --git a/c-bindings-gen/src/types.rs b/c-bindings-gen/src/types.rs
index b022f3255fec41a27efd03701bf8d0ac933b2813..7132918f19bb44c293bf6cc22c8c81b232fd0a49 100644 (file)
--- a/c-bindings-gen/src/types.rs
+++ b/c-bindings-gen/src/types.rs
@@ -539,6 +539,7 @@ impl<'mod_lifetime, 'crate_lft: 'mod_lifetime> ImportResolver<'mod_lifetime, 'cr
                let mut imports = HashMap::new();
                // Add primitives to the "imports" list:
                Self::insert_primitive(&mut imports, "bool");
+               Self::insert_primitive(&mut imports, "u128");
                Self::insert_primitive(&mut imports, "u64");
                Self::insert_primitive(&mut imports, "u32");
                Self::insert_primitive(&mut imports, "u16");
@@ -797,7 +798,8 @@ impl FullLibraryAST {
 /// List of manually-generated types which are clonable
 fn initial_clonable_types() -> HashSet<String> {
        let mut res = HashSet::new();
-       res.insert("crate::c_types::u5".to_owned());
+       res.insert("crate::c_types::U5".to_owned());
+       res.insert("crate::c_types::U128".to_owned());
        res.insert("crate::c_types::FourBytes".to_owned());
        res.insert("crate::c_types::TwelveBytes".to_owned());
        res.insert("crate::c_types::SixteenBytes".to_owned());
@@ -806,6 +808,7 @@ fn initial_clonable_types() -> HashSet<String> {
        res.insert("crate::c_types::SecretKey".to_owned());
        res.insert("crate::c_types::PublicKey".to_owned());
        res.insert("crate::c_types::Transaction".to_owned());
+       res.insert("crate::c_types::Witness".to_owned());
        res.insert("crate::c_types::TxOut".to_owned());
        res.insert("crate::c_types::Signature".to_owned());
        res.insert("crate::c_types::RecoverableSignature".to_owned());
@@ -987,7 +990,8 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                        "core::num::ParseIntError" => Some("crate::c_types::Error"),
                        "core::str::Utf8Error" => Some("crate::c_types::Error"),
 
-                       "bitcoin::bech32::u5"|"bech32::u5" => Some("crate::c_types::u5"),
+                       "bitcoin::bech32::u5"|"bech32::u5" => Some("crate::c_types::U5"),
+                       "u128" => Some("crate::c_types::U128"),
                        "core::num::NonZeroU8" => Some("u8"),
 
                        "secp256k1::PublicKey"|"bitcoin::secp256k1::PublicKey" => Some("crate::c_types::PublicKey"),
@@ -1003,6 +1007,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                        "bitcoin::blockdata::script::Script" if !is_ref => Some("crate::c_types::derived::CVec_u8Z"),
                        "bitcoin::blockdata::transaction::OutPoint" => Some("crate::lightning::chain::transaction::OutPoint"),
                        "bitcoin::blockdata::transaction::Transaction"|"bitcoin::Transaction" => Some("crate::c_types::Transaction"),
+                       "bitcoin::Witness" => Some("crate::c_types::Witness"),
                        "bitcoin::blockdata::transaction::TxOut" if !is_ref => Some("crate::c_types::TxOut"),
                        "bitcoin::network::constants::Network" => Some("crate::bitcoin::network::Network"),
                        "bitcoin::util::address::WitnessVersion" => Some("crate::c_types::WitnessVersion"),
@@ -1075,6 +1080,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                        "std::time::SystemTime" => Some("(::std::time::SystemTime::UNIX_EPOCH + std::time::Duration::from_secs("),
 
                        "bitcoin::bech32::u5"|"bech32::u5" => Some(""),
+                       "u128" => Some(""),
                        "core::num::NonZeroU8" => Some("core::num::NonZeroU8::new("),
 
                        "bitcoin::secp256k1::PublicKey"|"secp256k1::PublicKey" if is_ref => Some("&"),
@@ -1091,6 +1097,8 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                        "bitcoin::blockdata::script::Script" if !is_ref => Some("::bitcoin::blockdata::script::Script::from("),
                        "bitcoin::blockdata::transaction::Transaction"|"bitcoin::Transaction" if is_ref => Some("&"),
                        "bitcoin::blockdata::transaction::Transaction"|"bitcoin::Transaction" => Some(""),
+                       "bitcoin::Witness" if is_ref => Some("&"),
+                       "bitcoin::Witness" => Some(""),
                        "bitcoin::blockdata::transaction::OutPoint" => Some("crate::c_types::C_to_bitcoin_outpoint("),
                        "bitcoin::blockdata::transaction::TxOut" if !is_ref => Some(""),
                        "bitcoin::network::constants::Network" => Some(""),
@@ -1164,6 +1172,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                        "std::time::SystemTime" => Some("))"),
 
                        "bitcoin::bech32::u5"|"bech32::u5" => Some(".into()"),
+                       "u128" => Some(".into()"),
                        "core::num::NonZeroU8" => Some(").expect(\"Value must be non-zero\")"),
 
                        "bitcoin::secp256k1::PublicKey"|"secp256k1::PublicKey" => Some(".into_rust()"),
@@ -1177,6 +1186,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                        "bitcoin::blockdata::script::Script" if is_ref => Some(".to_slice()))"),
                        "bitcoin::blockdata::script::Script" if !is_ref => Some(".into_rust())"),
                        "bitcoin::blockdata::transaction::Transaction"|"bitcoin::Transaction" => Some(".into_bitcoin()"),
+                       "bitcoin::Witness" => Some(".into_bitcoin()"),
                        "bitcoin::blockdata::transaction::OutPoint" => Some(")"),
                        "bitcoin::blockdata::transaction::TxOut" if !is_ref => Some(".into_rust()"),
                        "bitcoin::network::constants::Network" => Some(".into_bitcoin()"),
@@ -1261,6 +1271,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                        "core::str::Utf8Error" => Some("crate::c_types::Error { _dummy: 0 } /*"),
 
                        "bitcoin::bech32::u5"|"bech32::u5" => Some(""),
+                       "u128" => Some(""),
 
                        "bitcoin::secp256k1::PublicKey"|"secp256k1::PublicKey" => Some("crate::c_types::PublicKey::from_rust(&"),
                        "bitcoin::secp256k1::ecdsa::Signature" => Some("crate::c_types::Signature::from_rust(&"),
@@ -1274,6 +1285,8 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                        "bitcoin::blockdata::script::Script" if !is_ref => Some(""),
                        "bitcoin::blockdata::transaction::Transaction"|"bitcoin::Transaction" if is_ref => Some("crate::c_types::Transaction::from_bitcoin("),
                        "bitcoin::blockdata::transaction::Transaction"|"bitcoin::Transaction" => Some("crate::c_types::Transaction::from_bitcoin(&"),
+                       "bitcoin::Witness" if is_ref => Some("crate::c_types::Witness::from_bitcoin("),
+                       "bitcoin::Witness" if !is_ref => Some("crate::c_types::Witness::from_bitcoin(&"),
                        "bitcoin::blockdata::transaction::OutPoint" => Some("crate::c_types::bitcoin_to_C_outpoint("),
                        "bitcoin::blockdata::transaction::TxOut" if !is_ref => Some("crate::c_types::TxOut::from_rust("),
                        "bitcoin::network::constants::Network" => Some("crate::bitcoin::network::Network::from_bitcoin("),
@@ -1341,6 +1354,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                        "core::str::Utf8Error" => Some("*/"),
 
                        "bitcoin::bech32::u5"|"bech32::u5" => Some(".into()"),
+                       "u128" => Some(".into()"),
 
                        "bitcoin::secp256k1::PublicKey"|"secp256k1::PublicKey" => Some(")"),
                        "bitcoin::secp256k1::ecdsa::Signature" => Some(")"),
@@ -1353,6 +1367,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                        "bitcoin::blockdata::script::Script" if is_ref => Some("[..])"),
                        "bitcoin::blockdata::script::Script" if !is_ref => Some(".into_bytes().into()"),
                        "bitcoin::blockdata::transaction::Transaction"|"bitcoin::Transaction" => Some(")"),
+                       "bitcoin::Witness" => Some(")"),
                        "bitcoin::blockdata::transaction::OutPoint" => Some(")"),
                        "bitcoin::blockdata::transaction::TxOut" if !is_ref => Some(")"),
                        "bitcoin::network::constants::Network" => Some(")"),
@@ -2962,12 +2977,12 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                                        } else {
                                                let mut inner_c_ty = Vec::new();
                                                assert!(self.write_c_path_intern(&mut inner_c_ty, &p.path, generics, true, false, ptr_for_ref, with_ref_lifetime, c_ty));
-                                               if self.is_clonable(&String::from_utf8(inner_c_ty).unwrap()) {
-                                                       if let Some(id) = p.path.get_ident() {
-                                                               let mangled_container = format!("CVec_{}Z", id);
-                                                               write!(w, "{}::{}", Self::generated_container_path(), mangled_container).unwrap();
-                                                               self.check_create_container(mangled_container, "Vec", vec![&*s.elem], generics, false)
-                                                       } else { false }
+                                               let inner_ty_str = String::from_utf8(inner_c_ty).unwrap();
+                                               if self.is_clonable(&inner_ty_str) {
+                                                       let inner_ty_ident = inner_ty_str.rsplitn(2, "::").next().unwrap();
+                                                       let mangled_container = format!("CVec_{}Z", inner_ty_ident);
+                                                       write!(w, "{}::{}", Self::generated_container_path(), mangled_container).unwrap();
+                                                       self.check_create_container(mangled_container, "Vec", vec![&*s.elem], generics, false)
                                                } else { false }
                                        }
                                } else if let syn::Type::Reference(r) = &*s.elem {