Crack `ReadableArgs` params when they're tuples
[ldk-c-bindings] / c-bindings-gen / src / main.rs
index 1976160f84e4148f8cd086879605e784be407135..d62b2a315f5b366ec03c51fb44924a0abdf54120 100644 (file)
@@ -33,7 +33,15 @@ mod blocks;
 use types::*;
 use blocks::*;
 
-const DEFAULT_IMPORTS: &'static str = "\nuse std::str::FromStr;\nuse std::ffi::c_void;\nuse core::convert::Infallible;\nuse bitcoin::hashes::Hash;\nuse crate::c_types::*;\n";
+const DEFAULT_IMPORTS: &'static str = "
+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};
+";
 
 // *************************************
 // *** Manually-expanded conversions ***
@@ -84,9 +92,9 @@ fn maybe_convert_trait_impl<W: std::io::Write>(w: &mut W, trait_path: &syn::Path
                                        writeln!(w, "}}").unwrap();
                                }
                        },
-                       "lightning::util::ser::Readable"|"lightning::util::ser::ReadableArgs" => {
+                       "lightning::util::ser::Readable"|"lightning::util::ser::ReadableArgs"|"lightning::util::ser::MaybeReadable" => {
                                // Create the Result<Object, DecodeError> syn::Type
-                               let res_ty: syn::Type = parse_quote!(Result<#for_ty, ::ln::msgs::DecodeError>);
+                               let mut res_ty: syn::Type = parse_quote!(Result<#for_ty, ::ln::msgs::DecodeError>);
 
                                writeln!(w, "#[no_mangle]").unwrap();
                                writeln!(w, "/// Read a {} from a byte array, created by {}_write", for_obj, for_obj).unwrap();
@@ -94,23 +102,48 @@ fn maybe_convert_trait_impl<W: std::io::Write>(w: &mut W, trait_path: &syn::Path
 
                                let mut arg_conv = Vec::new();
                                if t == "lightning::util::ser::ReadableArgs" {
-                                       write!(w, ", arg: ").unwrap();
                                        assert!(trait_path.leading_colon.is_none());
                                        let args_seg = trait_path.segments.iter().last().unwrap();
                                        assert_eq!(format!("{}", args_seg.ident), "ReadableArgs");
                                        if let syn::PathArguments::AngleBracketed(args) = &args_seg.arguments {
                                                assert_eq!(args.args.len(), 1);
                                                if let syn::GenericArgument::Type(args_ty) = args.args.iter().next().unwrap() {
-                                                       types.write_c_type(w, args_ty, Some(generics), false);
+                                                       macro_rules! write_arg_conv {
+                                                               ($ty: expr, $arg_name: expr) => {
+                                                                       write!(w, ", {}: ", $arg_name).unwrap();
+                                                                       types.write_c_type(w, $ty, Some(generics), false);
+
+                                                                       write!(&mut arg_conv, "\t").unwrap();
+                                                                       if types.write_from_c_conversion_new_var(&mut arg_conv, &format_ident!("{}", $arg_name), &$ty, Some(generics)) {
+                                                                               write!(&mut arg_conv, "\n\t").unwrap();
+                                                                       }
 
-                                                       assert!(!types.write_from_c_conversion_new_var(&mut arg_conv, &format_ident!("arg"), &args_ty, Some(generics)));
+                                                                       write!(&mut arg_conv, "let {}_conv = ", $arg_name).unwrap();
+                                                                       types.write_from_c_conversion_prefix(&mut arg_conv, &$ty, Some(generics));
+                                                                       write!(&mut arg_conv, "{}", $arg_name).unwrap();
+                                                                       types.write_from_c_conversion_suffix(&mut arg_conv, &$ty, Some(generics));
+                                                                       write!(&mut arg_conv, ";\n").unwrap();
+                                                               }
+                                                       }
 
-                                                       write!(&mut arg_conv, "\tlet arg_conv = ").unwrap();
-                                                       types.write_from_c_conversion_prefix(&mut arg_conv, &args_ty, Some(generics));
-                                                       write!(&mut arg_conv, "arg").unwrap();
-                                                       types.write_from_c_conversion_suffix(&mut arg_conv, &args_ty, Some(generics));
+                                                       if let syn::Type::Tuple(tup) = args_ty {
+                                                               // Crack open tuples and make them separate arguments instead of
+                                                               // converting the full tuple. This makes it substantially easier to
+                                                               // reason about things like references in the tuple fields.
+                                                               let mut arg_conv_res = Vec::new();
+                                                               for (idx, elem) in tup.elems.iter().enumerate() {
+                                                                       let arg_name = format!("arg_{}", ('a' as u8 + idx as u8) as char);
+                                                                       write_arg_conv!(elem, arg_name);
+                                                                       write!(&mut arg_conv_res, "{}_conv{}", arg_name, if idx != tup.elems.len() - 1 { ", " } else { "" }).unwrap();
+                                                               }
+                                                               writeln!(&mut arg_conv, "\tlet arg_conv = ({});", String::from_utf8(arg_conv_res).unwrap()).unwrap();
+                                                       } else {
+                                                               write_arg_conv!(args_ty, "arg");
+                                                       }
                                                } else { unreachable!(); }
                                        } else { unreachable!(); }
+                               } else if t == "lightning::util::ser::MaybeReadable" {
+                                       res_ty = parse_quote!(Result<Option<#for_ty>, ::ln::msgs::DecodeError>);
                                }
                                write!(w, ") -> ").unwrap();
                                types.write_c_type(w, &res_ty, Some(generics), false);
@@ -118,12 +151,18 @@ fn maybe_convert_trait_impl<W: std::io::Write>(w: &mut W, trait_path: &syn::Path
 
                                if t == "lightning::util::ser::ReadableArgs" {
                                        w.write(&arg_conv).unwrap();
-                                       write!(w, ";\n\tlet res: ").unwrap();
-                                       // At least in one case we need type annotations here, so provide them.
-                                       types.write_rust_type(w, Some(generics), &res_ty);
+                               }
+
+                               write!(w, "\tlet res: ").unwrap();
+                               // At least in one case we need type annotations here, so provide them.
+                               types.write_rust_type(w, Some(generics), &res_ty);
+
+                               if t == "lightning::util::ser::ReadableArgs" {
                                        writeln!(w, " = crate::c_types::deserialize_obj_arg(ser, arg_conv);").unwrap();
+                               } else if t == "lightning::util::ser::MaybeReadable" {
+                                       writeln!(w, " = crate::c_types::maybe_deserialize_obj(ser);").unwrap();
                                } else {
-                                       writeln!(w, "\tlet res = crate::c_types::deserialize_obj(ser);").unwrap();
+                                       writeln!(w, " = crate::c_types::deserialize_obj(ser);").unwrap();
                                }
                                write!(w, "\t").unwrap();
                                if types.write_to_c_conversion_new_var(w, &format_ident!("res"), &res_ty, Some(generics), false) {
@@ -166,7 +205,7 @@ fn do_write_impl_trait<W: std::io::Write>(w: &mut W, trait_path: &str, _trait_na
        match trait_path {
                "lightning::util::ser::Writeable" => {
                        writeln!(w, "impl {} for {} {{", trait_path, for_obj).unwrap();
-                       writeln!(w, "\tfn write<W: lightning::util::ser::Writer>(&self, w: &mut W) -> Result<(), ::std::io::Error> {{").unwrap();
+                       writeln!(w, "\tfn write<W: lightning::util::ser::Writer>(&self, w: &mut W) -> Result<(), crate::c_types::io::Error> {{").unwrap();
                        writeln!(w, "\t\tlet vec = (self.write)(self.this_arg);").unwrap();
                        writeln!(w, "\t\tw.write_all(vec.as_slice())").unwrap();
                        writeln!(w, "\t}}\n}}").unwrap();
@@ -482,13 +521,18 @@ fn writeln_trait<'a, 'b, W: std::io::Write>(w: &mut W, t: &'a syn::ItemTrait, ty
                                        &syn::TraitItem::Type(ref t) => {
                                                if t.default.is_some() || t.generics.lt_token.is_some() { unimplemented!(); }
                                                let mut bounds_iter = t.bounds.iter();
-                                               match bounds_iter.next().unwrap() {
-                                                       syn::TypeParamBound::Trait(tr) => {
-                                                               writeln!(w, "\ttype {} = crate::{};", t.ident, $type_resolver.resolve_path(&tr.path, Some(&gen_types))).unwrap();
-                                                       },
-                                                       _ => unimplemented!(),
+                                               loop {
+                                                       match bounds_iter.next().unwrap() {
+                                                               syn::TypeParamBound::Trait(tr) => {
+                                                                       writeln!(w, "\ttype {} = crate::{};", t.ident, $type_resolver.resolve_path(&tr.path, Some(&gen_types))).unwrap();
+                                                                       for bound in bounds_iter {
+                                                                               if let syn::TypeParamBound::Trait(_) = bound { unimplemented!(); }
+                                                                       }
+                                                                       break;
+                                                               },
+                                                               syn::TypeParamBound::Lifetime(_) => {},
+                                                       }
                                                }
-                                               if bounds_iter.next().is_some() { unimplemented!(); }
                                        },
                                        _ => unimplemented!(),
                                }
@@ -516,13 +560,13 @@ fn writeln_trait<'a, 'b, W: std::io::Write>(w: &mut W, t: &'a syn::ItemTrait, ty
        // Implement supertraits for the C-mapped struct.
        walk_supertraits!(t, Some(&types), (
                ("std::cmp::Eq", _)|("core::cmp::Eq", _) => {
-                       writeln!(w, "impl std::cmp::Eq for {} {{}}", trait_name).unwrap();
-                       writeln!(w, "impl std::cmp::PartialEq for {} {{", trait_name).unwrap();
+                       writeln!(w, "impl core::cmp::Eq for {} {{}}", trait_name).unwrap();
+                       writeln!(w, "impl core::cmp::PartialEq for {} {{", trait_name).unwrap();
                        writeln!(w, "\tfn eq(&self, o: &Self) -> bool {{ (self.eq)(self.this_arg, o) }}\n}}").unwrap();
                },
                ("std::hash::Hash", _)|("core::hash::Hash", _) => {
-                       writeln!(w, "impl std::hash::Hash for {} {{", trait_name).unwrap();
-                       writeln!(w, "\tfn hash<H: std::hash::Hasher>(&self, hasher: &mut H) {{ hasher.write_u64((self.hash)(self.this_arg)) }}\n}}").unwrap();
+                       writeln!(w, "impl core::hash::Hash for {} {{", trait_name).unwrap();
+                       writeln!(w, "\tfn hash<H: core::hash::Hasher>(&self, hasher: &mut H) {{ hasher.write_u64((self.hash)(self.this_arg)) }}\n}}").unwrap();
                },
                ("Send", _) => {}, ("Sync", _) => {},
                ("Clone", _) => {
@@ -568,7 +612,7 @@ fn writeln_trait<'a, 'b, W: std::io::Write>(w: &mut W, t: &'a syn::ItemTrait, ty
                writeln!(w, "}}\n").unwrap();
                writeln!(w, "// We're essentially a pointer already, or at least a set of pointers, so allow us to be used").unwrap();
                writeln!(w, "// directly as a Deref trait in higher-level structs:").unwrap();
-               writeln!(w, "impl std::ops::Deref for {} {{\n\ttype Target = Self;", trait_name).unwrap();
+               writeln!(w, "impl core::ops::Deref for {} {{\n\ttype Target = Self;", trait_name).unwrap();
                writeln!(w, "\tfn deref(&self) -> &Self {{\n\t\tself\n\t}}\n}}").unwrap();
        }
 
@@ -628,7 +672,7 @@ fn writeln_opaque<W: std::io::Write>(w: &mut W, ident: &syn::Ident, struct_name:
        writeln!(w, "\tpub(crate) fn take_inner(mut self) -> *mut native{} {{", struct_name).unwrap();
        writeln!(w, "\t\tassert!(self.is_owned);").unwrap();
        writeln!(w, "\t\tlet ret = ObjOps::untweak_ptr(self.inner);").unwrap();
-       writeln!(w, "\t\tself.inner = std::ptr::null_mut();").unwrap();
+       writeln!(w, "\t\tself.inner = core::ptr::null_mut();").unwrap();
        writeln!(w, "\t\tret").unwrap();
        writeln!(w, "\t}}\n}}").unwrap();
 
@@ -909,7 +953,7 @@ fn writeln_impl<W: std::io::Write>(w: &mut W, i: &syn::ItemImpl, types: &mut Typ
                                                        writeln!(w, "\t\tlet mut rust_obj = {} {{ inner: ObjOps::heap_alloc(obj), is_owned: true }};", ident).unwrap();
                                                        writeln!(w, "\t\tlet mut ret = {}_as_{}(&rust_obj);", ident, trait_obj.ident).unwrap();
                                                        writeln!(w, "\t\t// We want to free rust_obj when ret gets drop()'d, not rust_obj, so wipe rust_obj's pointer and set ret's free() fn").unwrap();
-                                                       writeln!(w, "\t\trust_obj.inner = std::ptr::null_mut();").unwrap();
+                                                       writeln!(w, "\t\trust_obj.inner = core::ptr::null_mut();").unwrap();
                                                        writeln!(w, "\t\tret.free = Some({}_free_void);", ident).unwrap();
                                                        writeln!(w, "\t\tret").unwrap();
                                                }
@@ -1172,21 +1216,21 @@ fn writeln_impl<W: std::io::Write>(w: &mut W, i: &syn::ItemImpl, types: &mut Typ
                                                let ref_type: syn::Type = syn::parse_quote!(&#path);
                                                assert!(!types.write_to_c_conversion_new_var(w, &format_ident!("a"), &*i.self_ty, Some(&gen_types), false), "We don't support new var conversions when comparing equality");
 
-                                               writeln!(w, "\t// Note that we'd love to use std::collections::hash_map::DefaultHasher but it's not in core").unwrap();
+                                               writeln!(w, "\t// Note that we'd love to use alloc::collections::hash_map::DefaultHasher but it's not in core").unwrap();
                                                writeln!(w, "\t#[allow(deprecated)]").unwrap();
                                                writeln!(w, "\tlet mut hasher = core::hash::SipHasher::new();").unwrap();
-                                               write!(w, "\tstd::hash::Hash::hash(").unwrap();
+                                               write!(w, "\tcore::hash::Hash::hash(").unwrap();
                                                types.write_from_c_conversion_prefix(w, &ref_type, Some(&gen_types));
                                                write!(w, "o").unwrap();
                                                types.write_from_c_conversion_suffix(w, &ref_type, Some(&gen_types));
                                                writeln!(w, ", &mut hasher);").unwrap();
-                                               writeln!(w, "\tstd::hash::Hasher::finish(&hasher)\n}}").unwrap();
+                                               writeln!(w, "\tcore::hash::Hasher::finish(&hasher)\n}}").unwrap();
                                        } else if (path_matches_nongeneric(&trait_path.1, &["core", "clone", "Clone"]) || path_matches_nongeneric(&trait_path.1, &["Clone"])) &&
                                                        types.c_type_has_inner_from_path(&resolved_path) {
                                                writeln!(w, "impl Clone for {} {{", ident).unwrap();
                                                writeln!(w, "\tfn clone(&self) -> Self {{").unwrap();
                                                writeln!(w, "\t\tSelf {{").unwrap();
-                                               writeln!(w, "\t\t\tinner: if <*mut native{}>::is_null(self.inner) {{ std::ptr::null_mut() }} else {{", ident).unwrap();
+                                               writeln!(w, "\t\t\tinner: if <*mut native{}>::is_null(self.inner) {{ core::ptr::null_mut() }} else {{", ident).unwrap();
                                                writeln!(w, "\t\t\t\tObjOps::heap_alloc(unsafe {{ &*ObjOps::untweak_ptr(self.inner) }}.clone()) }},").unwrap();
                                                writeln!(w, "\t\t\tis_owned: true,").unwrap();
                                                writeln!(w, "\t\t}}\n\t}}\n}}").unwrap();
@@ -1226,7 +1270,7 @@ fn writeln_impl<W: std::io::Write>(w: &mut W, i: &syn::ItemImpl, types: &mut Typ
                                                let self_ty = &i.self_ty;
                                                let ref_type: syn::Type = syn::parse_quote!(&#self_ty);
                                                let new_var = types.write_from_c_conversion_new_var(w, &format_ident!("o"), &ref_type, Some(&gen_types));
-                                               write!(w, "\tformat!(\"{{}}\", ").unwrap();
+                                               write!(w, "\talloc::format!(\"{{}}\", ").unwrap();
                                                types.write_from_c_conversion_prefix(w, &ref_type, Some(&gen_types));
                                                write!(w, "{}o", if new_var { "local_" } else { "" }).unwrap();
                                                types.write_from_c_conversion_suffix(w, &ref_type, Some(&gen_types));
@@ -1302,7 +1346,14 @@ fn writeln_impl<W: std::io::Write>(w: &mut W, i: &syn::ItemImpl, types: &mut Typ
                                }
                        } else if let Some(resolved_path) = types.maybe_resolve_ident(&ident) {
                                if let Some(aliases) = types.crate_types.reverse_alias_map.get(&resolved_path).cloned() {
+                                       let mut gen_types = Some(GenericTypes::new(Some(resolved_path.clone())));
+                                       if !gen_types.as_mut().unwrap().learn_generics(&i.generics, types) {
+                                               gen_types = None;
+                                       }
                                        'alias_impls: for (alias, arguments) in aliases {
+                                               let mut new_ty_generics = Vec::new();
+                                               let mut need_generics = false;
+
                                                let alias_resolved = types.resolve_path(&alias, None);
                                                for (idx, gen) in i.generics.params.iter().enumerate() {
                                                        match gen {
@@ -1312,17 +1363,26 @@ fn writeln_impl<W: std::io::Write>(w: &mut W, i: &syn::ItemImpl, types: &mut Typ
                                                                                        if let syn::PathArguments::AngleBracketed(ref t) = &arguments {
                                                                                                assert!(idx < t.args.len());
                                                                                                if let syn::GenericArgument::Type(syn::Type::Path(p)) = &t.args[idx] {
-                                                                                                       let generic_arg = types.resolve_path(&p.path, None);
-                                                                                                       let generic_bound = types.resolve_path(&trait_bound.path, None);
-                                                                                                       if let Some(traits_impld) = types.crate_types.trait_impls.get(&generic_arg) {
-                                                                                                               for trait_impld in traits_impld {
-                                                                                                                       if *trait_impld == generic_bound { continue 'bounds_check; }
+                                                                                                       if let Some(generic_arg) = types.maybe_resolve_path(&p.path, None) {
+
+                                                                                                               new_ty_generics.push((type_param.ident.clone(), syn::Type::Path(p.clone())));
+                                                                                                               let generic_bound = types.resolve_path(&trait_bound.path, None);
+                                                                                                               if let Some(traits_impld) = types.crate_types.trait_impls.get(&generic_arg) {
+                                                                                                                       for trait_impld in traits_impld {
+                                                                                                                               if *trait_impld == generic_bound { continue 'bounds_check; }
+                                                                                                                       }
+                                                                                                                       eprintln!("struct {}'s generic arg {} didn't match bound {}", alias_resolved, generic_arg, generic_bound);
+                                                                                                                       continue 'alias_impls;
+                                                                                                               } else {
+                                                                                                                       eprintln!("struct {}'s generic arg {} didn't match bound {}", alias_resolved, generic_arg, generic_bound);
+                                                                                                                       continue 'alias_impls;
                                                                                                                }
-                                                                                                               eprintln!("struct {}'s generic arg {} didn't match bound {}", alias_resolved, generic_arg, generic_bound);
-                                                                                                               continue 'alias_impls;
+                                                                                                       } else if gen_types.is_some() {
+                                                                                                               new_ty_generics.push((type_param.ident.clone(),
+                                                                                                                       gen_types.as_ref().resolve_type(&syn::Type::Path(p.clone())).clone()));
+                                                                                                               need_generics = true;
                                                                                                        } else {
-                                                                                                               eprintln!("struct {}'s generic arg {} didn't match bound {}", alias_resolved, generic_arg, generic_bound);
-                                                                                                               continue 'alias_impls;
+                                                                                                               unimplemented!();
                                                                                                        }
                                                                                                } else { unimplemented!(); }
                                                                                        } else { unimplemented!(); }
@@ -1333,19 +1393,54 @@ fn writeln_impl<W: std::io::Write>(w: &mut W, i: &syn::ItemImpl, types: &mut Typ
                                                                syn::GenericParam::Const(_) => unimplemented!(),
                                                        }
                                                }
+                                               let mut params = syn::punctuated::Punctuated::new();
+                                               let real_aliased =
+                                                       if need_generics {
+                                                               let alias_generics = types.crate_types.opaques.get(&alias_resolved).unwrap().1;
+
+                                                               // If we need generics on the alias, create impl generic bounds...
+                                                               assert_eq!(new_ty_generics.len(), i.generics.params.len());
+                                                               let mut args = syn::punctuated::Punctuated::new();
+                                                               for (ident, param) in new_ty_generics.drain(..) {
+                                                                       // TODO: We blindly assume that generics in the type alias and
+                                                                       // the aliased type have the same names, which we really shouldn't.
+                                                                       if alias_generics.params.iter().any(|generic|
+                                                                               if let syn::GenericParam::Type(t) = generic { t.ident == ident } else { false })
+                                                                       {
+                                                                               args.push(parse_quote!(#ident));
+                                                                       }
+                                                                       params.push(syn::GenericParam::Type(syn::TypeParam {
+                                                                               attrs: Vec::new(),
+                                                                               ident,
+                                                                               colon_token: None,
+                                                                               bounds: syn::punctuated::Punctuated::new(),
+                                                                               eq_token: Some(syn::token::Eq(Span::call_site())),
+                                                                               default: Some(param),
+                                                                       }));
+                                                               }
+                                                               // ... and swap the last segment of the impl self_ty to use the generic bounds.
+                                                               let mut res = alias.clone();
+                                                               res.segments.last_mut().unwrap().arguments = syn::PathArguments::AngleBracketed(syn::AngleBracketedGenericArguments {
+                                                                       colon2_token: None,
+                                                                       lt_token: syn::token::Lt(Span::call_site()),
+                                                                       args,
+                                                                       gt_token: syn::token::Gt(Span::call_site()),
+                                                               });
+                                                               res
+                                                       } else { alias.clone() };
                                                let aliased_impl = syn::ItemImpl {
                                                        attrs: i.attrs.clone(),
                                                        brace_token: syn::token::Brace(Span::call_site()),
                                                        defaultness: None,
                                                        generics: syn::Generics {
                                                                lt_token: None,
-                                                               params: syn::punctuated::Punctuated::new(),
+                                                               params,
                                                                gt_token: None,
                                                                where_clause: None,
                                                        },
                                                        impl_token: syn::Token![impl](Span::call_site()),
                                                        items: i.items.clone(),
-                                                       self_ty: Box::new(syn::Type::Path(syn::TypePath { qself: None, path: alias.clone() })),
+                                                       self_ty: Box::new(syn::Type::Path(syn::TypePath { qself: None, path: real_aliased })),
                                                        trait_: i.trait_.clone(),
                                                        unsafety: None,
                                                };
@@ -1625,10 +1720,20 @@ fn writeln_fn<'a, 'b, W: std::io::Write>(w: &mut W, f: &'a syn::ItemFn, types: &
        writeln_fn_docs(w, &f.attrs, "", types, Some(&gen_types), f.sig.inputs.iter(), &f.sig.output);
 
        write!(w, "#[no_mangle]\npub extern \"C\" fn {}(", f.sig.ident).unwrap();
+
+
        write_method_params(w, &f.sig, "", types, Some(&gen_types), false, true);
        write!(w, " {{\n\t").unwrap();
        write_method_var_decl_body(w, &f.sig, "", types, Some(&gen_types), false);
-       write!(w, "{}::{}(", types.module_path, f.sig.ident).unwrap();
+       write!(w, "{}::{}", types.module_path, f.sig.ident).unwrap();
+
+       let mut function_generic_args = Vec::new();
+       maybe_write_generics(&mut function_generic_args, &f.sig.generics, types, true);
+       if !function_generic_args.is_empty() {
+               write!(w, "::{}", String::from_utf8(function_generic_args).unwrap()).unwrap();
+       }
+       write!(w, "(").unwrap();
+
        write_method_call_params(w, &f.sig, "", types, Some(&gen_types), "", false);
        writeln!(w, "\n}}\n").unwrap();
 }
@@ -1712,6 +1817,12 @@ fn convert_file<'a, 'b>(libast: &'a FullLibraryAST, crate_types: &CrateTypes<'a>
                        writeln!(out, "#![allow(unused_braces)]").unwrap();
                        // TODO: We need to map deny(missing_docs) in the source crate(s)
                        //writeln!(out, "#![deny(missing_docs)]").unwrap();
+
+                       writeln!(out, "#![cfg_attr(not(feature = \"std\"), no_std)]").unwrap();
+                       writeln!(out, "#[cfg(not(any(feature = \"std\", feature = \"no-std\")))]").unwrap();
+                       writeln!(out, "compile_error!(\"at least one of the `std` or `no-std` features must be enabled\");").unwrap();
+                       writeln!(out, "extern crate alloc;").unwrap();
+
                        writeln!(out, "pub mod version;").unwrap();
                        writeln!(out, "pub mod c_types;").unwrap();
                        writeln!(out, "pub mod bitcoin;").unwrap();
@@ -1774,17 +1885,33 @@ fn convert_file<'a, 'b>(libast: &'a FullLibraryAST, crate_types: &CrateTypes<'a>
                                                        ExportStatus::NotImplementable => panic!("(C-not implementable) must only appear on traits"),
                                                }
 
-                                               let mut process_alias = true;
-                                               for tok in t.generics.params.iter() {
-                                                       if let syn::GenericParam::Lifetime(_) = tok {}
-                                                       else { process_alias = false; }
-                                               }
-                                               if process_alias {
-                                                       match &*t.ty {
-                                                               syn::Type::Path(_) =>
-                                                                       writeln_opaque(&mut out, &t.ident, &format!("{}", t.ident), &t.generics, &t.attrs, &type_resolver, header_file, cpp_header_file),
-                                                               _ => {}
-                                                       }
+                                               match &*t.ty {
+                                                       syn::Type::Path(p) => {
+                                                               let real_ty = type_resolver.resolve_path(&p.path, None);
+                                                               let real_generic_bounds = type_resolver.crate_types.opaques.get(&real_ty).map(|t| t.1).or(
+                                                                       type_resolver.crate_types.priv_structs.get(&real_ty).map(|r| *r)).unwrap();
+                                                               let mut resolved_generics = t.generics.clone();
+
+                                                               if let syn::PathArguments::AngleBracketed(real_generics) = &p.path.segments.last().unwrap().arguments {
+                                                                       for (real_idx, real_param) in real_generics.args.iter().enumerate() {
+                                                                               if let syn::GenericArgument::Type(syn::Type::Path(real_param_path)) = real_param {
+                                                                                       for param in resolved_generics.params.iter_mut() {
+                                                                                               if let syn::GenericParam::Type(type_param) = param {
+                                                                                                       if Some(&type_param.ident) == real_param_path.path.get_ident() {
+                                                                                                               if let syn::GenericParam::Type(real_type_param) = &real_generic_bounds.params[real_idx] {
+                                                                                                                       type_param.bounds = real_type_param.bounds.clone();
+                                                                                                                       type_param.default = real_type_param.default.clone();
+
+                                                                                                               }
+                                                                                                       }
+                                                                                               }
+                                                                                       }
+                                                                               }
+                                                                       }
+                                                               }
+
+                                                               writeln_opaque(&mut out, &t.ident, &format!("{}", t.ident), &resolved_generics, &t.attrs, &type_resolver, header_file, cpp_header_file)},
+                                                       _ => {}
                                                }
                                        }
                                },
@@ -1840,12 +1967,15 @@ fn walk_ast<'a>(ast_storage: &'a FullLibraryAST, crate_types: &mut CrateTypes<'a
                        match item {
                                syn::Item::Struct(s) => {
                                        if let syn::Visibility::Public(_) = s.vis {
+                                               let struct_path = format!("{}::{}", module, s.ident);
                                                match export_status(&s.attrs) {
                                                        ExportStatus::Export => {},
-                                                       ExportStatus::NoExport|ExportStatus::TestOnly => continue,
+                                                       ExportStatus::NoExport|ExportStatus::TestOnly => {
+                                                               crate_types.priv_structs.insert(struct_path, &s.generics);
+                                                               continue
+                                                       },
                                                        ExportStatus::NotImplementable => panic!("(C-not implementable) must only appear on traits"),
                                                }
-                                               let struct_path = format!("{}::{}", module, s.ident);
                                                crate_types.opaques.insert(struct_path, (&s.ident, &s.generics));
                                        }
                                },
@@ -1873,29 +2003,22 @@ fn walk_ast<'a>(ast_storage: &'a FullLibraryAST, crate_types: &mut CrateTypes<'a
                                                        ExportStatus::NotImplementable => panic!("(C-not implementable) must only appear on traits"),
                                                }
                                                let type_path = format!("{}::{}", module, t.ident);
-                                               let mut process_alias = true;
-                                               for tok in t.generics.params.iter() {
-                                                       if let syn::GenericParam::Lifetime(_) = tok {}
-                                                       else { process_alias = false; }
-                                               }
-                                               if process_alias {
-                                                       match &*t.ty {
-                                                               syn::Type::Path(p) => {
-                                                                       let t_ident = &t.ident;
-
-                                                                       // If its a path with no generics, assume we don't map the aliased type and map it opaque
-                                                                       let path_obj = parse_quote!(#t_ident);
-                                                                       let args_obj = p.path.segments.last().unwrap().arguments.clone();
-                                                                       match crate_types.reverse_alias_map.entry(import_resolver.maybe_resolve_path(&p.path, None).unwrap()) {
-                                                                               hash_map::Entry::Occupied(mut e) => { e.get_mut().push((path_obj, args_obj)); },
-                                                                               hash_map::Entry::Vacant(e) => { e.insert(vec![(path_obj, args_obj)]); },
-                                                                       }
-
-                                                                       crate_types.opaques.insert(type_path, (t_ident, &t.generics));
-                                                               },
-                                                               _ => {
-                                                                       crate_types.type_aliases.insert(type_path, import_resolver.resolve_imported_refs((*t.ty).clone()));
+                                               match &*t.ty {
+                                                       syn::Type::Path(p) => {
+                                                               let t_ident = &t.ident;
+
+                                                               // If its a path with no generics, assume we don't map the aliased type and map it opaque
+                                                               let path_obj = parse_quote!(#t_ident);
+                                                               let args_obj = p.path.segments.last().unwrap().arguments.clone();
+                                                               match crate_types.reverse_alias_map.entry(import_resolver.maybe_resolve_path(&p.path, None).unwrap()) {
+                                                                       hash_map::Entry::Occupied(mut e) => { e.get_mut().push((path_obj, args_obj)); },
+                                                                       hash_map::Entry::Vacant(e) => { e.insert(vec![(path_obj, args_obj)]); },
                                                                }
+
+                                                               crate_types.opaques.insert(type_path, (t_ident, &t.generics));
+                                                       },
+                                                       _ => {
+                                                               crate_types.type_aliases.insert(type_path, import_resolver.resolve_imported_refs((*t.ty).clone()));
                                                        }
                                                }
                                        }
@@ -1958,6 +2081,7 @@ fn main() {
 
        let mut derived_templates = std::fs::OpenOptions::new().write(true).create(true).truncate(true)
                .open(&args[2]).expect("Unable to open new header file");
+       writeln!(&mut derived_templates, "{}", DEFAULT_IMPORTS).unwrap();
        let mut header_file = std::fs::OpenOptions::new().write(true).create(true).truncate(true)
                .open(&args[3]).expect("Unable to open new header file");
        let mut cpp_header_file = std::fs::OpenOptions::new().write(true).create(true).truncate(true)