Add missing `rustc` `metadata` override for `lightning_types`

[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 47ff515ffa85651ec424fc95fe3aa477aa3e55ad..2e5b33e29938312be3832d4160bb6274411da77b 100644 (file)
--- a/c-bindings-gen/src/types.rs
+++ b/c-bindings-gen/src/types.rs
@@ -656,7 +656,7 @@ impl<'mod_lifetime, 'crate_lft: 'mod_lifetime> ImportResolver<'mod_lifetime, 'cr
                        }
                }
 
                        }
                }
 

-               if p.leading_colon.is_some() {
+               let result = if p.leading_colon.is_some() {

                        let mut res: String = p.segments.iter().enumerate().map(|(idx, seg)| {
                                format!("{}{}", if idx == 0 { "" } else { "::" }, seg.ident)
                        }).collect();
                        let mut res: String = p.segments.iter().enumerate().map(|(idx, seg)| {
                                format!("{}{}", if idx == 0 { "" } else { "::" }, seg.ident)
                        }).collect();


@@ -667,11 +667,10 @@ impl<'mod_lifetime, 'crate_lft: 'mod_lifetime> ImportResolver<'mod_lifetime, 'cr
                        Some(res)
                } else if let Some(id) = p.get_ident() {
                        self.maybe_resolve_ident(id)
                        Some(res)
                } else if let Some(id) = p.get_ident() {
                        self.maybe_resolve_ident(id)

+               } else if p.segments.len() == 1 {
+                       let seg = p.segments.iter().next().unwrap();
+                       self.maybe_resolve_ident(&seg.ident)

                } else {
                } else {

-                       if p.segments.len() == 1 {
-                               let seg = p.segments.iter().next().unwrap();
-                               return self.maybe_resolve_ident(&seg.ident);
-                       }

                        let mut seg_iter = p.segments.iter();
                        let first_seg = seg_iter.next().unwrap();
                        let remaining: String = seg_iter.map(|seg| {
                        let mut seg_iter = p.segments.iter();
                        let first_seg = seg_iter.next().unwrap();
                        let remaining: String = seg_iter.map(|seg| {


@@ -693,6 +692,13 @@ impl<'mod_lifetime, 'crate_lft: 'mod_lifetime> ImportResolver<'mod_lifetime, 'cr
                        } else if self.library.modules.get(&format!("{}::{}", self.module_path, first_seg.ident)).is_some() {
                                Some(format!("{}::{}{}", self.module_path, first_seg.ident, remaining))
                        } else { None }
                        } else if self.library.modules.get(&format!("{}::{}", self.module_path, first_seg.ident)).is_some() {
                                Some(format!("{}::{}{}", self.module_path, first_seg.ident, remaining))
                        } else { None }

+               };
+               // We're only set up to handle `Vec` imported via the prelude, but its often imported
+               // via the alloc stdlib crate, so map it here.
+               if result.as_ref().map(|s| s.as_str()) == Some("alloc::vec::Vec") {
+                       Some("Vec".to_string())
+               } else {
+                       result

                }
        }
 
                }
        }
 


@@ -861,6 +867,7 @@ fn initial_clonable_types() -> HashSet<String> {
        let mut res = HashSet::new();
        res.insert("crate::c_types::U5".to_owned());
        res.insert("crate::c_types::U128".to_owned());
        let mut res = HashSet::new();
        res.insert("crate::c_types::U5".to_owned());
        res.insert("crate::c_types::U128".to_owned());

+       res.insert("crate::c_types::ThreeBytes".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());
        res.insert("crate::c_types::FourBytes".to_owned());
        res.insert("crate::c_types::TwelveBytes".to_owned());
        res.insert("crate::c_types::SixteenBytes".to_owned());


@@ -869,6 +876,7 @@ fn initial_clonable_types() -> HashSet<String> {
        res.insert("crate::c_types::EightU16s".to_owned());
        res.insert("crate::c_types::SecretKey".to_owned());
        res.insert("crate::c_types::PublicKey".to_owned());
        res.insert("crate::c_types::EightU16s".to_owned());
        res.insert("crate::c_types::SecretKey".to_owned());
        res.insert("crate::c_types::PublicKey".to_owned());

+       res.insert("crate::c_types::TweakedPublicKey".to_owned());

        res.insert("crate::c_types::Transaction".to_owned());
        res.insert("crate::c_types::Witness".to_owned());
        res.insert("crate::c_types::WitnessVersion".to_owned());
        res.insert("crate::c_types::Transaction".to_owned());
        res.insert("crate::c_types::Witness".to_owned());
        res.insert("crate::c_types::WitnessVersion".to_owned());


@@ -1046,10 +1054,10 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                        "[u8; 3]" if !is_ref => Some("crate::c_types::ThreeBytes"), // Used for RGB values
                        "[u16; 32]" if !is_ref => Some("crate::c_types::ThirtyTwoU16s"),
 
                        "[u8; 3]" if !is_ref => Some("crate::c_types::ThreeBytes"), // Used for RGB values
                        "[u16; 32]" if !is_ref => Some("crate::c_types::ThirtyTwoU16s"),
 

-                       "str" if is_ref => Some("crate::c_types::Str"),
+                       "str" => Some("crate::c_types::Str"),

                        "alloc::string::String"|"String"|"std::path::PathBuf" => Some("crate::c_types::Str"),
 
                        "alloc::string::String"|"String"|"std::path::PathBuf" => Some("crate::c_types::Str"),
 

-                       "bitcoin::Address" => Some("crate::c_types::Str"),
+                       "bitcoin::address::Address"|"bitcoin::Address" => Some("crate::c_types::Str"),

 
                        "std::time::Duration"|"core::time::Duration" => Some("u64"),
                        "std::time::SystemTime" => Some("u64"),
 
                        "std::time::Duration"|"core::time::Duration" => Some("u64"),
                        "std::time::SystemTime" => Some("u64"),


@@ -1069,8 +1077,10 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                        "bitcoin::bech32::u5"|"bech32::u5" => Some("crate::c_types::U5"),
                        "u128" => Some("crate::c_types::U128"),
                        "core::num::NonZeroU8" => Some("u8"),
                        "bitcoin::bech32::u5"|"bech32::u5" => Some("crate::c_types::U5"),
                        "u128" => Some("crate::c_types::U128"),
                        "core::num::NonZeroU8" => Some("u8"),

+                       "core::num::NonZeroU64" => Some("u64"),

 
                        "secp256k1::PublicKey"|"bitcoin::secp256k1::PublicKey" => Some("crate::c_types::PublicKey"),
 
                        "secp256k1::PublicKey"|"bitcoin::secp256k1::PublicKey" => Some("crate::c_types::PublicKey"),

+                       "bitcoin::key::TweakedPublicKey" => Some("crate::c_types::TweakedPublicKey"),

                        "bitcoin::secp256k1::ecdsa::Signature" => Some("crate::c_types::ECDSASignature"),
                        "bitcoin::secp256k1::schnorr::Signature" => Some("crate::c_types::SchnorrSignature"),
                        "bitcoin::secp256k1::ecdsa::RecoverableSignature" => Some("crate::c_types::RecoverableSignature"),
                        "bitcoin::secp256k1::ecdsa::Signature" => Some("crate::c_types::ECDSASignature"),
                        "bitcoin::secp256k1::schnorr::Signature" => Some("crate::c_types::SchnorrSignature"),
                        "bitcoin::secp256k1::ecdsa::RecoverableSignature" => Some("crate::c_types::RecoverableSignature"),


@@ -1081,50 +1091,54 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                        "bitcoin::secp256k1::Scalar" if !is_ref => Some("crate::c_types::BigEndianScalar"),
                        "bitcoin::secp256k1::ecdh::SharedSecret" if !is_ref => Some("crate::c_types::ThirtyTwoBytes"),
 
                        "bitcoin::secp256k1::Scalar" if !is_ref => Some("crate::c_types::BigEndianScalar"),
                        "bitcoin::secp256k1::ecdh::SharedSecret" if !is_ref => Some("crate::c_types::ThirtyTwoBytes"),
 

-                       "bitcoin::blockdata::script::Script"|"bitcoin::Script" => Some("crate::c_types::u8slice"),
-                       "bitcoin::blockdata::script::ScriptBuf"|"bitcoin::ScriptBuf" => Some("crate::c_types::derived::CVec_u8Z"),
-                       "bitcoin::OutPoint"|"bitcoin::blockdata::transaction::OutPoint" => Some("crate::lightning::chain::transaction::OutPoint"),
-                       "bitcoin::blockdata::transaction::Transaction"|"bitcoin::Transaction" => Some("crate::c_types::Transaction"),
+                       "bitcoin::amount::Amount" => Some("u64"),
+
+                       "bitcoin::script::Script"|"bitcoin::Script" => Some("crate::c_types::u8slice"),
+                       "bitcoin::script::ScriptBuf"|"bitcoin::ScriptBuf" => Some("crate::c_types::derived::CVec_u8Z"),
+                       "bitcoin::OutPoint"|"bitcoin::transaction::OutPoint" => Some("crate::lightning::chain::transaction::OutPoint"),
+                       "bitcoin::transaction::Transaction"|"bitcoin::Transaction" => Some("crate::c_types::Transaction"),

                        "bitcoin::Witness" => Some("crate::c_types::Witness"),
                        "bitcoin::Witness" => Some("crate::c_types::Witness"),

-                       "bitcoin::TxIn"|"bitcoin::blockdata::transaction::TxIn" if !is_ref => Some("crate::c_types::TxIn"),
-                       "bitcoin::TxOut"|"bitcoin::blockdata::transaction::TxOut" => Some("crate::c_types::TxOut"),
-                       "bitcoin::network::constants::Network" => Some("crate::bitcoin::network::Network"),
-                       "bitcoin::address::WitnessVersion" => Some("crate::c_types::WitnessVersion"),
-                       "bitcoin::address::WitnessProgram" => Some("crate::c_types::WitnessProgram"),
-                       "bitcoin::blockdata::block::Header" if is_ref  => Some("*const [u8; 80]"),
-                       "bitcoin::blockdata::block::Block" if is_ref  => Some("crate::c_types::u8slice"),
+                       "bitcoin::TxIn"|"bitcoin::transaction::TxIn" if !is_ref => Some("crate::c_types::TxIn"),
+                       "bitcoin::TxOut"|"bitcoin::transaction::TxOut" => Some("crate::c_types::TxOut"),
+                       "bitcoin::network::constants::Network"|"bitcoin::network::Network" => Some("crate::bitcoin::network::Network"),
+                       "bitcoin::WitnessVersion"|"bitcoin::address::WitnessVersion" => Some("crate::c_types::WitnessVersion"),
+                       "bitcoin::WitnessProgram"|"bitcoin::address::WitnessProgram" => Some("crate::c_types::WitnessProgram"),
+                       "bitcoin::block::Header" if is_ref  => Some("*const [u8; 80]"),
+                       "bitcoin::block::Block" if is_ref  => Some("crate::c_types::u8slice"),

 
 

-                       "bitcoin::blockdata::locktime::absolute::LockTime" => Some("u32"),
+                       "bitcoin::locktime::absolute::LockTime" => Some("u32"),

 
 

-                       "bitcoin::psbt::PartiallySignedTransaction" if !is_ref => Some("crate::c_types::derived::CVec_u8Z"),
+                       "bitcoin::Psbt"|"bitcoin::psbt::PartiallySignedTransaction" if !is_ref => Some("crate::c_types::derived::CVec_u8Z"),

 
                        "bitcoin::PubkeyHash"|"bitcoin::hash_types::PubkeyHash"|
 
                        "bitcoin::PubkeyHash"|"bitcoin::hash_types::PubkeyHash"|

-                       "bitcoin::hash_types::WPubkeyHash"|
-                       "bitcoin::ScriptHash"|"bitcoin::hash_types::ScriptHash"
+                       "bitcoin::WPubkeyHash"|"bitcoin::hash_types::WPubkeyHash"|
+                       "bitcoin::ScriptHash"|"bitcoin::ScriptHash"

                                if !is_ref => Some("crate::c_types::TwentyBytes"),
                        "bitcoin::PubkeyHash"|"bitcoin::hash_types::PubkeyHash"|
                                if !is_ref => Some("crate::c_types::TwentyBytes"),
                        "bitcoin::PubkeyHash"|"bitcoin::hash_types::PubkeyHash"|

-                       "bitcoin::hash_types::WPubkeyHash"|
-                       "bitcoin::ScriptHash"|"bitcoin::hash_types::ScriptHash"
+                       "bitcoin::WPubkeyHash"|"bitcoin::hash_types::WPubkeyHash"|
+                       "bitcoin::ScriptHash"|"bitcoin::ScriptHash"

                                if is_ref => Some("*const [u8; 20]"),
                                if is_ref => Some("*const [u8; 20]"),

-                       "bitcoin::hash_types::WScriptHash"
+                       "bitcoin::WScriptHash"|"bitcoin::WScriptHash"

                                if is_ref => Some("*const [u8; 32]"),
 
                        // Newtypes that we just expose in their original form.
                                if is_ref => Some("*const [u8; 32]"),
 
                        // Newtypes that we just expose in their original form.

-                       "bitcoin::hash_types::Txid"|"bitcoin::BlockHash"|"bitcoin::hash_types::BlockHash"|"bitcoin::hashes::sha256::Hash"|"bitcoin::blockdata::constants::ChainHash"
+                       "bitcoin::Txid"|"bitcoin::hash_types::Txid"|"bitcoin::BlockHash"|"bitcoin::hash_types::BlockHash"|"bitcoin::hashes::sha256::Hash"|"bitcoin::constants::ChainHash"

                                if is_ref  => Some("*const [u8; 32]"),
                                if is_ref  => Some("*const [u8; 32]"),

-                       "bitcoin::hash_types::Txid"|"bitcoin::BlockHash"|"bitcoin::hash_types::BlockHash"|"bitcoin::hashes::sha256::Hash"|"bitcoin::blockdata::constants::ChainHash"
+                       "bitcoin::Txid"|"bitcoin::hash_types::Txid"|"bitcoin::BlockHash"|"bitcoin::hash_types::BlockHash"|"bitcoin::hashes::sha256::Hash"|"bitcoin::constants::ChainHash"|"bitcoin::hashes::sha256::Hash"

                                if !is_ref => Some("crate::c_types::ThirtyTwoBytes"),
                        "bitcoin::secp256k1::Message" if !is_ref => Some("crate::c_types::ThirtyTwoBytes"),
                        "bitcoin::secp256k1::Message" if is_ref => Some("*const [u8; 32]"),
                                if !is_ref => Some("crate::c_types::ThirtyTwoBytes"),
                        "bitcoin::secp256k1::Message" if !is_ref => Some("crate::c_types::ThirtyTwoBytes"),
                        "bitcoin::secp256k1::Message" if is_ref => Some("*const [u8; 32]"),

-                       "lightning::ln::PaymentHash"|"lightning::ln::PaymentPreimage"|"lightning::ln::PaymentSecret"
+                       "lightning::ln::types::PaymentHash"|"lightning_types::payment::PaymentHash"
+                       |"lightning::ln::types::PaymentPreimage"|"lightning_types::payment::PaymentPreimage"
+                       |"lightning::ln::types::PaymentSecret"|"lightning_types::payment::PaymentSecret"

                        |"lightning::ln::channelmanager::PaymentId"|"lightning::ln::channelmanager::InterceptId"
                        |"lightning::sign::KeyMaterial"|"lightning::chain::ClaimId"
                        |"lightning::ln::channelmanager::PaymentId"|"lightning::ln::channelmanager::InterceptId"
                        |"lightning::sign::KeyMaterial"|"lightning::chain::ClaimId"

-                       |"lightning::ln::ChannelId"|"lightning::ln::channel_id::ChannelId"

                                if is_ref => Some("*const [u8; 32]"),
                                if is_ref => Some("*const [u8; 32]"),

-                       "lightning::ln::PaymentHash"|"lightning::ln::PaymentPreimage"|"lightning::ln::PaymentSecret"
+                       "lightning::ln::types::PaymentHash"|"lightning_types::payment::PaymentHash"
+                       |"lightning::ln::types::PaymentPreimage"|"lightning_types::payment::PaymentPreimage"
+                       |"lightning::ln::types::PaymentSecret"|"lightning_types::payment::PaymentSecret"

                        |"lightning::ln::channelmanager::PaymentId"|"lightning::ln::channelmanager::InterceptId"
                        |"lightning::sign::KeyMaterial"|"lightning::chain::ClaimId"
                        |"lightning::ln::channelmanager::PaymentId"|"lightning::ln::channelmanager::InterceptId"
                        |"lightning::sign::KeyMaterial"|"lightning::chain::ClaimId"

-                       |"lightning::ln::ChannelId"|"lightning::ln::channel_id::ChannelId"

                                if !is_ref => Some("crate::c_types::ThirtyTwoBytes"),
 
                        "lightning::io::Read" => Some("crate::c_types::u8slice"),
                                if !is_ref => Some("crate::c_types::ThirtyTwoBytes"),
 
                        "lightning::io::Read" => Some("crate::c_types::u8slice"),


@@ -1159,7 +1173,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                        "[u8]" if is_ref => Some(""),
                        "[usize]" if is_ref => Some(""),
 
                        "[u8]" if is_ref => Some(""),
                        "[usize]" if is_ref => Some(""),
 

-                       "str" if is_ref => Some(""),
+                       "str" => Some(""),

                        "alloc::string::String"|"String"|"std::path::PathBuf" => Some(""),
                        "std::io::Error"|"lightning::io::Error"|"lightning::io::ErrorKind" => Some(""),
                        // Note that we'll panic for String if is_ref, as we only have non-owned memory, we
                        "alloc::string::String"|"String"|"std::path::PathBuf" => Some(""),
                        "std::io::Error"|"lightning::io::Error"|"lightning::io::ErrorKind" => Some(""),
                        // Note that we'll panic for String if is_ref, as we only have non-owned memory, we


@@ -1179,9 +1193,12 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                        "bitcoin::bech32::u5"|"bech32::u5" => Some(""),
                        "u128" => Some(""),
                        "core::num::NonZeroU8" => Some("core::num::NonZeroU8::new("),
                        "bitcoin::bech32::u5"|"bech32::u5" => Some(""),
                        "u128" => Some(""),
                        "core::num::NonZeroU8" => Some("core::num::NonZeroU8::new("),

+                       "core::num::NonZeroU64" => Some("core::num::NonZeroU64::new("),

 
                        "bitcoin::secp256k1::PublicKey"|"secp256k1::PublicKey" if is_ref => Some("&"),
                        "bitcoin::secp256k1::PublicKey"|"secp256k1::PublicKey" => Some(""),
 
                        "bitcoin::secp256k1::PublicKey"|"secp256k1::PublicKey" if is_ref => Some("&"),
                        "bitcoin::secp256k1::PublicKey"|"secp256k1::PublicKey" => Some(""),

+                       "bitcoin::key::TweakedPublicKey" if is_ref => Some("&"),
+                       "bitcoin::key::TweakedPublicKey" => Some(""),

                        "bitcoin::secp256k1::ecdsa::Signature"|"bitcoin::secp256k1::schnorr::Signature" if is_ref => Some("&"),
                        "bitcoin::secp256k1::ecdsa::Signature"|"bitcoin::secp256k1::schnorr::Signature" => Some(""),
                        "bitcoin::secp256k1::ecdsa::RecoverableSignature" => Some(""),
                        "bitcoin::secp256k1::ecdsa::Signature"|"bitcoin::secp256k1::schnorr::Signature" if is_ref => Some("&"),
                        "bitcoin::secp256k1::ecdsa::Signature"|"bitcoin::secp256k1::schnorr::Signature" => Some(""),
                        "bitcoin::secp256k1::ecdsa::RecoverableSignature" => Some(""),


@@ -1192,55 +1209,57 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                        "bitcoin::secp256k1::Scalar" if !is_ref => Some(""),
                        "bitcoin::secp256k1::ecdh::SharedSecret" if !is_ref => Some("::bitcoin::secp256k1::ecdh::SharedSecret::from_bytes("),
 
                        "bitcoin::secp256k1::Scalar" if !is_ref => Some(""),
                        "bitcoin::secp256k1::ecdh::SharedSecret" if !is_ref => Some("::bitcoin::secp256k1::ecdh::SharedSecret::from_bytes("),
 

-                       "bitcoin::blockdata::script::Script"|"bitcoin::Script" => Some("::bitcoin::blockdata::script::Script::from_bytes("),
-                       "bitcoin::blockdata::script::ScriptBuf"|"bitcoin::ScriptBuf" => Some("::bitcoin::blockdata::script::ScriptBuf::from("),
-                       "bitcoin::blockdata::transaction::Transaction"|"bitcoin::Transaction" if is_ref => Some("&"),
-                       "bitcoin::blockdata::transaction::Transaction"|"bitcoin::Transaction" => Some(""),
+                       "bitcoin::amount::Amount" => Some("::bitcoin::amount::Amount::from_sat("),
+
+                       "bitcoin::script::Script"|"bitcoin::Script" => Some("::bitcoin::script::Script::from_bytes("),
+                       "bitcoin::script::ScriptBuf"|"bitcoin::ScriptBuf" => Some("::bitcoin::script::ScriptBuf::from("),
+                       "bitcoin::transaction::Transaction"|"bitcoin::Transaction" if is_ref => Some("&"),
+                       "bitcoin::transaction::Transaction"|"bitcoin::Transaction" => Some(""),

                        "bitcoin::Witness" if is_ref => Some("&"),
                        "bitcoin::Witness" => Some(""),
                        "bitcoin::Witness" if is_ref => Some("&"),
                        "bitcoin::Witness" => Some(""),

-                       "bitcoin::OutPoint"|"bitcoin::blockdata::transaction::OutPoint" => Some("crate::c_types::C_to_bitcoin_outpoint("),
-                       "bitcoin::TxIn"|"bitcoin::blockdata::transaction::TxIn" if !is_ref => Some(""),
-                       "bitcoin::TxOut"|"bitcoin::blockdata::transaction::TxOut" if !is_ref => Some(""),
-                       "bitcoin::network::constants::Network" => Some(""),
-                       "bitcoin::address::WitnessVersion" => Some(""),
-                       "bitcoin::address::WitnessProgram" if is_ref => Some("&"),
-                       "bitcoin::address::WitnessProgram" if !is_ref => Some(""),
-                       "bitcoin::blockdata::block::Header" => Some("&::bitcoin::consensus::encode::deserialize(unsafe { &*"),
-                       "bitcoin::blockdata::block::Block" if is_ref => Some("&::bitcoin::consensus::encode::deserialize("),
+                       "bitcoin::OutPoint"|"bitcoin::transaction::OutPoint" => Some("crate::c_types::C_to_bitcoin_outpoint("),
+                       "bitcoin::TxIn"|"bitcoin::transaction::TxIn" if !is_ref => Some(""),
+                       "bitcoin::TxOut"|"bitcoin::transaction::TxOut" if !is_ref => Some(""),
+                       "bitcoin::network::constants::Network"|"bitcoin::network::Network" => Some(""),
+                       "bitcoin::WitnessVersion"|"bitcoin::address::WitnessVersion" => Some(""),
+                       "bitcoin::WitnessProgram"|"bitcoin::address::WitnessProgram" if is_ref => Some("&"),
+                       "bitcoin::WitnessProgram"|"bitcoin::address::WitnessProgram" if !is_ref => Some(""),
+                       "bitcoin::block::Header" => Some("&::bitcoin::consensus::encode::deserialize(unsafe { &*"),
+                       "bitcoin::block::Block" if is_ref => Some("&::bitcoin::consensus::encode::deserialize("),

 
 

-                       "bitcoin::blockdata::locktime::absolute::LockTime" => Some("::bitcoin::blockdata::locktime::absolute::LockTime::from_consensus("),
+                       "bitcoin::locktime::absolute::LockTime" => Some("::bitcoin::locktime::absolute::LockTime::from_consensus("),

 
 

-                       "bitcoin::psbt::PartiallySignedTransaction" if !is_ref => Some("::bitcoin::psbt::PartiallySignedTransaction::deserialize("),
+                       "bitcoin::Psbt"|"bitcoin::psbt::PartiallySignedTransaction" if !is_ref => Some("::bitcoin::Psbt::deserialize("),

 
                        "bitcoin::PubkeyHash"|"bitcoin::hash_types::PubkeyHash" if !is_ref =>
 
                        "bitcoin::PubkeyHash"|"bitcoin::hash_types::PubkeyHash" if !is_ref =>

-                               Some("bitcoin::hash_types::PubkeyHash::from_raw_hash(bitcoin::hashes::Hash::from_byte_array("),
+                               Some("bitcoin::PubkeyHash::from_raw_hash(bitcoin::hashes::Hash::from_byte_array("),

                        "bitcoin::PubkeyHash"|"bitcoin::hash_types::PubkeyHash" if is_ref =>
                        "bitcoin::PubkeyHash"|"bitcoin::hash_types::PubkeyHash" if is_ref =>

-                               Some("&bitcoin::hash_types::PubkeyHash::from_raw_hash(bitcoin::hashes::Hash::from_byte_array(unsafe { *"),
-                       "bitcoin::hash_types::WPubkeyHash" if is_ref =>
-                               Some("&bitcoin::hash_types::WPubkeyHash::from_raw_hash(bitcoin::hashes::Hash::from_byte_array(unsafe { *"),
-                       "bitcoin::ScriptHash"|"bitcoin::hash_types::ScriptHash" if !is_ref =>
-                               Some("bitcoin::hash_types::ScriptHash::from_raw_hash(bitcoin::hashes::Hash::from_byte_array("),
-                       "bitcoin::ScriptHash"|"bitcoin::hash_types::ScriptHash" if is_ref =>
-                               Some("&bitcoin::hash_types::ScriptHash::from_raw_hash(bitcoin::hashes::Hash::from_byte_array(unsafe { *"),
-                       "bitcoin::hash_types::WScriptHash" if is_ref =>
-                               Some("&bitcoin::hash_types::WScriptHash::from_raw_hash(bitcoin::hashes::Hash::from_byte_array(unsafe { *"),
+                               Some("&bitcoin::PubkeyHash::from_raw_hash(bitcoin::hashes::Hash::from_byte_array(unsafe { *"),
+                       "bitcoin::WPubkeyHash"|"bitcoin::hash_types::WPubkeyHash" if is_ref =>
+                               Some("&bitcoin::WPubkeyHash::from_raw_hash(bitcoin::hashes::Hash::from_byte_array(unsafe { *"),
+                       "bitcoin::ScriptHash"|"bitcoin::ScriptHash" if !is_ref =>
+                               Some("bitcoin::ScriptHash::from_raw_hash(bitcoin::hashes::Hash::from_byte_array("),
+                       "bitcoin::ScriptHash"|"bitcoin::ScriptHash" if is_ref =>
+                               Some("&bitcoin::ScriptHash::from_raw_hash(bitcoin::hashes::Hash::from_byte_array(unsafe { *"),
+                       "bitcoin::WScriptHash"|"bitcoin::WScriptHash" if is_ref =>
+                               Some("&bitcoin::WScriptHash::from_raw_hash(bitcoin::hashes::Hash::from_byte_array(unsafe { *"),

 
                        // Newtypes that we just expose in their original form.
 
                        // Newtypes that we just expose in their original form.

-                       "bitcoin::hash_types::Txid" if is_ref => Some("&::bitcoin::hash_types::Txid::from_slice(&unsafe { &*"),
-                       "bitcoin::hash_types::Txid" if !is_ref => Some("::bitcoin::hash_types::Txid::from_slice(&"),
+                       "bitcoin::Txid"|"bitcoin::hash_types::Txid" if is_ref => Some("&::bitcoin::hash_types::Txid::from_slice(&unsafe { &*"),
+                       "bitcoin::Txid"|"bitcoin::hash_types::Txid" if !is_ref => Some("::bitcoin::hash_types::Txid::from_slice(&"),

                        "bitcoin::hash_types::BlockHash"|"bitcoin::BlockHash" => Some("::bitcoin::hash_types::BlockHash::from_slice(&"),
                        "bitcoin::hash_types::BlockHash"|"bitcoin::BlockHash" => Some("::bitcoin::hash_types::BlockHash::from_slice(&"),

-                       "bitcoin::blockdata::constants::ChainHash" => Some("::bitcoin::blockdata::constants::ChainHash::from(&"),
-                       "lightning::ln::PaymentHash" if !is_ref => Some("::lightning::ln::PaymentHash("),
-                       "lightning::ln::PaymentHash" if is_ref => Some("&::lightning::ln::PaymentHash(unsafe { *"),
-                       "lightning::ln::PaymentPreimage" if !is_ref => Some("::lightning::ln::PaymentPreimage("),
-                       "lightning::ln::PaymentPreimage" if is_ref => Some("&::lightning::ln::PaymentPreimage(unsafe { *"),
-                       "lightning::ln::PaymentSecret" if !is_ref => Some("::lightning::ln::PaymentSecret("),
+                       "bitcoin::constants::ChainHash" => Some("::bitcoin::constants::ChainHash::from(&"),
+                       "bitcoin::hashes::sha256::Hash" if is_ref => Some("&::bitcoin::hashes::sha256::Hash::from_slice(&unsafe { &*"),
+                       "bitcoin::hashes::sha256::Hash" => Some("::bitcoin::hashes::sha256::Hash::from_slice(&"),
+                       "lightning::ln::types::PaymentHash"|"lightning_types::payment::PaymentHash" if !is_ref => Some("::lightning::ln::types::PaymentHash("),
+                       "lightning::ln::types::PaymentHash"|"lightning_types::payment::PaymentHash" if is_ref => Some("&::lightning::ln::types::PaymentHash(unsafe { *"),
+                       "lightning::ln::types::PaymentPreimage"|"lightning_types::payment::PaymentPreimage" if !is_ref => Some("::lightning::ln::types::PaymentPreimage("),
+                       "lightning::ln::types::PaymentPreimage"|"lightning_types::payment::PaymentPreimage" if is_ref => Some("&::lightning::ln::types::PaymentPreimage(unsafe { *"),
+                       "lightning::ln::types::PaymentSecret"|"lightning_types::payment::PaymentSecret" if !is_ref => Some("::lightning::ln::types::PaymentSecret("),

                        "lightning::ln::channelmanager::PaymentId" if !is_ref => Some("::lightning::ln::channelmanager::PaymentId("),
                        "lightning::ln::channelmanager::PaymentId" if is_ref=> Some("&::lightning::ln::channelmanager::PaymentId( unsafe { *"),
                        "lightning::ln::channelmanager::InterceptId" if !is_ref => Some("::lightning::ln::channelmanager::InterceptId("),
                        "lightning::ln::channelmanager::InterceptId" if is_ref=> Some("&::lightning::ln::channelmanager::InterceptId( unsafe { *"),
                        "lightning::ln::channelmanager::PaymentId" if !is_ref => Some("::lightning::ln::channelmanager::PaymentId("),
                        "lightning::ln::channelmanager::PaymentId" if is_ref=> Some("&::lightning::ln::channelmanager::PaymentId( unsafe { *"),
                        "lightning::ln::channelmanager::InterceptId" if !is_ref => Some("::lightning::ln::channelmanager::InterceptId("),
                        "lightning::ln::channelmanager::InterceptId" if is_ref=> Some("&::lightning::ln::channelmanager::InterceptId( unsafe { *"),

-                       "lightning::ln::ChannelId"|"lightning::ln::channel_id::ChannelId" if !is_ref => Some("::lightning::ln::ChannelId("),
-                       "lightning::ln::ChannelId"|"lightning::ln::channel_id::ChannelId" if is_ref => Some("&::lightning::ln::ChannelId(unsafe { *"),

                        "lightning::sign::KeyMaterial" if !is_ref => Some("::lightning::sign::KeyMaterial("),
                        "lightning::sign::KeyMaterial" if is_ref=> Some("&::lightning::sign::KeyMaterial( unsafe { *"),
                        "lightning::chain::ClaimId" if !is_ref => Some("::lightning::chain::ClaimId("),
                        "lightning::sign::KeyMaterial" if !is_ref => Some("::lightning::sign::KeyMaterial("),
                        "lightning::sign::KeyMaterial" if is_ref=> Some("&::lightning::sign::KeyMaterial( unsafe { *"),
                        "lightning::chain::ClaimId" if !is_ref => Some("::lightning::chain::ClaimId("),


@@ -1275,6 +1294,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                        "[usize]" if is_ref => Some(".to_slice()"),
 
                        "str" if is_ref => Some(".into_str()"),
                        "[usize]" if is_ref => Some(".to_slice()"),
 
                        "str" if is_ref => Some(".into_str()"),

+                       "str" if !is_ref => Some(".into_string()"),

                        "alloc::string::String"|"String" => Some(".into_string()"),
                        "std::path::PathBuf" => Some(".into_pathbuf()"),
                        "std::io::Error"|"lightning::io::Error" => Some(".to_rust()"),
                        "alloc::string::String"|"String" => Some(".into_string()"),
                        "std::path::PathBuf" => Some(".into_pathbuf()"),
                        "std::io::Error"|"lightning::io::Error" => Some(".to_rust()"),


@@ -1294,8 +1314,10 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                        "bitcoin::bech32::u5"|"bech32::u5" => Some(".into()"),
                        "u128" => Some(".into()"),
                        "core::num::NonZeroU8" => Some(").expect(\"Value must be non-zero\")"),
                        "bitcoin::bech32::u5"|"bech32::u5" => Some(".into()"),
                        "u128" => Some(".into()"),
                        "core::num::NonZeroU8" => Some(").expect(\"Value must be non-zero\")"),

+                       "core::num::NonZeroU64" => Some(").expect(\"Value must be non-zero\")"),

 
                        "bitcoin::secp256k1::PublicKey"|"secp256k1::PublicKey" => Some(".into_rust()"),
 
                        "bitcoin::secp256k1::PublicKey"|"secp256k1::PublicKey" => Some(".into_rust()"),

+                       "bitcoin::key::TweakedPublicKey" => Some(".into_rust()"),

                        "bitcoin::secp256k1::ecdsa::Signature"|"bitcoin::secp256k1::schnorr::Signature" => Some(".into_rust()"),
                        "bitcoin::secp256k1::ecdsa::RecoverableSignature" => Some(".into_rust()"),
                        "bitcoin::secp256k1::SecretKey" if !is_ref => Some(".into_rust()"),
                        "bitcoin::secp256k1::ecdsa::Signature"|"bitcoin::secp256k1::schnorr::Signature" => Some(".into_rust()"),
                        "bitcoin::secp256k1::ecdsa::RecoverableSignature" => Some(".into_rust()"),
                        "bitcoin::secp256k1::SecretKey" if !is_ref => Some(".into_rust()"),


@@ -1304,46 +1326,53 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                        "bitcoin::secp256k1::Scalar" => Some(".into_rust()"),
                        "bitcoin::secp256k1::ecdh::SharedSecret" if !is_ref => Some(".data)"),
 
                        "bitcoin::secp256k1::Scalar" => Some(".into_rust()"),
                        "bitcoin::secp256k1::ecdh::SharedSecret" if !is_ref => Some(".data)"),
 

-                       "bitcoin::blockdata::script::Script"|"bitcoin::Script" => Some(".to_slice())"),
-                       "bitcoin::blockdata::script::ScriptBuf"|"bitcoin::ScriptBuf" => Some(".into_rust())"),
-                       "bitcoin::blockdata::transaction::Transaction"|"bitcoin::Transaction" => Some(".into_bitcoin()"),
+                       "bitcoin::amount::Amount" => Some(")"),
+
+                       "bitcoin::script::Script"|"bitcoin::Script" => Some(".to_slice())"),
+                       "bitcoin::script::ScriptBuf"|"bitcoin::ScriptBuf" => Some(".into_rust())"),
+                       "bitcoin::transaction::Transaction"|"bitcoin::Transaction" => Some(".into_bitcoin()"),

                        "bitcoin::Witness" => Some(".into_bitcoin()"),
                        "bitcoin::Witness" => Some(".into_bitcoin()"),

-                       "bitcoin::OutPoint"|"bitcoin::blockdata::transaction::OutPoint" => Some(")"),
-                       "bitcoin::TxIn"|"bitcoin::blockdata::transaction::TxIn" if !is_ref => Some(".into_rust()"),
-                       "bitcoin::TxOut"|"bitcoin::blockdata::transaction::TxOut" if !is_ref => Some(".into_rust()"),
-                       "bitcoin::network::constants::Network" => Some(".into_bitcoin()"),
-                       "bitcoin::address::WitnessVersion" => Some(".into()"),
-                       "bitcoin::address::WitnessProgram" => Some(".into_bitcoin()"),
-                       "bitcoin::blockdata::block::Header" => Some(" }).unwrap()"),
-                       "bitcoin::blockdata::block::Block" => Some(".to_slice()).unwrap()"),
+                       "bitcoin::OutPoint"|"bitcoin::transaction::OutPoint" => Some(")"),
+                       "bitcoin::TxIn"|"bitcoin::transaction::TxIn" if !is_ref => Some(".into_rust()"),
+                       "bitcoin::TxOut"|"bitcoin::transaction::TxOut" if !is_ref => Some(".into_rust()"),
+                       "bitcoin::network::constants::Network"|"bitcoin::network::Network" => Some(".into_bitcoin()"),
+                       "bitcoin::WitnessVersion"|"bitcoin::address::WitnessVersion" => Some(".into()"),
+                       "bitcoin::WitnessProgram"|"bitcoin::address::WitnessProgram" => Some(".into_bitcoin()"),
+                       "bitcoin::block::Header" => Some(" }).unwrap()"),
+                       "bitcoin::block::Block" => Some(".to_slice()).unwrap()"),

 
 

-                       "bitcoin::blockdata::locktime::absolute::LockTime" => Some(")"),
+                       "bitcoin::locktime::absolute::LockTime" => Some(")"),

 
 

-                       "bitcoin::psbt::PartiallySignedTransaction" if !is_ref => Some(".as_slice()).expect(\"Invalid PSBT format\")"),
+                       "bitcoin::Psbt"|"bitcoin::psbt::PartiallySignedTransaction" if !is_ref => Some(".as_slice()).expect(\"Invalid PSBT format\")"),

 
                        "bitcoin::PubkeyHash"|"bitcoin::hash_types::PubkeyHash"|
 
                        "bitcoin::PubkeyHash"|"bitcoin::hash_types::PubkeyHash"|

-                       "bitcoin::hash_types::WPubkeyHash"|"bitcoin::hash_types::WScriptHash"|
+                       "bitcoin::WPubkeyHash"|"bitcoin::hash_types::WPubkeyHash"|
+                       "bitcoin::WScriptHash"|"bitcoin::hash_types::WScriptHash"|

                        "bitcoin::ScriptHash"|"bitcoin::hash_types::ScriptHash"
                                if !is_ref => Some(".data))"),
                        "bitcoin::PubkeyHash"|"bitcoin::hash_types::PubkeyHash"|
                        "bitcoin::ScriptHash"|"bitcoin::hash_types::ScriptHash"
                                if !is_ref => Some(".data))"),
                        "bitcoin::PubkeyHash"|"bitcoin::hash_types::PubkeyHash"|

-                       "bitcoin::hash_types::WPubkeyHash"|"bitcoin::hash_types::WScriptHash"|
+                       "bitcoin::WPubkeyHash"|"bitcoin::hash_types::WPubkeyHash"|
+                       "bitcoin::WScriptHash"|"bitcoin::hash_types::WScriptHash"|

                        "bitcoin::ScriptHash"|"bitcoin::hash_types::ScriptHash"
                                if is_ref => Some(" }.clone()))"),
 
                        // Newtypes that we just expose in their original form.
                        "bitcoin::ScriptHash"|"bitcoin::hash_types::ScriptHash"
                                if is_ref => Some(" }.clone()))"),
 
                        // Newtypes that we just expose in their original form.

-                       "bitcoin::hash_types::Txid" if is_ref => Some(" }[..]).unwrap()"),
-                       "bitcoin::hash_types::Txid" => Some(".data[..]).unwrap()"),
+                       "bitcoin::Txid"|"bitcoin::hash_types::Txid" if is_ref => Some(" }[..]).unwrap()"),
+                       "bitcoin::Txid"|"bitcoin::hash_types::Txid" => Some(".data[..]).unwrap()"),

                        "bitcoin::hash_types::BlockHash"|"bitcoin::BlockHash" if !is_ref => Some(".data[..]).unwrap()"),
                        "bitcoin::hash_types::BlockHash"|"bitcoin::BlockHash" if !is_ref => Some(".data[..]).unwrap()"),

-                       "bitcoin::blockdata::constants::ChainHash" if !is_ref => Some(".data)"),
-                       "lightning::ln::PaymentHash"|"lightning::ln::PaymentPreimage"|"lightning::ln::PaymentSecret"
+                       "bitcoin::constants::ChainHash" if !is_ref => Some(".data)"),
+                       "bitcoin::hashes::sha256::Hash" => Some(" }[..]).unwrap()"),
+                       "lightning::ln::types::PaymentHash"|"lightning_types::payment::PaymentHash"
+                       |"lightning::ln::types::PaymentPreimage"|"lightning_types::payment::PaymentPreimage"
+                       |"lightning::ln::types::PaymentSecret"|"lightning_types::payment::PaymentSecret"

                        |"lightning::ln::channelmanager::PaymentId"|"lightning::ln::channelmanager::InterceptId"
                        |"lightning::sign::KeyMaterial"|"lightning::chain::ClaimId"
                        |"lightning::ln::channelmanager::PaymentId"|"lightning::ln::channelmanager::InterceptId"
                        |"lightning::sign::KeyMaterial"|"lightning::chain::ClaimId"

-                       |"lightning::ln::ChannelId"|"lightning::ln::channel_id::ChannelId"

                                if !is_ref => Some(".data)"),
                                if !is_ref => Some(".data)"),

-                       "lightning::ln::PaymentHash"|"lightning::ln::PaymentPreimage"|"lightning::ln::PaymentSecret"
+                       "lightning::ln::types::PaymentHash"|"lightning_types::payment::PaymentHash"
+                       |"lightning::ln::types::PaymentPreimage"|"lightning_types::payment::PaymentPreimage"
+                       |"lightning::ln::types::PaymentSecret"|"lightning_types::payment::PaymentSecret"

                        |"lightning::ln::channelmanager::PaymentId"|"lightning::ln::channelmanager::InterceptId"
                        |"lightning::sign::KeyMaterial"|"lightning::chain::ClaimId"
                        |"lightning::ln::channelmanager::PaymentId"|"lightning::ln::channelmanager::InterceptId"
                        |"lightning::sign::KeyMaterial"|"lightning::chain::ClaimId"

-                       |"lightning::ln::ChannelId"|"lightning::ln::channel_id::ChannelId"

                                if is_ref => Some(" })"),
 
                        // List of traits we map (possibly during processing of other files):
                                if is_ref => Some(" })"),
 
                        // List of traits we map (possibly during processing of other files):


@@ -1361,8 +1390,8 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                        "[u8]" if is_ref => Some(("crate::c_types::u8slice::from_slice(", ")")),
                        "[usize]" if is_ref => Some(("crate::c_types::usizeslice::from_slice(", ")")),
 
                        "[u8]" if is_ref => Some(("crate::c_types::u8slice::from_slice(", ")")),
                        "[usize]" if is_ref => Some(("crate::c_types::usizeslice::from_slice(", ")")),
 

-                       "bitcoin::blockdata::block::Header" if is_ref => Some(("{ let mut s = [0u8; 80]; s[..].copy_from_slice(&::bitcoin::consensus::encode::serialize(", ")); s }")),
-                       "bitcoin::blockdata::block::Block" if is_ref => Some(("::bitcoin::consensus::encode::serialize(", ")")),
+                       "bitcoin::block::Header" if is_ref => Some(("{ let mut s = [0u8; 80]; s[..].copy_from_slice(&::bitcoin::consensus::encode::serialize(", ")); s }")),
+                       "bitcoin::block::Block" if is_ref => Some(("::bitcoin::consensus::encode::serialize(", ")")),

 
                        _ => None,
                }.map(|s| s.to_owned())
 
                        _ => None,
                }.map(|s| s.to_owned())


@@ -1383,20 +1412,22 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                        "[u8; 16]" if !is_ref => Some("crate::c_types::SixteenBytes { data: "),
                        "[u8; 12]" if !is_ref => Some("crate::c_types::TwelveBytes { data: "),
                        "[u8; 4]" if !is_ref => Some("crate::c_types::FourBytes { data: "),
                        "[u8; 16]" if !is_ref => Some("crate::c_types::SixteenBytes { data: "),
                        "[u8; 12]" if !is_ref => Some("crate::c_types::TwelveBytes { data: "),
                        "[u8; 4]" if !is_ref => Some("crate::c_types::FourBytes { data: "),

+                       "[u8; 3]" if !is_ref => Some("crate::c_types::ThreeBytes { data: "),

                        "[u8; 3]" if is_ref => Some(""),
                        "[u16; 32]" if !is_ref => Some("crate::c_types::ThirtyTwoU16s { data: "),
 
                        "[u8]" if is_ref => Some("local_"),
                        "[usize]" if is_ref => Some("local_"),
 
                        "[u8; 3]" if is_ref => Some(""),
                        "[u16; 32]" if !is_ref => Some("crate::c_types::ThirtyTwoU16s { data: "),
 
                        "[u8]" if is_ref => Some("local_"),
                        "[usize]" if is_ref => Some("local_"),
 

-                       "str" if is_ref => Some(""),
+                       "str" => Some(""),

                        "alloc::string::String"|"String"|"std::path::PathBuf" => Some(""),
 
                        "alloc::string::String"|"String"|"std::path::PathBuf" => Some(""),
 

-                       "bitcoin::Address" => Some("alloc::string::ToString::to_string(&"),
+                       "bitcoin::address::Address"|"bitcoin::Address" => Some("alloc::string::ToString::to_string(&"),

 
                        "std::time::Duration"|"core::time::Duration" => Some(""),
                        "std::time::SystemTime" => Some(""),
 
                        "std::time::Duration"|"core::time::Duration" => Some(""),
                        "std::time::SystemTime" => Some(""),

-                       "std::io::Error"|"lightning::io::Error" => Some("crate::c_types::IOError::from_rust("),
+                       "std::io::Error" => Some("crate::c_types::IOError::from_rust("),
+                       "lightning::io::Error" => Some("crate::c_types::IOError::from_bitcoin("),

                        "lightning::io::ErrorKind" => Some("crate::c_types::IOError::from_rust_kind("),
                        "core::fmt::Arguments" => Some("alloc::format!(\"{}\", "),
 
                        "lightning::io::ErrorKind" => Some("crate::c_types::IOError::from_rust_kind("),
                        "core::fmt::Arguments" => Some("alloc::format!(\"{}\", "),
 


@@ -1412,8 +1443,10 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 
                        "bitcoin::bech32::u5"|"bech32::u5" => Some(""),
                        "u128" => Some(""),
 
                        "bitcoin::bech32::u5"|"bech32::u5" => Some(""),
                        "u128" => Some(""),

+                       "core::num::NonZeroU64" => Some(""),

 
                        "bitcoin::secp256k1::PublicKey"|"secp256k1::PublicKey" => Some("crate::c_types::PublicKey::from_rust(&"),
 
                        "bitcoin::secp256k1::PublicKey"|"secp256k1::PublicKey" => Some("crate::c_types::PublicKey::from_rust(&"),

+                       "bitcoin::key::TweakedPublicKey" => Some("crate::c_types::TweakedPublicKey::from_rust(&"),

                        "bitcoin::secp256k1::ecdsa::Signature" => Some("crate::c_types::ECDSASignature::from_rust(&"),
                        "bitcoin::secp256k1::schnorr::Signature" => Some("crate::c_types::SchnorrSignature::from_rust(&"),
                        "bitcoin::secp256k1::ecdsa::RecoverableSignature" => Some("crate::c_types::RecoverableSignature::from_rust(&"),
                        "bitcoin::secp256k1::ecdsa::Signature" => Some("crate::c_types::ECDSASignature::from_rust(&"),
                        "bitcoin::secp256k1::schnorr::Signature" => Some("crate::c_types::SchnorrSignature::from_rust(&"),
                        "bitcoin::secp256k1::ecdsa::RecoverableSignature" => Some("crate::c_types::RecoverableSignature::from_rust(&"),


@@ -1423,48 +1456,53 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                        "bitcoin::secp256k1::Scalar" if !is_ref => Some("crate::c_types::BigEndianScalar::from_rust(&"),
                        "bitcoin::secp256k1::ecdh::SharedSecret" if !is_ref => Some("crate::c_types::ThirtyTwoBytes { data: "),
 
                        "bitcoin::secp256k1::Scalar" if !is_ref => Some("crate::c_types::BigEndianScalar::from_rust(&"),
                        "bitcoin::secp256k1::ecdh::SharedSecret" if !is_ref => Some("crate::c_types::ThirtyTwoBytes { data: "),
 

-                       "bitcoin::blockdata::script::Script"|"bitcoin::Script" => Some("crate::c_types::u8slice::from_slice("),
-                       "bitcoin::blockdata::script::ScriptBuf"|"bitcoin::ScriptBuf" => 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::amount::Amount" => Some(""),
+
+                       "bitcoin::script::Script"|"bitcoin::Script" => Some("crate::c_types::u8slice::from_slice("),
+                       "bitcoin::script::ScriptBuf"|"bitcoin::ScriptBuf" => Some(""),
+                       "bitcoin::transaction::Transaction"|"bitcoin::Transaction" if is_ref => Some("crate::c_types::Transaction::from_bitcoin("),
+                       "bitcoin::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::Witness" if is_ref => Some("crate::c_types::Witness::from_bitcoin("),
                        "bitcoin::Witness" if !is_ref => Some("crate::c_types::Witness::from_bitcoin(&"),

-                       "bitcoin::OutPoint"|"bitcoin::blockdata::transaction::OutPoint" if is_ref => Some("crate::c_types::bitcoin_to_C_outpoint("),
-                       "bitcoin::OutPoint"|"bitcoin::blockdata::transaction::OutPoint" if !is_ref => Some("crate::c_types::bitcoin_to_C_outpoint(&"),
-                       "bitcoin::TxIn"|"bitcoin::blockdata::transaction::TxIn" if !is_ref => Some("crate::c_types::TxIn::from_rust(&"),
-                       "bitcoin::TxOut"|"bitcoin::blockdata::transaction::TxOut" if !is_ref => Some("crate::c_types::TxOut::from_rust(&"),
-                       "bitcoin::TxOut"|"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("),
-                       "bitcoin::address::WitnessVersion" => Some(""),
-                       "bitcoin::address::WitnessProgram" => Some("crate::c_types::WitnessProgram::from_bitcoin("),
-                       "bitcoin::blockdata::block::Header" if is_ref => Some("&local_"),
-                       "bitcoin::blockdata::block::Block" if is_ref => Some("crate::c_types::u8slice::from_slice(&local_"),
+                       "bitcoin::OutPoint"|"bitcoin::transaction::OutPoint" if is_ref => Some("crate::c_types::bitcoin_to_C_outpoint("),
+                       "bitcoin::OutPoint"|"bitcoin::transaction::OutPoint" if !is_ref => Some("crate::c_types::bitcoin_to_C_outpoint(&"),
+                       "bitcoin::TxIn"|"bitcoin::transaction::TxIn" if !is_ref => Some("crate::c_types::TxIn::from_rust(&"),
+                       "bitcoin::TxOut"|"bitcoin::transaction::TxOut" if !is_ref => Some("crate::c_types::TxOut::from_rust(&"),
+                       "bitcoin::TxOut"|"bitcoin::transaction::TxOut" if is_ref => Some("crate::c_types::TxOut::from_rust("),
+                       "bitcoin::network::constants::Network"|"bitcoin::network::Network" => Some("crate::bitcoin::network::Network::from_bitcoin("),
+                       "bitcoin::WitnessVersion"|"bitcoin::address::WitnessVersion" => Some(""),
+                       "bitcoin::WitnessProgram"|"bitcoin::address::WitnessProgram" => Some("crate::c_types::WitnessProgram::from_bitcoin("),
+                       "bitcoin::block::Header" if is_ref => Some("&local_"),
+                       "bitcoin::block::Block" if is_ref => Some("crate::c_types::u8slice::from_slice(&local_"),

 
 

-                       "bitcoin::blockdata::locktime::absolute::LockTime" => Some(""),
+                       "bitcoin::locktime::absolute::LockTime" => Some(""),

 
 

-                       "bitcoin::psbt::PartiallySignedTransaction" if !is_ref => Some(""),
+                       "bitcoin::Psbt"|"bitcoin::psbt::PartiallySignedTransaction" if !is_ref => Some(""),

 
                        "bitcoin::PubkeyHash"|"bitcoin::hash_types::PubkeyHash"|
 
                        "bitcoin::PubkeyHash"|"bitcoin::hash_types::PubkeyHash"|

-                       "bitcoin::hash_types::WPubkeyHash"|"bitcoin::hash_types::WScriptHash"|
+                       "bitcoin::WPubkeyHash"|"bitcoin::hash_types::WPubkeyHash"|
+                       "bitcoin::WScriptHash"|"bitcoin::hash_types::WScriptHash"|

                        "bitcoin::ScriptHash"|"bitcoin::hash_types::ScriptHash"
                                if !is_ref => Some("crate::c_types::TwentyBytes { data: *"),
 
                        // Newtypes that we just expose in their original form.
                        "bitcoin::ScriptHash"|"bitcoin::hash_types::ScriptHash"
                                if !is_ref => Some("crate::c_types::TwentyBytes { data: *"),
 
                        // Newtypes that we just expose in their original form.

-                       "bitcoin::hash_types::Txid"|"bitcoin::BlockHash"|"bitcoin::hash_types::BlockHash"|"bitcoin::hashes::sha256::Hash"|"bitcoin::blockdata::constants::ChainHash"
+                       "bitcoin::Txid"|"bitcoin::hash_types::Txid"|"bitcoin::BlockHash"|"bitcoin::hash_types::BlockHash"|"bitcoin::hashes::sha256::Hash"|"bitcoin::constants::ChainHash"|"bitcoin::hashes::sha256::Hash"

                                if is_ref => Some(""),
                                if is_ref => Some(""),

-                       "bitcoin::hash_types::Txid"|"bitcoin::BlockHash"|"bitcoin::hash_types::BlockHash"|"bitcoin::hashes::sha256::Hash"|"bitcoin::blockdata::constants::ChainHash"
+                       "bitcoin::Txid"|"bitcoin::hash_types::Txid"|"bitcoin::BlockHash"|"bitcoin::hash_types::BlockHash"|"bitcoin::hashes::sha256::Hash"|"bitcoin::constants::ChainHash"|"bitcoin::hashes::sha256::Hash"

                                if !is_ref => Some("crate::c_types::ThirtyTwoBytes { data: *"),
                        "bitcoin::secp256k1::Message" if !is_ref => Some("crate::c_types::ThirtyTwoBytes { data: "),
                        "bitcoin::secp256k1::Message" if is_ref => Some(""),
                                if !is_ref => Some("crate::c_types::ThirtyTwoBytes { data: *"),
                        "bitcoin::secp256k1::Message" if !is_ref => Some("crate::c_types::ThirtyTwoBytes { data: "),
                        "bitcoin::secp256k1::Message" if is_ref => Some(""),

-                       "lightning::ln::PaymentHash"|"lightning::ln::PaymentPreimage"|"lightning::ln::PaymentSecret"
+                       "lightning::ln::types::PaymentHash"|"lightning_types::payment::PaymentHash"
+                       |"lightning::ln::types::PaymentPreimage"|"lightning_types::payment::PaymentPreimage"
+                       |"lightning::ln::types::PaymentSecret"|"lightning_types::payment::PaymentSecret"

                        |"lightning::ln::channelmanager::PaymentId"|"lightning::ln::channelmanager::InterceptId"
                        |"lightning::sign::KeyMaterial"|"lightning::chain::ClaimId"
                        |"lightning::ln::channelmanager::PaymentId"|"lightning::ln::channelmanager::InterceptId"
                        |"lightning::sign::KeyMaterial"|"lightning::chain::ClaimId"

-                       |"lightning::ln::ChannelId"|"lightning::ln::channel_id::ChannelId"

                                if is_ref => Some("&"),
                                if is_ref => Some("&"),

-                       "lightning::ln::PaymentHash"|"lightning::ln::PaymentPreimage"|"lightning::ln::PaymentSecret"
+                       "lightning::ln::types::PaymentHash"|"lightning_types::payment::PaymentHash"
+                       |"lightning::ln::types::PaymentPreimage"|"lightning_types::payment::PaymentPreimage"
+                       |"lightning::ln::types::PaymentSecret"|"lightning_types::payment::PaymentSecret"

                        |"lightning::ln::channelmanager::PaymentId"|"lightning::ln::channelmanager::InterceptId"
                        |"lightning::sign::KeyMaterial"|"lightning::chain::ClaimId"
                        |"lightning::ln::channelmanager::PaymentId"|"lightning::ln::channelmanager::InterceptId"
                        |"lightning::sign::KeyMaterial"|"lightning::chain::ClaimId"

-                       |"lightning::ln::ChannelId"|"lightning::ln::channel_id::ChannelId"

                                if !is_ref => Some("crate::c_types::ThirtyTwoBytes { data: "),
 
                        "lightning::io::Read" => Some("crate::c_types::u8slice::from_vec(&crate::c_types::reader_to_vec("),
                                if !is_ref => Some("crate::c_types::ThirtyTwoBytes { data: "),
 
                        "lightning::io::Read" => Some("crate::c_types::u8slice::from_vec(&crate::c_types::reader_to_vec("),


@@ -1488,17 +1526,18 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                        "[u8; 16]" if !is_ref => Some(" }"),
                        "[u8; 12]" if !is_ref => Some(" }"),
                        "[u8; 4]" if !is_ref => Some(" }"),
                        "[u8; 16]" if !is_ref => Some(" }"),
                        "[u8; 12]" if !is_ref => Some(" }"),
                        "[u8; 4]" if !is_ref => Some(" }"),

+                       "[u8; 3]" if !is_ref => Some(" }"),

                        "[u8; 3]" if is_ref => Some(""),
                        "[u16; 32]" if !is_ref => Some(" }"),
 
                        "[u8]" if is_ref => Some(""),
                        "[usize]" if is_ref => Some(""),
 
                        "[u8; 3]" if is_ref => Some(""),
                        "[u16; 32]" if !is_ref => Some(" }"),
 
                        "[u8]" if is_ref => Some(""),
                        "[usize]" if is_ref => Some(""),
 

-                       "str" if is_ref => Some(".into()"),
+                       "str" => Some(".into()"),

                        "alloc::string::String"|"String"|"std::path::PathBuf" if is_ref => Some(".as_str().into()"),
                        "alloc::string::String"|"String"|"std::path::PathBuf" => Some(".into()"),
 
                        "alloc::string::String"|"String"|"std::path::PathBuf" if is_ref => Some(".as_str().into()"),
                        "alloc::string::String"|"String"|"std::path::PathBuf" => Some(".into()"),
 

-                       "bitcoin::Address" => Some(").into()"),
+                       "bitcoin::address::Address"|"bitcoin::Address" => Some(").into()"),

 
                        "std::time::Duration"|"core::time::Duration" => Some(".as_secs()"),
                        "std::time::SystemTime" => Some(".duration_since(::std::time::SystemTime::UNIX_EPOCH).expect(\"Times must be post-1970\").as_secs()"),
 
                        "std::time::Duration"|"core::time::Duration" => Some(".as_secs()"),
                        "std::time::SystemTime" => Some(".duration_since(::std::time::SystemTime::UNIX_EPOCH).expect(\"Times must be post-1970\").as_secs()"),


@@ -1517,8 +1556,10 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 
                        "bitcoin::bech32::u5"|"bech32::u5" => Some(".into()"),
                        "u128" => Some(".into()"),
 
                        "bitcoin::bech32::u5"|"bech32::u5" => Some(".into()"),
                        "u128" => Some(".into()"),

+                       "core::num::NonZeroU64" => Some(".into()"),

 
                        "bitcoin::secp256k1::PublicKey"|"secp256k1::PublicKey" => Some(")"),
 
                        "bitcoin::secp256k1::PublicKey"|"secp256k1::PublicKey" => Some(")"),

+                       "bitcoin::key::TweakedPublicKey" => Some(")"),

                        "bitcoin::secp256k1::ecdsa::Signature"|"bitcoin::secp256k1::schnorr::Signature" => Some(")"),
                        "bitcoin::secp256k1::ecdsa::RecoverableSignature" => Some(")"),
                        "bitcoin::secp256k1::SecretKey" if !is_ref => Some(")"),
                        "bitcoin::secp256k1::ecdsa::Signature"|"bitcoin::secp256k1::schnorr::Signature" => Some(")"),
                        "bitcoin::secp256k1::ecdsa::RecoverableSignature" => Some(")"),
                        "bitcoin::secp256k1::SecretKey" if !is_ref => Some(")"),


@@ -1527,45 +1568,50 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                        "bitcoin::secp256k1::Scalar" if !is_ref => Some(")"),
                        "bitcoin::secp256k1::ecdh::SharedSecret" if !is_ref => Some(".secret_bytes() }"),
 
                        "bitcoin::secp256k1::Scalar" if !is_ref => Some(")"),
                        "bitcoin::secp256k1::ecdh::SharedSecret" if !is_ref => Some(".secret_bytes() }"),
 

-                       "bitcoin::blockdata::script::Script"|"bitcoin::Script" => Some(".as_ref())"),
-                       "bitcoin::blockdata::script::ScriptBuf"|"bitcoin::ScriptBuf" if is_ref => Some(".as_bytes().to_vec().into()"),
-                       "bitcoin::blockdata::script::ScriptBuf"|"bitcoin::ScriptBuf" if !is_ref => Some(".to_bytes().into()"),
-                       "bitcoin::blockdata::transaction::Transaction"|"bitcoin::Transaction" => Some(")"),
+                       "bitcoin::amount::Amount" => Some(".to_sat()"),
+
+                       "bitcoin::script::Script"|"bitcoin::Script" => Some(".as_ref())"),
+                       "bitcoin::script::ScriptBuf"|"bitcoin::ScriptBuf" if is_ref => Some(".as_bytes().to_vec().into()"),
+                       "bitcoin::script::ScriptBuf"|"bitcoin::ScriptBuf" if !is_ref => Some(".to_bytes().into()"),
+                       "bitcoin::transaction::Transaction"|"bitcoin::Transaction" => Some(")"),

                        "bitcoin::Witness" => Some(")"),
                        "bitcoin::Witness" => Some(")"),

-                       "bitcoin::OutPoint"|"bitcoin::blockdata::transaction::OutPoint" => Some(")"),
-                       "bitcoin::TxIn"|"bitcoin::blockdata::transaction::TxIn" if !is_ref => Some(")"),
-                       "bitcoin::TxOut"|"bitcoin::blockdata::transaction::TxOut" => Some(")"),
-                       "bitcoin::network::constants::Network" => Some(")"),
-                       "bitcoin::address::WitnessVersion" => Some(".into()"),
-                       "bitcoin::address::WitnessProgram" => Some(")"),
-                       "bitcoin::blockdata::block::Header" if is_ref => Some(""),
-                       "bitcoin::blockdata::block::Block" if is_ref => Some(")"),
+                       "bitcoin::OutPoint"|"bitcoin::transaction::OutPoint" => Some(")"),
+                       "bitcoin::TxIn"|"bitcoin::transaction::TxIn" if !is_ref => Some(")"),
+                       "bitcoin::TxOut"|"bitcoin::transaction::TxOut" => Some(")"),
+                       "bitcoin::network::constants::Network"|"bitcoin::network::Network" => Some(")"),
+                       "bitcoin::WitnessVersion"|"bitcoin::address::WitnessVersion" => Some(".into()"),
+                       "bitcoin::WitnessProgram"|"bitcoin::address::WitnessProgram" => Some(")"),
+                       "bitcoin::block::Header" if is_ref => Some(""),
+                       "bitcoin::block::Block" if is_ref => Some(")"),

 
 

-                       "bitcoin::blockdata::locktime::absolute::LockTime" => Some(".to_consensus_u32()"),
+                       "bitcoin::locktime::absolute::LockTime" => Some(".to_consensus_u32()"),

 
 

-                       "bitcoin::psbt::PartiallySignedTransaction" if !is_ref => Some(".serialize().into()"),
+                       "bitcoin::Psbt"|"bitcoin::psbt::PartiallySignedTransaction" if !is_ref => Some(".serialize().into()"),

 
                        "bitcoin::PubkeyHash"|"bitcoin::hash_types::PubkeyHash"|
 
                        "bitcoin::PubkeyHash"|"bitcoin::hash_types::PubkeyHash"|

-                       "bitcoin::hash_types::WPubkeyHash"|"bitcoin::hash_types::WScriptHash"|
+                       "bitcoin::WPubkeyHash"|"bitcoin::hash_types::WPubkeyHash"|
+                       "bitcoin::WScriptHash"|"bitcoin::hash_types::WScriptHash"|

                        "bitcoin::ScriptHash"|"bitcoin::hash_types::ScriptHash"
                                if !is_ref => Some(".as_ref() }"),
 
                        // Newtypes that we just expose in their original form.
                        "bitcoin::ScriptHash"|"bitcoin::hash_types::ScriptHash"
                                if !is_ref => Some(".as_ref() }"),
 
                        // Newtypes that we just expose in their original form.

-                       "bitcoin::hash_types::Txid"|"bitcoin::BlockHash"|"bitcoin::hash_types::BlockHash"|"bitcoin::hashes::sha256::Hash"|"bitcoin::blockdata::constants::ChainHash"
+                       "bitcoin::Txid"|"bitcoin::hash_types::Txid"|"bitcoin::BlockHash"|"bitcoin::hash_types::BlockHash"|"bitcoin::hashes::sha256::Hash"|"bitcoin::constants::ChainHash"|"bitcoin::hashes::sha256::Hash"

                                if is_ref => Some(".as_ref()"),
                                if is_ref => Some(".as_ref()"),

-                       "bitcoin::hash_types::Txid"|"bitcoin::BlockHash"|"bitcoin::hash_types::BlockHash"|"bitcoin::hashes::sha256::Hash"|"bitcoin::blockdata::constants::ChainHash"
+                       "bitcoin::Txid"|"bitcoin::hash_types::Txid"|"bitcoin::BlockHash"|"bitcoin::hash_types::BlockHash"|"bitcoin::hashes::sha256::Hash"|"bitcoin::constants::ChainHash"|"bitcoin::hashes::sha256::Hash"

                                if !is_ref => Some(".as_ref() }"),
                        "bitcoin::secp256k1::Message" if !is_ref => Some(".as_ref().clone() }"),
                        "bitcoin::secp256k1::Message" if is_ref => Some(".as_ref()"),
                                if !is_ref => Some(".as_ref() }"),
                        "bitcoin::secp256k1::Message" if !is_ref => Some(".as_ref().clone() }"),
                        "bitcoin::secp256k1::Message" if is_ref => Some(".as_ref()"),

-                       "lightning::ln::PaymentHash"|"lightning::ln::PaymentPreimage"|"lightning::ln::PaymentSecret"
+                       "lightning::ln::types::PaymentHash"|"lightning_types::payment::PaymentHash"
+                       |"lightning::ln::types::PaymentPreimage"|"lightning_types::payment::PaymentPreimage"
+                       |"lightning::ln::types::PaymentSecret"|"lightning_types::payment::PaymentSecret"

                        |"lightning::ln::channelmanager::PaymentId"|"lightning::ln::channelmanager::InterceptId"
                        |"lightning::sign::KeyMaterial"|"lightning::chain::ClaimId"
                        |"lightning::ln::channelmanager::PaymentId"|"lightning::ln::channelmanager::InterceptId"
                        |"lightning::sign::KeyMaterial"|"lightning::chain::ClaimId"

-                       |"lightning::ln::ChannelId"|"lightning::ln::channel_id::ChannelId"

                                if is_ref => Some(".0"),
                                if is_ref => Some(".0"),

-                       "lightning::ln::PaymentHash"|"lightning::ln::PaymentPreimage"|"lightning::ln::PaymentSecret"
+                       "lightning::ln::types::PaymentHash"|"lightning_types::payment::PaymentHash"
+                       |"lightning::ln::types::PaymentPreimage"|"lightning_types::payment::PaymentPreimage"
+                       |"lightning::ln::types::PaymentSecret"|"lightning_types::payment::PaymentSecret"

                        |"lightning::ln::channelmanager::PaymentId"|"lightning::ln::channelmanager::InterceptId"
                        |"lightning::sign::KeyMaterial"|"lightning::chain::ClaimId"
                        |"lightning::ln::channelmanager::PaymentId"|"lightning::ln::channelmanager::InterceptId"
                        |"lightning::sign::KeyMaterial"|"lightning::chain::ClaimId"

-                       |"lightning::ln::ChannelId"|"lightning::ln::channel_id::ChannelId"

                                if !is_ref => Some(".0 }"),
 
                        "lightning::io::Read" => Some("))"),
                                if !is_ref => Some(".0 }"),
 
                        "lightning::io::Read" => Some("))"),


@@ -1577,6 +1623,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
        fn empty_val_check_suffix_from_path(&self, full_path: &str) -> Option<&str> {
                match full_path {
                        "secp256k1::PublicKey"|"bitcoin::secp256k1::PublicKey" => Some(".is_null()"),
        fn empty_val_check_suffix_from_path(&self, full_path: &str) -> Option<&str> {
                match full_path {
                        "secp256k1::PublicKey"|"bitcoin::secp256k1::PublicKey" => Some(".is_null()"),

+                       "str" => Some(".is_empty()"),

                        _ => None
                }
        }
                        _ => None
                }
        }


@@ -1961,11 +2008,19 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                                        // the original crate.
                                        write!(w, "{}", self.real_rust_type_mapping(&resolved)).unwrap();
                                } else {
                                        // the original crate.
                                        write!(w, "{}", self.real_rust_type_mapping(&resolved)).unwrap();
                                } else {

+                                       if let Some(trait_impls) = self.crate_types.traits_impld.get(&resolved) {
+                                               if self.crate_types.traits.get(&resolved).is_none() && trait_impls.len() == 1 {
+                                                       write!(w, "crate::{}", trait_impls[0]).unwrap();
+                                                       return;
+                                               }
+                                       }

                                        write!(w, "crate::{}", resolved).unwrap();
                                }
                        }
                                        write!(w, "crate::{}", resolved).unwrap();
                                }
                        }

-                       if let syn::PathArguments::AngleBracketed(args) = &path.segments.iter().last().unwrap().arguments {
-                               self.write_rust_generic_arg(w, generics_resolver, args.args.iter(), with_ref_lifetime);
+                       if !generated_crate_ref {
+                               if let syn::PathArguments::AngleBracketed(args) = &path.segments.iter().last().unwrap().arguments {
+                                       self.write_rust_generic_arg(w, generics_resolver, args.args.iter(), with_ref_lifetime);
+                               }

                        }
                } else {
                        if path.leading_colon.is_some() {
                        }
                } else {
                        if path.leading_colon.is_some() {


@@ -2029,7 +2084,11 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                                }
                                if let Some(resolved_ty) = self.maybe_resolve_path(&p.path, generics) {
                                        generate_crate_ref |= self.maybe_resolve_path(&p.path, None).as_ref() != Some(&resolved_ty);
                                }
                                if let Some(resolved_ty) = self.maybe_resolve_path(&p.path, generics) {
                                        generate_crate_ref |= self.maybe_resolve_path(&p.path, None).as_ref() != Some(&resolved_ty);

-                                       if self.crate_types.traits.get(&resolved_ty).is_none() { generate_crate_ref = false; }
+                                       let mut is_trait = self.crate_types.traits.get(&resolved_ty).is_some();
+                                       is_trait |= self.crate_types.traits_impld.get(&resolved_ty).is_some();
+                                       if !is_trait {
+                                               generate_crate_ref = false;
+                                       }

                                }
                                self.write_rust_path(w, generics, &p.path, with_ref_lifetime, generate_crate_ref);
                        },
                                }
                                self.write_rust_path(w, generics, &p.path, with_ref_lifetime, generate_crate_ref);
                        },


@@ -2214,7 +2273,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
        }
 
        fn write_conversion_inline_intern<W: std::io::Write,
        }
 
        fn write_conversion_inline_intern<W: std::io::Write,

-                       LP: Fn(&str, bool, bool) -> Option<String>, DL: Fn(&mut W, &DeclType, &str, bool, bool), SC: Fn(bool, Option<&str>) -> String>
+                       LP: Fn(&str, bool, bool) -> Option<String>, DL: Fn(&mut W, &DeclType, &str, bool, bool, bool), SC: Fn(bool, Option<&str>) -> String>

                        (&self, w: &mut W, t: &syn::Type, generics: Option<&GenericTypes>, is_ref: bool, is_mut: bool, ptr_for_ref: bool,
                         tupleconv: &str, prefix: bool, sliceconv: SC, path_lookup: LP, decl_lookup: DL) {
                match generics.resolve_type(t) {
                        (&self, w: &mut W, t: &syn::Type, generics: Option<&GenericTypes>, is_ref: bool, is_mut: bool, ptr_for_ref: bool,
                         tupleconv: &str, prefix: bool, sliceconv: SC, path_lookup: LP, decl_lookup: DL) {
                match generics.resolve_type(t) {


@@ -2237,14 +2296,14 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                                } else if let Some(c_type) = path_lookup(&resolved_path, is_ref, ptr_for_ref) {
                                        write!(w, "{}", c_type).unwrap();
                                } else if let Some((_, generics)) = self.crate_types.opaques.get(&resolved_path) {
                                } else if let Some(c_type) = path_lookup(&resolved_path, is_ref, ptr_for_ref) {
                                        write!(w, "{}", c_type).unwrap();
                                } else if let Some((_, generics)) = self.crate_types.opaques.get(&resolved_path) {

-                                       decl_lookup(w, &DeclType::StructImported { generics: &generics }, &resolved_path, is_ref, is_mut);
+                                       decl_lookup(w, &DeclType::StructImported { generics: &generics }, &resolved_path, is_ref, is_mut, false);

                                } else if self.crate_types.mirrored_enums.get(&resolved_path).is_some() {
                                } else if self.crate_types.mirrored_enums.get(&resolved_path).is_some() {

-                                       decl_lookup(w, &DeclType::MirroredEnum, &resolved_path, is_ref, is_mut);
+                                       decl_lookup(w, &DeclType::MirroredEnum, &resolved_path, is_ref, is_mut, false);

                                } else if let Some(t) = self.crate_types.traits.get(&resolved_path) {
                                } else if let Some(t) = self.crate_types.traits.get(&resolved_path) {

-                                       decl_lookup(w, &DeclType::Trait(t), &resolved_path, is_ref, is_mut);
+                                       decl_lookup(w, &DeclType::Trait(t), &resolved_path, is_ref, is_mut, false);

                                } else if let Some(ident) = single_ident_generic_path_to_ident(&p.path) {
                                        if let Some(decl_type) = self.types.maybe_resolve_declared(ident) {
                                } else if let Some(ident) = single_ident_generic_path_to_ident(&p.path) {
                                        if let Some(decl_type) = self.types.maybe_resolve_declared(ident) {

-                                               decl_lookup(w, decl_type, &self.maybe_resolve_ident(ident).unwrap(), is_ref, is_mut);
+                                               decl_lookup(w, decl_type, &self.maybe_resolve_ident(ident).unwrap(), is_ref, is_mut, false);

                                        } else { unimplemented!(); }
                                } else {
                                        if let Some(trait_impls) = self.crate_types.traits_impld.get(&resolved_path) {
                                        } else { unimplemented!(); }
                                } else {
                                        if let Some(trait_impls) = self.crate_types.traits_impld.get(&resolved_path) {


@@ -2253,7 +2312,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                                                        // in the whole crate, just treat it as a reference to whatever the
                                                        // implementor is.
                                                        let implementor = self.crate_types.opaques.get(&trait_impls[0]).unwrap();
                                                        // in the whole crate, just treat it as a reference to whatever the
                                                        // implementor is.
                                                        let implementor = self.crate_types.opaques.get(&trait_impls[0]).unwrap();

-                                                       decl_lookup(w, &DeclType::StructImported { generics: &implementor.1 }, &trait_impls[0], true, is_mut);
+                                                       decl_lookup(w, &DeclType::StructImported { generics: &implementor.1 }, &trait_impls[0], true, is_mut, true);

                                                        return;
                                                }
                                        }
                                                        return;
                                                }
                                        }


@@ -2337,11 +2396,14 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
        fn write_to_c_conversion_inline_prefix_inner<W: std::io::Write>(&self, w: &mut W, t: &syn::Type, generics: Option<&GenericTypes>, is_ref: bool, ptr_for_ref: bool, from_ptr: bool) {
                self.write_conversion_inline_intern(w, t, generics, is_ref, false, ptr_for_ref, "() /*", true, |_, _| "local_".to_owned(),
                                |a, b, c| self.to_c_conversion_inline_prefix_from_path(a, b, c),
        fn write_to_c_conversion_inline_prefix_inner<W: std::io::Write>(&self, w: &mut W, t: &syn::Type, generics: Option<&GenericTypes>, is_ref: bool, ptr_for_ref: bool, from_ptr: bool) {
                self.write_conversion_inline_intern(w, t, generics, is_ref, false, ptr_for_ref, "() /*", true, |_, _| "local_".to_owned(),
                                |a, b, c| self.to_c_conversion_inline_prefix_from_path(a, b, c),

-                               |w, decl_type, decl_path, is_ref, _is_mut| {
+                               |w, decl_type, decl_path, is_ref, _is_mut, is_trait_alias| {

                                        match decl_type {
                                                DeclType::MirroredEnum if is_ref && ptr_for_ref => write!(w, "crate::{}::from_native(", decl_path).unwrap(),
                                                DeclType::MirroredEnum if is_ref => write!(w, "&crate::{}::from_native(", decl_path).unwrap(),
                                                DeclType::MirroredEnum => write!(w, "crate::{}::native_into(", decl_path).unwrap(),
                                        match decl_type {
                                                DeclType::MirroredEnum if is_ref && ptr_for_ref => write!(w, "crate::{}::from_native(", decl_path).unwrap(),
                                                DeclType::MirroredEnum if is_ref => write!(w, "&crate::{}::from_native(", decl_path).unwrap(),
                                                DeclType::MirroredEnum => write!(w, "crate::{}::native_into(", decl_path).unwrap(),

+                                               DeclType::StructImported {..} if is_trait_alias => {
+                                                       if is_ref { write!(w, "&").unwrap(); }
+                                               },

                                                DeclType::EnumIgnored {..}|DeclType::StructImported {..} if is_ref && from_ptr => {
                                                        if !ptr_for_ref { write!(w, "&").unwrap(); }
                                                        write!(w, "crate::{} {{ inner: unsafe {{ (", decl_path).unwrap()
                                                DeclType::EnumIgnored {..}|DeclType::StructImported {..} if is_ref && from_ptr => {
                                                        if !ptr_for_ref { write!(w, "&").unwrap(); }
                                                        write!(w, "crate::{} {{ inner: unsafe {{ (", decl_path).unwrap()


@@ -2366,8 +2428,11 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
        fn write_to_c_conversion_inline_suffix_inner<W: std::io::Write>(&self, w: &mut W, t: &syn::Type, generics: Option<&GenericTypes>, is_ref: bool, ptr_for_ref: bool, from_ptr: bool) {
                self.write_conversion_inline_intern(w, t, generics, is_ref, false, ptr_for_ref, "*/", false, |_, _| ".into()".to_owned(),
                                |a, b, c| self.to_c_conversion_inline_suffix_from_path(a, b, c),
        fn write_to_c_conversion_inline_suffix_inner<W: std::io::Write>(&self, w: &mut W, t: &syn::Type, generics: Option<&GenericTypes>, is_ref: bool, ptr_for_ref: bool, from_ptr: bool) {
                self.write_conversion_inline_intern(w, t, generics, is_ref, false, ptr_for_ref, "*/", false, |_, _| ".into()".to_owned(),
                                |a, b, c| self.to_c_conversion_inline_suffix_from_path(a, b, c),

-                               |w, decl_type, full_path, is_ref, _is_mut| match decl_type {
+                               |w, decl_type, full_path, is_ref, _is_mut, is_trait_alias| match decl_type {

                                        DeclType::MirroredEnum => write!(w, ")").unwrap(),
                                        DeclType::MirroredEnum => write!(w, ")").unwrap(),

+                                       DeclType::StructImported {..} if is_trait_alias => {
+                                               write!(w, ".as_ref_to()").unwrap();
+                                       },

                                        DeclType::EnumIgnored { generics }|DeclType::StructImported { generics } if is_ref => {
                                                write!(w, " as *const {}<", full_path).unwrap();
                                                for param in generics.params.iter() {
                                        DeclType::EnumIgnored { generics }|DeclType::StructImported { generics } if is_ref => {
                                                write!(w, " as *const {}<", full_path).unwrap();
                                                for param in generics.params.iter() {


@@ -2404,7 +2469,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
        fn write_from_c_conversion_prefix_inner<W: std::io::Write>(&self, w: &mut W, t: &syn::Type, generics: Option<&GenericTypes>, is_ref: bool, _ptr_for_ref: bool) {
                self.write_conversion_inline_intern(w, t, generics, is_ref, false, false, "() /*", true, |_, _| "&local_".to_owned(),
                                |a, b, _c| self.from_c_conversion_prefix_from_path(a, b),
        fn write_from_c_conversion_prefix_inner<W: std::io::Write>(&self, w: &mut W, t: &syn::Type, generics: Option<&GenericTypes>, is_ref: bool, _ptr_for_ref: bool) {
                self.write_conversion_inline_intern(w, t, generics, is_ref, false, false, "() /*", true, |_, _| "&local_".to_owned(),
                                |a, b, _c| self.from_c_conversion_prefix_from_path(a, b),

-                               |w, decl_type, _full_path, is_ref, _is_mut| match decl_type {
+                               |w, decl_type, _full_path, is_ref, _is_mut, _is_trait_alias| match decl_type {

                                        DeclType::StructImported {..} if is_ref => write!(w, "").unwrap(),
                                        DeclType::StructImported {..} if !is_ref => write!(w, "*unsafe {{ Box::from_raw(").unwrap(),
                                        DeclType::MirroredEnum if is_ref => write!(w, "&").unwrap(),
                                        DeclType::StructImported {..} if is_ref => write!(w, "").unwrap(),
                                        DeclType::StructImported {..} if !is_ref => write!(w, "*unsafe {{ Box::from_raw(").unwrap(),
                                        DeclType::MirroredEnum if is_ref => write!(w, "&").unwrap(),


@@ -2425,7 +2490,8 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                                        (true, Some(_)) => unreachable!(),
                                },
                                |a, b, _c| self.from_c_conversion_suffix_from_path(a, b),
                                        (true, Some(_)) => unreachable!(),
                                },
                                |a, b, _c| self.from_c_conversion_suffix_from_path(a, b),

-                               |w, decl_type, _full_path, is_ref, is_mut| match decl_type {
+                               |w, decl_type, _full_path, is_ref, is_mut, is_trait_alias| match decl_type {
+                                       DeclType::StructImported {..} if is_trait_alias => write!(w, ".as_ref_to()").unwrap(),

                                        DeclType::StructImported {..} if is_ref && ptr_for_ref => write!(w, "XXX unimplemented").unwrap(),
                                        DeclType::StructImported {..} if is_mut && is_ref => write!(w, ".get_native_mut_ref()").unwrap(),
                                        DeclType::StructImported {..} if is_ref => write!(w, ".get_native_ref()").unwrap(),
                                        DeclType::StructImported {..} if is_ref && ptr_for_ref => write!(w, "XXX unimplemented").unwrap(),
                                        DeclType::StructImported {..} if is_mut && is_ref => write!(w, ".get_native_mut_ref()").unwrap(),
                                        DeclType::StructImported {..} if is_ref => write!(w, ".get_native_ref()").unwrap(),


@@ -2442,19 +2508,19 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
        // Note that compared to the above conversion functions, the following two are generally
        // significantly undertested:
        pub fn write_from_c_conversion_to_ref_prefix<W: std::io::Write>(&self, w: &mut W, t: &syn::Type, generics: Option<&GenericTypes>) {
        // Note that compared to the above conversion functions, the following two are generally
        // significantly undertested:
        pub fn write_from_c_conversion_to_ref_prefix<W: std::io::Write>(&self, w: &mut W, t: &syn::Type, generics: Option<&GenericTypes>) {

-               self.write_conversion_inline_intern(w, t, generics, false, false, false, "() /*", true, |_, _| "&local_".to_owned(),
+               self.write_conversion_inline_intern(w, t, generics, true, false, false, "() /*", true, |_, _| "&local_".to_owned(),

                                |a, b, _c| {
                                        if let Some(conv) = self.from_c_conversion_prefix_from_path(a, b) {
                                                Some(format!("&{}", conv))
                                        } else { None }
                                },
                                |a, b, _c| {
                                        if let Some(conv) = self.from_c_conversion_prefix_from_path(a, b) {
                                                Some(format!("&{}", conv))
                                        } else { None }
                                },

-                               |w, decl_type, _full_path, is_ref, _is_mut| match decl_type {
-                                       DeclType::StructImported {..} if !is_ref => write!(w, "").unwrap(),
+                               |w, decl_type, _full_path, _is_ref, _is_mut, _is_trait_alias| match decl_type {
+                                       DeclType::StructImported {..} => write!(w, "").unwrap(),

                                        _ => unimplemented!(),
                                });
        }
        pub fn write_from_c_conversion_to_ref_suffix<W: std::io::Write>(&self, w: &mut W, t: &syn::Type, generics: Option<&GenericTypes>) {
                                        _ => unimplemented!(),
                                });
        }
        pub fn write_from_c_conversion_to_ref_suffix<W: std::io::Write>(&self, w: &mut W, t: &syn::Type, generics: Option<&GenericTypes>) {

-               self.write_conversion_inline_intern(w, t, generics, false, false, false, "*/", false,
+               self.write_conversion_inline_intern(w, t, generics, true, false, false, "*/", false,

                                |has_inner, map_str_opt| match (has_inner, map_str_opt) {
                                        (false, Some(map_str)) => format!(".iter(){}.collect::<Vec<_>>()[..]", map_str),
                                        (false, None) => ".iter().collect::<Vec<_>>()[..]".to_owned(),
                                |has_inner, map_str_opt| match (has_inner, map_str_opt) {
                                        (false, Some(map_str)) => format!(".iter(){}.collect::<Vec<_>>()[..]", map_str),
                                        (false, None) => ".iter().collect::<Vec<_>>()[..]".to_owned(),


@@ -2462,8 +2528,8 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                                        (true, Some(_)) => unreachable!(),
                                },
                                |a, b, _c| self.from_c_conversion_suffix_from_path(a, b),
                                        (true, Some(_)) => unreachable!(),
                                },
                                |a, b, _c| self.from_c_conversion_suffix_from_path(a, b),

-                               |w, decl_type, _full_path, is_ref, _is_mut| match decl_type {
-                                       DeclType::StructImported {..} if !is_ref => write!(w, ".get_native_ref()").unwrap(),
+                               |w, decl_type, _full_path, _is_ref, _is_mut, _is_trait_alias| match decl_type {
+                                       DeclType::StructImported {..} => write!(w, ".get_native_ref()").unwrap(),

                                        _ => unimplemented!(),
                                });
        }
                                        _ => unimplemented!(),
                                });
        }


@@ -3105,9 +3171,8 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                                        // If this is a no-export'd crate and there's only one implementation in the
                                        // whole crate, just treat it as a reference to whatever the implementor is.
                                        if with_ref_lifetime {
                                        // If this is a no-export'd crate and there's only one implementation in the
                                        // whole crate, just treat it as a reference to whatever the implementor is.
                                        if with_ref_lifetime {

-                                               // Hope we're being printed in function generics and let rustc derive the
-                                               // type.
-                                               write!(w, "_").unwrap();
+                                               // Hope that we're bound on a `Deref` and that the non-ref type works.
+                                               write!(w, "crate::{}", trait_impls[0]).unwrap();

                                        } else {
                                                write!(w, "&crate::{}", trait_impls[0]).unwrap();
                                        }
                                        } else {
                                                write!(w, "&crate::{}", trait_impls[0]).unwrap();
                                        }


@@ -3170,7 +3235,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
                                                true
                                        } else {
                                                let mut inner_c_ty = Vec::new();
                                                true
                                        } 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));
+                                               assert!(self.write_c_path_intern(&mut inner_c_ty, &p.path, generics, false, false, ptr_for_ref, with_ref_lifetime, c_ty));

                                                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 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();