Merge pull request #84 from TheBlueMatt/main

0.0.109 Support

Author: TheBlueMatt

.github/workflows/build.yml

@@ -37,7 +37,7 @@ jobs:
         run: |
           git clone https://github.com/rust-bitcoin/rust-lightning
           cd rust-lightning
-          git checkout 0.0.108-bindings
+          git checkout 0.0.109-bindings
       - name: Rebuild bindings without std, and check the sample app builds + links
         run: ./genbindings.sh ./rust-lightning false
       - name: Rebuild bindings, and check the sample app builds + links
@@ -88,7 +88,7 @@ jobs:
         run: |
           git clone https://github.com/rust-bitcoin/rust-lightning
           cd rust-lightning
-          git checkout 0.0.108-bindings
+          git checkout 0.0.109-bindings
       - name: Rebuild bindings using Apple clang, and check the sample app builds + links
         run: ./genbindings.sh ./rust-lightning true
       - name: Rebuild bindings using upstream clang, and check the sample app builds + links

c-bindings-gen/src/types.rs

@@ -1477,12 +1477,18 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 				}
 				if let Some(t) = single_contained {
 					if let syn::Type::Tuple(syn::TypeTuple { elems, .. }) = t {
-						assert!(elems.is_empty());
 						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 /*",
-								inner_name, inner_name), format!(""))
-							], " */}", ContainerPrefixLocation::PerConv));
+						if elems.is_empty() {
+							return Some(("if ", vec![
+								(format!(".is_none() {{ {}::None }} else {{ {}::Some /* ",
+									inner_name, inner_name), format!(""))
+								], " */ }", ContainerPrefixLocation::PerConv));
+						} else {
+							return Some(("if ", vec![
+								(format!(".is_none() {{ {}::None }} else {{ {}::Some(",
+									inner_name, inner_name), format!("({}.unwrap())", var_access))
+								], ") }", ContainerPrefixLocation::PerConv));
+						}
 					}
 					if let syn::Type::Reference(syn::TypeReference { elem, .. }) = t {
 						if let syn::Type::Slice(_) = &**elem {
@@ -2039,6 +2045,8 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 							write!(w, "{}", sliceconv(false, None)).unwrap();
 						}
 					}
+				} else if let syn::Type::Array(_) = &*s.elem {
+					write!(w, "{}", sliceconv(false, Some(".map(|a| *a)"))).unwrap();
 				} else { unimplemented!(); }
 			},
 			syn::Type::Tuple(t) => {
@@ -2391,6 +2399,12 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 					ptr_for_ref = true;
 					convert_container!("Slice", 1, || ty.iter());
 					unimplemented!("convert_container should return true as container_lookup should succeed for slices");
+				} else if let syn::Type::Array(_) = &*s.elem {
+					is_ref = false;
+					ptr_for_ref = true;
+					let arr_elem = [(*s.elem).clone()];
+					convert_container!("Slice", 1, || arr_elem.iter());
+					unimplemented!("convert_container should return true as container_lookup should succeed for slices");
 				} else { unimplemented!() }
 			},
 			syn::Type::Tuple(t) => {
@@ -2901,6 +2915,22 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 					let mut segments = syn::punctuated::Punctuated::new();
 					segments.push(parse_quote!(Vec<#args>));
 					self.write_c_type_intern(w, &syn::Type::Path(syn::TypePath { qself: None, path: syn::Path { leading_colon: None, segments } }), generics, false, is_mut, ptr_for_ref, with_ref_lifetime, c_ty)
+				} else if let syn::Type::Array(a) = &*s.elem {
+					if let syn::Expr::Lit(l) = &a.len {
+						if let syn::Lit::Int(i) = &l.lit {
+							let mut buf = Vec::new();
+							self.write_rust_type(&mut buf, generics, &*a.elem, false);
+							let arr_ty = String::from_utf8(buf).unwrap();
+
+							let arr_str = format!("[{}; {}]", arr_ty, i.base10_digits());
+							let ty = self.c_type_from_path(&arr_str, false, ptr_for_ref).unwrap()
+								.rsplitn(2, "::").next().unwrap();
+
+							let mangled_container = format!("CVec_{}Z", ty);
+							write!(w, "{}::{}", Self::generated_container_path(), mangled_container).unwrap();
+							self.check_create_container(mangled_container, "Vec", vec![&*s.elem], generics, false)
+						} else { false }
+					} else { false }
 				} else { false }
 			},
 			syn::Type::Tuple(t) => {

lightning-c-bindings/Cargo.toml

@@ -22,11 +22,11 @@ std = ["bitcoin/std", "lightning/std", "lightning-invoice/std"]
 bitcoin = { version = "0.28", default-features = false }
 secp256k1 = { version = "0.22", features = ["global-context", "recovery"] }
 # Note that the following line is matched by genbindings to update the path
-lightning = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "0.0.108-bindings", default-features = false }
-lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "0.0.108-bindings", default-features = false }
-lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "0.0.108-bindings", default-features = false }
-lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "0.0.108-bindings", default-features = false }
-lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "0.0.108-bindings", default-features = false }
+lightning = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "0.0.109-bindings", default-features = false }
+lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "0.0.109-bindings", default-features = false }
+lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "0.0.109-bindings", default-features = false }
+lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "0.0.109-bindings", default-features = false }
+lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "0.0.109-bindings", default-features = false }
 
 core2 = { version = "0.3.0", optional = true, default-features = false }
 

lightning-c-bindings/demo.cpp

@@ -555,7 +555,7 @@ int main() {
 		LDK::ChannelHandshakeConfig handshake_config2 = ChannelHandshakeConfig_default();
 		ChannelHandshakeConfig_set_minimum_depth(&handshake_config2, 2);
 		LDK::UserConfig config2 = UserConfig_default();
-		UserConfig_set_own_channel_config(&config2, std::move(handshake_config2));
+		UserConfig_set_channel_handshake_config(&config2, std::move(handshake_config2));
 
 		LDK::ChannelManager cm2 = ChannelManager_new(fee_est, mon2, broadcast, logger2, KeysManager_as_KeysInterface(&keys2), std::move(config2), ChainParameters_new(network, BestBlock_new(chain_tip, 0)));
 
@@ -711,7 +711,7 @@ int main() {
 			LDK::RouteParameters route_params = RouteParameters_new(PaymentParameters_new(
 					ChannelManager_get_our_node_id(&cm2), LDKInvoiceFeatures {
 						.inner = NULL, .is_owned = false
-					}, Invoice_route_hints(invoice->contents.result), COption_u64Z_none(), 0xffffffff),
+					}, Invoice_route_hints(invoice->contents.result), COption_u64Z_none(), 0xffffffff, 1),
 				5000, Invoice_min_final_cltv_expiry(invoice->contents.result));
 			random_bytes = keys_source1->get_secure_random_bytes(keys_source1->this_arg);
 

lightning-c-bindings/include/ldk_rust_types.h

@@ -96,6 +96,8 @@ struct nativeRoutingFeesOpaque;
 typedef struct nativeRoutingFeesOpaque LDKnativeRoutingFees;
 struct nativeNodeAnnouncementInfoOpaque;
 typedef struct nativeNodeAnnouncementInfoOpaque LDKnativeNodeAnnouncementInfo;
+struct nativeNodeAliasOpaque;
+typedef struct nativeNodeAliasOpaque LDKnativeNodeAlias;
 struct nativeNodeInfoOpaque;
 typedef struct nativeNodeInfoOpaque LDKnativeNodeInfo;
 struct nativeDelayedPaymentOutputDescriptorOpaque;