Update types for new LDK requirements

Both new `rust-bitcoin` types as well as support for `i32` and
cloning `Option_NoneZ`.

Author: TheBlueMatt

c-bindings-gen/src/main.rs

@@ -2554,6 +2554,7 @@ fn main() {
 
 	// Write a few manually-defined types into the C++ header file
 	write_cpp_wrapper(&mut cpp_header_file, "Str", true, None);
+	write_cpp_wrapper(&mut cpp_header_file, "ECDSASignature", false, None);
 
 	// First parse the full crate's ASTs, caching them so that we can hold references to the AST
 	// objects in other datastructures:

c-bindings-gen/src/types.rs

@@ -576,6 +576,7 @@ impl<'mod_lifetime, 'crate_lft: 'mod_lifetime> ImportResolver<'mod_lifetime, 'cr
 		Self::insert_primitive(&mut imports, "bool");
 		Self::insert_primitive(&mut imports, "u128");
 		Self::insert_primitive(&mut imports, "i64");
+		Self::insert_primitive(&mut imports, "i32");
 		Self::insert_primitive(&mut imports, "f64");
 		Self::insert_primitive(&mut imports, "u64");
 		Self::insert_primitive(&mut imports, "u32");
@@ -917,6 +918,11 @@ fn initial_clonable_types() -> HashSet<String> {
 	// `write_c_mangled_container_path_intern` (which will add it here too), so we have to manually
 	// add it on startup.
 	res.insert("crate::c_types::derived::CVec_u8Z".to_owned());
+
+	// write_c_type_intern writes the empty string for the empty tuple. In order to ensure
+	// COption_NoneZ is marked clonable, we have to support "cloning" "".
+	res.insert("".to_owned());
+
 	res
 }
 
@@ -1037,6 +1043,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 		match full_path {
 			"bool" => true,
 			"i64" => true,
+			"i32" => true,
 			"f64" => true,
 			"u64" => true,
 			"u32" => true,
@@ -1110,7 +1117,9 @@ 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::amount::Amount" => Some("u64"),
+			"bitcoin::Amount"|"bitcoin::amount::Amount" => Some("u64"),
+			"bitcoin::Weight" => Some("u64"),
+			"bitcoin::Sequence" => Some("u32"),
 
 			"bitcoin::script::Script"|"bitcoin::Script" => Some("crate::c_types::u8slice"),
 			"bitcoin::script::ScriptBuf"|"bitcoin::ScriptBuf" => Some("crate::c_types::derived::CVec_u8Z"),
@@ -1230,7 +1239,9 @@ 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::amount::Amount" => Some("::bitcoin::amount::Amount::from_sat("),
+			"bitcoin::Amount"|"bitcoin::amount::Amount" => Some("::bitcoin::amount::Amount::from_sat("),
+			"bitcoin::Weight" => Some("::bitcoin::Weight::from_wu("),
+			"bitcoin::Sequence" => Some("::bitcoin::Sequence("),
 
 			"bitcoin::script::Script"|"bitcoin::Script" => Some("::bitcoin::script::Script::from_bytes("),
 			"bitcoin::script::ScriptBuf"|"bitcoin::ScriptBuf" => Some("::bitcoin::script::ScriptBuf::from("),
@@ -1349,7 +1360,9 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 			"bitcoin::secp256k1::Scalar" => Some(".into_rust()"),
 			"bitcoin::secp256k1::ecdh::SharedSecret" if !is_ref => Some(".data)"),
 
-			"bitcoin::amount::Amount" => Some(")"),
+			"bitcoin::Amount"|"bitcoin::amount::Amount" => Some(")"),
+			"bitcoin::Weight" => Some(")"),
+			"bitcoin::Sequence" => Some(")"),
 
 			"bitcoin::script::Script"|"bitcoin::Script" => Some(".to_slice())"),
 			"bitcoin::script::ScriptBuf"|"bitcoin::ScriptBuf" => Some(".into_rust())"),
@@ -1481,7 +1494,9 @@ 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::amount::Amount" => Some(""),
+			"bitcoin::Amount"|"bitcoin::amount::Amount" => Some(""),
+			"bitcoin::Weight" => Some(""),
+			"bitcoin::Sequence" => Some(""),
 
 			"bitcoin::script::Script"|"bitcoin::Script" => Some("crate::c_types::u8slice::from_slice("),
 			"bitcoin::script::ScriptBuf"|"bitcoin::ScriptBuf" => Some(""),
@@ -1594,7 +1609,9 @@ 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::amount::Amount" => Some(".to_sat()"),
+			"bitcoin::Amount"|"bitcoin::amount::Amount" => Some(".to_sat()"),
+			"bitcoin::Weight" => Some(".to_wu()"),
+			"bitcoin::Sequence" => Some(".0"),
 
 			"bitcoin::script::Script"|"bitcoin::Script" => Some(".as_ref())"),
 			"bitcoin::script::ScriptBuf"|"bitcoin::ScriptBuf" if is_ref => Some(".as_bytes().to_vec().into()"),