X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=c-bindings-gen%2Fsrc%2Ftypes.rs;h=6d97ccc32ffb10357bf020c2eefe8c56bea01b78;hb=3ddf30cda74b64d1e1fe3f57e06cbb5440f630e4;hp=b13db9e648b91f0534733961a5e56d599ecd2a42;hpb=f87b75f30a64032b1d76a13fa45233bc4ceecf86;p=ldk-c-bindings diff --git a/c-bindings-gen/src/types.rs b/c-bindings-gen/src/types.rs index b13db9e..6d97ccc 100644 --- a/c-bindings-gen/src/types.rs +++ b/c-bindings-gen/src/types.rs @@ -134,7 +134,7 @@ pub fn export_status(attrs: &[syn::Attribute]) -> ExportStatus { match token_iter.next().unwrap() { TokenTree::Literal(lit) => { let line = format!("{}", lit); - if line.contains("(C-not exported)") { + if line.contains("(C-not exported)") || line.contains("This is not exported to bindings users") { return ExportStatus::NoExport; } else if line.contains("(C-not implementable)") { return ExportStatus::NotImplementable; @@ -215,7 +215,7 @@ impl<'a, 'p: 'a> GenericTypes<'a, 'p> { 'bound_loop: for bound in type_param.bounds.iter() { if let syn::TypeParamBound::Trait(trait_bound) = bound { if let Some(ident) = single_ident_generic_path_to_ident(&trait_bound.path) { - match &format!("{}", ident) as &str { "Send" => continue, "Sync" => continue, _ => {} } + match &format!("{}", ident) as &str { "Send" => continue, "Sync" => continue, "Sized" => continue, _ => {} } } if path_matches_nongeneric(&trait_bound.path, &["core", "clone", "Clone"]) { continue; } @@ -352,7 +352,11 @@ impl<'a, 'p: 'a> GenericTypes<'a, 'p> { } } else { unimplemented!(); } for bound in bounds_iter { - if let syn::TypeParamBound::Trait(_) = bound { unimplemented!(); } + if let syn::TypeParamBound::Trait(t) = bound { + // We only allow for `?Sized` here. + assert_eq!(t.path.segments.len(), 1); + assert_eq!(format!("{}", t.path.segments[0].ident), "Sized"); + } } break; }, @@ -474,9 +478,12 @@ impl<'mod_lifetime, 'crate_lft: 'mod_lifetime> ImportResolver<'mod_lifetime, 'cr let crate_name_ident = format_ident!("{}", crate_name); path.push(parse_quote!(#crate_name_ident)); } else if partial_path == "" && !dependencies.contains(&$ident) { - new_path = format!("{}::{}{}", crate_name, $ident, $path_suffix); - let crate_name_ident = format_ident!("{}", crate_name); - path.push(parse_quote!(#crate_name_ident)); + new_path = format!("{}::{}{}", module_path, $ident, $path_suffix); + for module in module_path.split("::") { + path.push(syn::PathSegment { ident: syn::Ident::new(module, Span::call_site()), arguments: syn::PathArguments::None }); + } + let ident_str = format_ident!("{}", $ident); + path.push(parse_quote!(#ident_str)); } else if format!("{}", $ident) == "self" { let mut path_iter = partial_path.rsplitn(2, "::"); path_iter.next().unwrap(); @@ -540,6 +547,7 @@ impl<'mod_lifetime, 'crate_lft: 'mod_lifetime> ImportResolver<'mod_lifetime, 'cr // Add primitives to the "imports" list: Self::insert_primitive(&mut imports, "bool"); Self::insert_primitive(&mut imports, "u128"); + Self::insert_primitive(&mut imports, "i64"); Self::insert_primitive(&mut imports, "u64"); Self::insert_primitive(&mut imports, "u32"); Self::insert_primitive(&mut imports, "u16"); @@ -586,13 +594,8 @@ impl<'mod_lifetime, 'crate_lft: 'mod_lifetime> ImportResolver<'mod_lifetime, 'cr } }, syn::Item::Trait(t) => { - match export_status(&t.attrs) { - ExportStatus::Export|ExportStatus::NotImplementable => { - if let syn::Visibility::Public(_) = t.vis { - declared.insert(t.ident.clone(), DeclType::Trait(t)); - } - }, - _ => continue, + if let syn::Visibility::Public(_) = t.vis { + declared.insert(t.ident.clone(), DeclType::Trait(t)); } }, syn::Item::Mod(m) => { @@ -668,7 +671,7 @@ impl<'mod_lifetime, 'crate_lft: 'mod_lifetime> ImportResolver<'mod_lifetime, 'cr // Now that we've resolved the path to the path as-imported, check whether the path // is actually a pub(.*) use statement and map it to the real path. let path_tmp = path.clone(); - let crate_name = path_tmp.splitn(1, "::").next().unwrap(); + let crate_name = path_tmp.splitn(2, "::").next().unwrap(); let mut module_riter = path_tmp.rsplitn(2, "::"); let obj = module_riter.next().unwrap(); if let Some(module_path) = module_riter.next() { @@ -805,13 +808,17 @@ fn initial_clonable_types() -> HashSet { res.insert("crate::c_types::SixteenBytes".to_owned()); res.insert("crate::c_types::TwentyBytes".to_owned()); res.insert("crate::c_types::ThirtyTwoBytes".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::Transaction".to_owned()); res.insert("crate::c_types::Witness".to_owned()); + res.insert("crate::c_types::WitnessVersion".to_owned()); + res.insert("crate::c_types::TxIn".to_owned()); res.insert("crate::c_types::TxOut".to_owned()); res.insert("crate::c_types::Signature".to_owned()); res.insert("crate::c_types::RecoverableSignature".to_owned()); + res.insert("crate::c_types::BigEndianScalar".to_owned()); res.insert("crate::c_types::Bech32Error".to_owned()); res.insert("crate::c_types::Secp256k1Error".to_owned()); res.insert("crate::c_types::IOError".to_owned()); @@ -853,6 +860,8 @@ pub struct CrateTypes<'a> { clonable_types: RefCell>, /// Key impls Value pub trait_impls: HashMap>, + /// Value impls Key + pub traits_impld: HashMap>, /// The full set of modules in the crate(s) pub lib_ast: &'a FullLibraryAST, } @@ -863,7 +872,8 @@ impl<'a> CrateTypes<'a> { opaques: HashMap::new(), mirrored_enums: HashMap::new(), traits: HashMap::new(), type_aliases: HashMap::new(), reverse_alias_map: HashMap::new(), templates_defined: RefCell::new(HashMap::default()), priv_structs: HashMap::new(), - clonable_types: RefCell::new(initial_clonable_types()), trait_impls: HashMap::new(), + clonable_types: RefCell::new(initial_clonable_types()), + trait_impls: HashMap::new(), traits_impld: HashMap::new(), template_file: RefCell::new(template_file), lib_ast: &libast, } } @@ -939,6 +949,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> { pub fn is_primitive(&self, full_path: &str) -> bool { match full_path { "bool" => true, + "i64" => true, "u64" => true, "u32" => true, "u16" => true, @@ -971,10 +982,13 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> { "[u8; 12]" if !is_ref => Some("crate::c_types::TwelveBytes"), "[u8; 4]" if !is_ref => Some("crate::c_types::FourBytes"), "[u8; 3]" if !is_ref => Some("crate::c_types::ThreeBytes"), // Used for RGB values + "[u16; 8]" if !is_ref => Some("crate::c_types::EightU16s"), "str" if is_ref => Some("crate::c_types::Str"), "alloc::string::String"|"String" => Some("crate::c_types::Str"), + "bitcoin::Address" => Some("crate::c_types::Str"), + "std::time::Duration"|"core::time::Duration" => Some("u64"), "std::time::SystemTime" => Some("u64"), "std::io::Error"|"lightning::io::Error"|"lightning::io::ErrorKind" => Some("crate::c_types::IOError"), @@ -999,39 +1013,51 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> { "bitcoin::secp256k1::ecdsa::RecoverableSignature" => Some("crate::c_types::RecoverableSignature"), "bitcoin::secp256k1::SecretKey" if is_ref => Some("*const [u8; 32]"), "bitcoin::secp256k1::SecretKey" if !is_ref => Some("crate::c_types::SecretKey"), + "bitcoin::secp256k1::KeyPair" if !is_ref => Some("crate::c_types::SecretKey"), "bitcoin::secp256k1::Scalar" if is_ref => Some("*const crate::c_types::BigEndianScalar"), "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" if is_ref => Some("crate::c_types::u8slice"), - "bitcoin::blockdata::script::Script" if !is_ref => Some("crate::c_types::derived::CVec_u8Z"), - "bitcoin::blockdata::transaction::OutPoint" => Some("crate::lightning::chain::transaction::OutPoint"), + "bitcoin::blockdata::script::Script"|"bitcoin::Script" if is_ref => Some("crate::c_types::u8slice"), + "bitcoin::blockdata::script::Script"|"bitcoin::Script" if !is_ref => 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::Witness" => Some("crate::c_types::Witness"), - "bitcoin::blockdata::transaction::TxOut" if !is_ref => Some("crate::c_types::TxOut"), + "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::util::address::WitnessVersion" => Some("crate::c_types::WitnessVersion"), "bitcoin::blockdata::block::BlockHeader" if is_ref => Some("*const [u8; 80]"), "bitcoin::blockdata::block::Block" if is_ref => Some("crate::c_types::u8slice"), - "bitcoin::hash_types::PubkeyHash"|"bitcoin::hash_types::WPubkeyHash"|"bitcoin::hash_types::ScriptHash" + "bitcoin::PackedLockTime"|"bitcoin::blockdata::locktime::PackedLockTime" => Some("u32"), + + "bitcoin::psbt::PartiallySignedTransaction" if !is_ref => Some("crate::c_types::derived::CVec_u8Z"), + + "bitcoin::PubkeyHash"|"bitcoin::hash_types::PubkeyHash"| + "bitcoin::hash_types::WPubkeyHash"| + "bitcoin::ScriptHash"|"bitcoin::hash_types::ScriptHash" + if !is_ref => Some("crate::c_types::TwentyBytes"), + "bitcoin::PubkeyHash"|"bitcoin::hash_types::PubkeyHash"| + "bitcoin::hash_types::WPubkeyHash"| + "bitcoin::ScriptHash"|"bitcoin::hash_types::ScriptHash" if is_ref => Some("*const [u8; 20]"), "bitcoin::hash_types::WScriptHash" if is_ref => Some("*const [u8; 32]"), // Newtypes that we just expose in their original form. - "bitcoin::hash_types::Txid"|"bitcoin::hash_types::BlockHash"|"bitcoin_hashes::sha256::Hash" + "bitcoin::hash_types::Txid"|"bitcoin::BlockHash"|"bitcoin::hash_types::BlockHash"|"bitcoin_hashes::sha256::Hash"|"bitcoin::blockdata::constants::ChainHash" if is_ref => Some("*const [u8; 32]"), - "bitcoin::hash_types::Txid"|"bitcoin::hash_types::BlockHash"|"bitcoin_hashes::sha256::Hash" + "bitcoin::hash_types::Txid"|"bitcoin::BlockHash"|"bitcoin::hash_types::BlockHash"|"bitcoin_hashes::sha256::Hash"|"bitcoin::blockdata::constants::ChainHash" if !is_ref => Some("crate::c_types::ThirtyTwoBytes"), "bitcoin::secp256k1::Message" if !is_ref => Some("crate::c_types::ThirtyTwoBytes"), "lightning::ln::PaymentHash"|"lightning::ln::PaymentPreimage"|"lightning::ln::PaymentSecret" |"lightning::ln::channelmanager::PaymentId"|"lightning::ln::channelmanager::InterceptId" - |"lightning::chain::keysinterface::KeyMaterial" + |"lightning::sign::KeyMaterial"|"lightning::chain::ClaimId" if is_ref => Some("*const [u8; 32]"), "lightning::ln::PaymentHash"|"lightning::ln::PaymentPreimage"|"lightning::ln::PaymentSecret" |"lightning::ln::channelmanager::PaymentId"|"lightning::ln::channelmanager::InterceptId" - |"lightning::chain::keysinterface::KeyMaterial" + |"lightning::sign::KeyMaterial"|"lightning::chain::ClaimId" if !is_ref => Some("crate::c_types::ThirtyTwoBytes"), "lightning::io::Read" => Some("crate::c_types::u8slice"), @@ -1060,6 +1086,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> { "[u8; 12]" if !is_ref => Some(""), "[u8; 4]" if !is_ref => Some(""), "[u8; 3]" if !is_ref => Some(""), + "[u16; 8]" if !is_ref => Some(""), "[u8]" if is_ref => Some(""), "[usize]" if is_ref => Some(""), @@ -1092,27 +1119,38 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> { "bitcoin::secp256k1::ecdsa::RecoverableSignature" => Some(""), "bitcoin::secp256k1::SecretKey" if is_ref => Some("&::bitcoin::secp256k1::SecretKey::from_slice(&unsafe { *"), "bitcoin::secp256k1::SecretKey" if !is_ref => Some(""), + "bitcoin::secp256k1::KeyPair" if !is_ref => Some("::bitcoin::secp256k1::KeyPair::new("), + "bitcoin::secp256k1::Scalar" if is_ref => Some("&"), "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" if is_ref => Some("&::bitcoin::blockdata::script::Script::from(Vec::from("), - "bitcoin::blockdata::script::Script" if !is_ref => Some("::bitcoin::blockdata::script::Script::from("), + "bitcoin::blockdata::script::Script"|"bitcoin::Script" if is_ref => Some("&::bitcoin::blockdata::script::Script::from(Vec::from("), + "bitcoin::blockdata::script::Script"|"bitcoin::Script" if !is_ref => Some("::bitcoin::blockdata::script::Script::from("), "bitcoin::blockdata::transaction::Transaction"|"bitcoin::Transaction" if is_ref => Some("&"), "bitcoin::blockdata::transaction::Transaction"|"bitcoin::Transaction" => Some(""), "bitcoin::Witness" if is_ref => Some("&"), "bitcoin::Witness" => Some(""), - "bitcoin::blockdata::transaction::OutPoint" => Some("crate::c_types::C_to_bitcoin_outpoint("), - "bitcoin::blockdata::transaction::TxOut" if !is_ref => Some(""), + "bitcoin::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::util::address::WitnessVersion" => Some(""), "bitcoin::blockdata::block::BlockHeader" => Some("&::bitcoin::consensus::encode::deserialize(unsafe { &*"), "bitcoin::blockdata::block::Block" if is_ref => Some("&::bitcoin::consensus::encode::deserialize("), - "bitcoin::hash_types::PubkeyHash" if is_ref => + "bitcoin::PackedLockTime"|"bitcoin::blockdata::locktime::PackedLockTime" => Some("::bitcoin::PackedLockTime("), + + "bitcoin::psbt::PartiallySignedTransaction" if !is_ref => Some("::bitcoin::consensus::encode::deserialize("), + + "bitcoin::PubkeyHash"|"bitcoin::hash_types::PubkeyHash" if !is_ref => + Some("bitcoin::hash_types::PubkeyHash::from_hash(bitcoin::hashes::Hash::from_inner("), + "bitcoin::PubkeyHash"|"bitcoin::hash_types::PubkeyHash" if is_ref => Some("&bitcoin::hash_types::PubkeyHash::from_hash(bitcoin::hashes::Hash::from_inner(unsafe { *"), "bitcoin::hash_types::WPubkeyHash" if is_ref => Some("&bitcoin::hash_types::WPubkeyHash::from_hash(bitcoin::hashes::Hash::from_inner(unsafe { *"), - "bitcoin::hash_types::ScriptHash" if is_ref => + "bitcoin::ScriptHash"|"bitcoin::hash_types::ScriptHash" if !is_ref => + Some("bitcoin::hash_types::ScriptHash::from_hash(bitcoin::hashes::Hash::from_inner("), + "bitcoin::ScriptHash"|"bitcoin::hash_types::ScriptHash" if is_ref => Some("&bitcoin::hash_types::ScriptHash::from_hash(bitcoin::hashes::Hash::from_inner(unsafe { *"), "bitcoin::hash_types::WScriptHash" if is_ref => Some("&bitcoin::hash_types::WScriptHash::from_hash(bitcoin::hashes::Hash::from_inner(unsafe { *"), @@ -1120,7 +1158,8 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> { // 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::hash_types::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("), @@ -1130,8 +1169,10 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> { "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::chain::keysinterface::KeyMaterial" if !is_ref => Some("::lightning::chain::keysinterface::KeyMaterial("), - "lightning::chain::keysinterface::KeyMaterial" if is_ref=> Some("&::lightning::chain::keysinterface::KeyMaterial( 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::chain::ClaimId" if is_ref=> Some("&::lightning::chain::ClaimId( unsafe { *"), // List of traits we map (possibly during processing of other files): "lightning::io::Read" => Some("&mut "), @@ -1155,6 +1196,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> { "[u8; 12]" if !is_ref => Some(".data"), "[u8; 4]" if !is_ref => Some(".data"), "[u8; 3]" if !is_ref => Some(".data"), + "[u16; 8]" if !is_ref => Some(".data"), "[u8]" if is_ref => Some(".to_slice()"), "[usize]" if is_ref => Some(".to_slice()"), @@ -1184,35 +1226,47 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> { "bitcoin::secp256k1::ecdsa::RecoverableSignature" => Some(".into_rust()"), "bitcoin::secp256k1::SecretKey" if !is_ref => Some(".into_rust()"), "bitcoin::secp256k1::SecretKey" if is_ref => Some("}[..]).unwrap()"), - "bitcoin::secp256k1::Scalar" if !is_ref => Some(".into_rust()"), + "bitcoin::secp256k1::KeyPair" if !is_ref => Some(".into_rust())"), + "bitcoin::secp256k1::Scalar" => Some(".into_rust()"), "bitcoin::secp256k1::ecdh::SharedSecret" if !is_ref => Some(".data)"), - "bitcoin::blockdata::script::Script" if is_ref => Some(".to_slice()))"), - "bitcoin::blockdata::script::Script" if !is_ref => Some(".into_rust())"), + "bitcoin::blockdata::script::Script"|"bitcoin::Script" if is_ref => Some(".to_slice()))"), + "bitcoin::blockdata::script::Script"|"bitcoin::Script" if !is_ref => Some(".into_rust())"), "bitcoin::blockdata::transaction::Transaction"|"bitcoin::Transaction" => Some(".into_bitcoin()"), "bitcoin::Witness" => Some(".into_bitcoin()"), - "bitcoin::blockdata::transaction::OutPoint" => Some(")"), - "bitcoin::blockdata::transaction::TxOut" if !is_ref => Some(".into_rust()"), + "bitcoin::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::util::address::WitnessVersion" => Some(".into()"), "bitcoin::blockdata::block::BlockHeader" => Some(" }).unwrap()"), "bitcoin::blockdata::block::Block" => Some(".to_slice()).unwrap()"), - "bitcoin::hash_types::PubkeyHash"|"bitcoin::hash_types::WPubkeyHash"| - "bitcoin::hash_types::ScriptHash"|"bitcoin::hash_types::WScriptHash" + "bitcoin::PackedLockTime"|"bitcoin::blockdata::locktime::PackedLockTime" => Some(")"), + + "bitcoin::psbt::PartiallySignedTransaction" if !is_ref => Some(".as_slice()).expect(\"Invalid PSBT format\")"), + + "bitcoin::PubkeyHash"|"bitcoin::hash_types::PubkeyHash"| + "bitcoin::hash_types::WPubkeyHash"|"bitcoin::hash_types::WScriptHash"| + "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::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::hash_types::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" |"lightning::ln::channelmanager::PaymentId"|"lightning::ln::channelmanager::InterceptId" - |"lightning::chain::keysinterface::KeyMaterial" + |"lightning::sign::KeyMaterial"|"lightning::chain::ClaimId" if !is_ref => Some(".data)"), "lightning::ln::PaymentHash"|"lightning::ln::PaymentPreimage"|"lightning::ln::PaymentSecret" |"lightning::ln::channelmanager::PaymentId"|"lightning::ln::channelmanager::InterceptId" - |"lightning::chain::keysinterface::KeyMaterial" + |"lightning::sign::KeyMaterial"|"lightning::chain::ClaimId" if is_ref => Some(" })"), // List of traits we map (possibly during processing of other files): @@ -1253,6 +1307,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> { "[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(""), + "[u16; 8]" if !is_ref => Some("crate::c_types::EightU16s { data: "), "[u8]" if is_ref => Some("local_"), "[usize]" if is_ref => Some("local_"), @@ -1260,6 +1315,8 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> { "str" if is_ref => Some(""), "alloc::string::String"|"String" => Some(""), + "bitcoin::Address" => Some("alloc::string::ToString::to_string(&"), + "std::time::Duration"|"core::time::Duration" => Some(""), "std::time::SystemTime" => Some(""), "std::io::Error"|"lightning::io::Error" => Some("crate::c_types::IOError::from_rust("), @@ -1284,37 +1341,50 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> { "bitcoin::secp256k1::ecdsa::RecoverableSignature" => Some("crate::c_types::RecoverableSignature::from_rust(&"), "bitcoin::secp256k1::SecretKey" if is_ref => Some(""), "bitcoin::secp256k1::SecretKey" if !is_ref => Some("crate::c_types::SecretKey::from_rust("), - "bitcoin::secp256k1::Scalar" if !is_ref => Some("crate::c_types::BigEndianScalar::from_rust("), + "bitcoin::secp256k1::KeyPair" if !is_ref => Some("crate::c_types::SecretKey::from_rust("), + "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" if is_ref => Some("crate::c_types::u8slice::from_slice(&"), - "bitcoin::blockdata::script::Script" if !is_ref => Some(""), + "bitcoin::blockdata::script::Script"|"bitcoin::Script" if is_ref => Some("crate::c_types::u8slice::from_slice(&"), + "bitcoin::blockdata::script::Script"|"bitcoin::Script" if !is_ref => Some(""), "bitcoin::blockdata::transaction::Transaction"|"bitcoin::Transaction" if is_ref => Some("crate::c_types::Transaction::from_bitcoin("), "bitcoin::blockdata::transaction::Transaction"|"bitcoin::Transaction" => Some("crate::c_types::Transaction::from_bitcoin(&"), "bitcoin::Witness" if is_ref => Some("crate::c_types::Witness::from_bitcoin("), "bitcoin::Witness" if !is_ref => Some("crate::c_types::Witness::from_bitcoin(&"), - "bitcoin::blockdata::transaction::OutPoint" => Some("crate::c_types::bitcoin_to_C_outpoint("), - "bitcoin::blockdata::transaction::TxOut" if !is_ref => Some("crate::c_types::TxOut::from_rust("), + "bitcoin::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::util::address::WitnessVersion" => Some(""), "bitcoin::blockdata::block::BlockHeader" if is_ref => Some("&local_"), "bitcoin::blockdata::block::Block" if is_ref => Some("crate::c_types::u8slice::from_slice(&local_"), + "bitcoin::PackedLockTime"|"bitcoin::blockdata::locktime::PackedLockTime" => Some(""), + + "bitcoin::psbt::PartiallySignedTransaction" if !is_ref => Some("::bitcoin::consensus::encode::serialize(&"), + "bitcoin::hash_types::Txid" if !is_ref => Some("crate::c_types::ThirtyTwoBytes { data: "), + "bitcoin::PubkeyHash"|"bitcoin::hash_types::PubkeyHash"| + "bitcoin::hash_types::WPubkeyHash"|"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::hash_types::Txid"|"bitcoin::hash_types::BlockHash"|"bitcoin_hashes::sha256::Hash" + "bitcoin::hash_types::Txid"|"bitcoin::BlockHash"|"bitcoin::hash_types::BlockHash"|"bitcoin_hashes::sha256::Hash"|"bitcoin::blockdata::constants::ChainHash" if is_ref => Some(""), - "bitcoin::hash_types::Txid"|"bitcoin::hash_types::BlockHash"|"bitcoin_hashes::sha256::Hash" + "bitcoin::hash_types::Txid"|"bitcoin::BlockHash"|"bitcoin::hash_types::BlockHash"|"bitcoin_hashes::sha256::Hash"|"bitcoin::blockdata::constants::ChainHash" if !is_ref => Some("crate::c_types::ThirtyTwoBytes { data: "), "bitcoin::secp256k1::Message" if !is_ref => Some("crate::c_types::ThirtyTwoBytes { data: "), "lightning::ln::PaymentHash"|"lightning::ln::PaymentPreimage"|"lightning::ln::PaymentSecret" |"lightning::ln::channelmanager::PaymentId"|"lightning::ln::channelmanager::InterceptId" - |"lightning::chain::keysinterface::KeyMaterial" + |"lightning::sign::KeyMaterial"|"lightning::chain::ClaimId" if is_ref => Some("&"), "lightning::ln::PaymentHash"|"lightning::ln::PaymentPreimage"|"lightning::ln::PaymentSecret" |"lightning::ln::channelmanager::PaymentId"|"lightning::ln::channelmanager::InterceptId" - |"lightning::chain::keysinterface::KeyMaterial" + |"lightning::sign::KeyMaterial"|"lightning::chain::ClaimId" 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("), @@ -1338,6 +1408,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> { "[u8; 12]" if !is_ref => Some(" }"), "[u8; 4]" if !is_ref => Some(" }"), "[u8; 3]" if is_ref => Some(""), + "[u16; 8]" if !is_ref => Some(" }"), "[u8]" if is_ref => Some(""), "[usize]" if is_ref => Some(""), @@ -1346,6 +1417,8 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> { "alloc::string::String"|"String" if is_ref => Some(".as_str().into()"), "alloc::string::String"|"String" => Some(".into()"), + "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::io::Error"|"lightning::io::Error"|"lightning::io::ErrorKind" => Some(")"), @@ -1369,35 +1442,48 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> { "bitcoin::secp256k1::ecdsa::RecoverableSignature" => Some(")"), "bitcoin::secp256k1::SecretKey" if !is_ref => Some(")"), "bitcoin::secp256k1::SecretKey" if is_ref => Some(".as_ref()"), + "bitcoin::secp256k1::KeyPair" if !is_ref => Some(".secret_key())"), "bitcoin::secp256k1::Scalar" if !is_ref => Some(")"), "bitcoin::secp256k1::ecdh::SharedSecret" if !is_ref => Some(".secret_bytes() }"), - "bitcoin::blockdata::script::Script" if is_ref => Some("[..])"), - "bitcoin::blockdata::script::Script" if !is_ref => Some(".into_bytes().into()"), + "bitcoin::blockdata::script::Script"|"bitcoin::Script" if is_ref => Some("[..])"), + "bitcoin::blockdata::script::Script"|"bitcoin::Script" if !is_ref => Some(".into_bytes().into()"), "bitcoin::blockdata::transaction::Transaction"|"bitcoin::Transaction" => Some(")"), "bitcoin::Witness" => Some(")"), - "bitcoin::blockdata::transaction::OutPoint" => Some(")"), - "bitcoin::blockdata::transaction::TxOut" if !is_ref => Some(")"), + "bitcoin::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::util::address::WitnessVersion" => Some(".into()"), "bitcoin::blockdata::block::BlockHeader" if is_ref => Some(""), "bitcoin::blockdata::block::Block" if is_ref => Some(")"), + "bitcoin::PackedLockTime"|"bitcoin::blockdata::locktime::PackedLockTime" => Some(".0"), + + "bitcoin::psbt::PartiallySignedTransaction" if !is_ref => Some(").into()"), + "bitcoin::hash_types::Txid" if !is_ref => Some(".into_inner() }"), + "bitcoin::PubkeyHash"|"bitcoin::hash_types::PubkeyHash"| + "bitcoin::hash_types::WPubkeyHash"|"bitcoin::hash_types::WScriptHash"| + "bitcoin::ScriptHash"|"bitcoin::hash_types::ScriptHash" + if !is_ref => Some(".as_hash().into_inner() }"), + // Newtypes that we just expose in their original form. - "bitcoin::hash_types::Txid"|"bitcoin::hash_types::BlockHash"|"bitcoin_hashes::sha256::Hash" + "bitcoin::hash_types::Txid"|"bitcoin::BlockHash"|"bitcoin::hash_types::BlockHash"|"bitcoin_hashes::sha256::Hash" if is_ref => Some(".as_inner()"), - "bitcoin::hash_types::Txid"|"bitcoin::hash_types::BlockHash"|"bitcoin_hashes::sha256::Hash" + "bitcoin::hash_types::Txid"|"bitcoin::BlockHash"|"bitcoin::hash_types::BlockHash"|"bitcoin_hashes::sha256::Hash" if !is_ref => Some(".into_inner() }"), + "bitcoin::blockdata::constants::ChainHash" if is_ref => Some(".as_bytes() }"), + "bitcoin::blockdata::constants::ChainHash" if !is_ref => Some(".to_bytes() }"), "bitcoin::secp256k1::Message" if !is_ref => Some(".as_ref().clone() }"), "lightning::ln::PaymentHash"|"lightning::ln::PaymentPreimage"|"lightning::ln::PaymentSecret" |"lightning::ln::channelmanager::PaymentId"|"lightning::ln::channelmanager::InterceptId" - |"lightning::chain::keysinterface::KeyMaterial" + |"lightning::sign::KeyMaterial"|"lightning::chain::ClaimId" if is_ref => Some(".0"), "lightning::ln::PaymentHash"|"lightning::ln::PaymentPreimage"|"lightning::ln::PaymentSecret" |"lightning::ln::channelmanager::PaymentId"|"lightning::ln::channelmanager::InterceptId" - |"lightning::chain::keysinterface::KeyMaterial" + |"lightning::sign::KeyMaterial"|"lightning::chain::ClaimId" if !is_ref => Some(".0 }"), "lightning::io::Read" => Some("))"), @@ -1408,7 +1494,6 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> { fn empty_val_check_suffix_from_path(&self, full_path: &str) -> Option<&str> { match full_path { - "lightning::ln::PaymentSecret" => Some(".data == [0; 32]"), "secp256k1::PublicKey"|"bitcoin::secp256k1::PublicKey" => Some(".is_null()"), "bitcoin::secp256k1::ecdsa::Signature" => Some(".is_null()"), _ => None @@ -1488,11 +1573,6 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> { // clear for users. Thus, we default to false but override for a few // types which had mappings defined when we were avoiding the `Option_`s. match &resolved as &str { - "lightning::ln::PaymentSecret" => true, - "lightning::ln::PaymentHash" => true, - "lightning::ln::PaymentPreimage" => true, - "lightning::ln::channelmanager::PaymentId" => true, - "bitcoin::hash_types::BlockHash" => true, "secp256k1::PublicKey"|"bitcoin::secp256k1::PublicKey" => true, _ => false, } @@ -1581,7 +1661,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> { let inner_name = self.get_c_mangled_container_type(vec![single_contained.unwrap()], generics, "Option").unwrap(); return Some(("if ", vec![ (format!(".is_none() {{ {}::None }} else {{ {}::Some(/* WARNING: CLONING CONVERSION HERE! &Option is otherwise un-expressable. */", inner_name, inner_name), - format!("{}.clone().unwrap()", var_access)) + format!("(*{}.as_ref().unwrap()).clone()", var_access)) ], ") }", ContainerPrefixLocation::PerConv)); } } else { @@ -1674,10 +1754,10 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> { (format!("{} {{ None }} else {{ Some(", s), format!("unsafe {{ &mut *{} }}", var_access)) ], ") }", ContainerPrefixLocation::NoPrefix)), EmptyValExpectedTy::OptionType => - return Some(("{ /* ", vec![ - (format!("*/ let {}_opt = {};", var_name, var_access), - format!("}} if {}_opt{} {{ None }} else {{ Some({{ {}_opt.take()", var_name, s, var_name)) - ], ") } }", ContainerPrefixLocation::PerConv)), + return Some(("{ /*", vec![ + (format!("*/ let {}_opt = {}; if {}_opt{} {{ None }} else {{ Some({{", var_name, var_access, var_name, s), + format!("{{ {}_opt.take() }}", var_name)) + ], "})} }", ContainerPrefixLocation::PerConv)), EmptyValExpectedTy::NonPointer => return Some(("if ", vec![ (format!("{} {{ None }} else {{ Some(", s), format!("{}", var_access)) @@ -1949,19 +2029,6 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> { } } - fn is_real_type_array(&self, resolved_type: &str) -> Option { - if let Some(real_ty) = self.c_type_from_path(&resolved_type, true, false) { - if real_ty.ends_with("]") && real_ty.starts_with("*const [u8; ") { - let mut split = real_ty.split("; "); - split.next().unwrap(); - let tail_str = split.next().unwrap(); - assert!(split.next().is_none()); - let len = usize::from_str_radix(&tail_str[..tail_str.len() - 1], 10).unwrap(); - Some(parse_quote!([u8; #len])) - } else { None } - } else { None } - } - /// Prints a suffix to determine if a variable is empty (ie was set by write_empty_rust_val). /// See EmptyValExpectedTy for information on return types. fn write_empty_rust_val_check_suffix(&self, generics: Option<&GenericTypes>, w: &mut W, t: &syn::Type) -> EmptyValExpectedTy { @@ -1971,9 +2038,6 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> { }, syn::Type::Path(p) => { let resolved = self.resolve_path(&p.path, generics); - if let Some(arr_ty) = self.is_real_type_array(&resolved) { - return self.write_empty_rust_val_check_suffix(generics, w, &arr_ty); - } if self.crate_types.opaques.get(&resolved).is_some() { write!(w, ".inner.is_null()").unwrap(); EmptyValExpectedTy::NonPointer @@ -2101,14 +2165,27 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> { 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); } else { unimplemented!(); } - } else { unimplemented!(); } + } else { + if let Some(trait_impls) = self.crate_types.traits_impld.get(&resolved_path) { + if trait_impls.len() == 1 { + // 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. + 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); + return; + } + } + unimplemented!(); + } }, syn::Type::Array(a) => { - // We assume all arrays contain only [int_literal; X]s. - // This may result in some outputs not compiling. - if let syn::Expr::Lit(l) = &a.len { - if let syn::Lit::Int(i) = &l.lit { - write!(w, "{}", path_lookup(&format!("[u8; {}]", i.base10_digits()), is_ref, ptr_for_ref).unwrap()).unwrap(); + if let syn::Type::Path(p) = &*a.elem { + let inner_ty = self.resolve_path(&p.path, generics); + if let syn::Expr::Lit(l) = &a.len { + if let syn::Lit::Int(i) = &l.lit { + write!(w, "{}", path_lookup(&format!("[{}; {}]", inner_ty, i.base10_digits()), is_ref, ptr_for_ref).unwrap()).unwrap(); + } else { unimplemented!(); } } else { unimplemented!(); } } else { unimplemented!(); } }, @@ -2377,7 +2454,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> { write!(w, "let mut local_{}{} = ", ident, if (!to_c && needs_ref_map) || (to_c && $container_type == "Option" && contains_slice) {"_base"} else { "" }).unwrap(); if prefix_location == ContainerPrefixLocation::OutsideConv { - var_prefix(w, $args_iter().next().unwrap(), generics, is_ref, ptr_for_ref, true); + var_prefix(w, $args_iter().next().unwrap(), generics, is_ref, true, true); } write!(w, "{}{}", prefix, var).unwrap(); @@ -2640,11 +2717,14 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> { } else { unimplemented!(); } } else if let syn::Type::Path(p_arg) = t { if let Some(resolved) = self.maybe_resolve_path(&p_arg.path, generics) { - if !self.is_primitive(&resolved) { - assert!(!is_ref); // We don't currently support outer reference types for non-primitive inners + if !self.is_primitive(&resolved) && self.c_type_from_path(&resolved, false, false).is_none() { + if is_ref { + // We don't currently support outer reference types for non-primitive inners + return false; + } } } else { - assert!(!is_ref); // We don't currently support outer reference types for non-primitive inners + return false; } if !self.write_c_type_intern(w, t, generics, false, false, false, true, true) { return false; } } else { @@ -2756,12 +2836,8 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> { if self.c_type_has_inner_from_path(&subtype) { if !self.write_c_path_intern(w, &$p_arg.path, generics, is_ref, is_mut, ptr_for_ref, false, true) { return false; } } else { - if let Some(arr_ty) = self.is_real_type_array(&subtype) { - if !self.write_c_type_intern(w, &arr_ty, generics, false, true, false, false, true) { return false; } - } else { - // Option needs to be converted to a *mut T, ie mut ptr-for-ref - if !self.write_c_path_intern(w, &$p_arg.path, generics, true, true, true, false, true) { return false; } - } + // Option needs to be converted to a *mut T, ie mut ptr-for-ref + if !self.write_c_path_intern(w, &$p_arg.path, generics, true, true, true, false, true) { return false; } } } else { write!(w, "{}", $p_arg.path.segments.last().unwrap().ident).unwrap(); @@ -2810,6 +2886,13 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> { if let syn::Type::Path(p) = &*refelem.elem { write_path!(p, Some(&mut mangled_tuple_type)); } else { return false; } + } else if let syn::Type::Array(_) = elem { + let mut resolved = Vec::new(); + if !self.write_c_type_intern(&mut resolved, &elem, generics, false, false, true, false, true) { return false; } + let array_inner = String::from_utf8(resolved).unwrap(); + let arr_name = array_inner.split("::").last().unwrap(); + write!(w, "{}", arr_name).unwrap(); + write!(mangled_type, "{}", arr_name).unwrap(); } else { return false; } } write!(w, "Z").unwrap(); @@ -2929,6 +3012,18 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> { } true } else { + if let Some(trait_impls) = self.crate_types.traits_impld.get(&full_path) { + if trait_impls.len() == 1 { + // 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 { + write!(w, "&'static crate::{}", trait_impls[0]).unwrap(); + } else { + write!(w, "&crate::{}", trait_impls[0]).unwrap(); + } + return true; + } + } false } } @@ -2958,15 +3053,14 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> { } else if is_ref { write!(w, "*const [").unwrap(); if !self.write_c_type_intern(w, &a.elem, generics, false, false, ptr_for_ref, with_ref_lifetime, c_ty) { return false; } - } else { - let mut typecheck = Vec::new(); - if !self.write_c_type_intern(&mut typecheck, &a.elem, generics, false, false, ptr_for_ref, with_ref_lifetime, c_ty) { return false; } - if typecheck[..] != ['u' as u8, '8' as u8] { return false; } } if let syn::Expr::Lit(l) = &a.len { if let syn::Lit::Int(i) = &l.lit { + let mut inner_ty = Vec::new(); + if !self.write_c_type_intern(&mut inner_ty, &*a.elem, generics, false, false, ptr_for_ref, false, c_ty) { return false; } + let inner_ty_str = String::from_utf8(inner_ty).unwrap(); if !is_ref { - if let Some(ty) = self.c_type_from_path(&format!("[u8; {}]", i.base10_digits()), false, ptr_for_ref) { + if let Some(ty) = self.c_type_from_path(&format!("[{}; {}]", inner_ty_str, i.base10_digits()), false, ptr_for_ref) { write!(w, "{}", ty).unwrap(); true } else { false }