Use temprary workaround for BackgroundProcess_start argument generation, and add header include fix in local dependency compilation script

Author: arik-so

.github/workflows/swift.yml

@@ -20,14 +20,14 @@ jobs:
                     cd rust-lightning
                     # git checkout origin/2021-03-java-bindings-base
                     # git checkout v0.0.100
-                    git checkout bfd04db6318fe374988d651607f1219749e42a52
+                    git checkout 557c7143fddde4a3879bb209a71f8f574c604caf
                     echo "rust-lightning commit hash:"
                     git rev-parse HEAD
                     cd ..
                     # git clone https://github.com/lightningdevkit/ldk-c-bindings
                     git clone https://github.com/TheBlueMatt/ldk-c-bindings
                     cd ldk-c-bindings
-                    git checkout 18337a0191c3abdca8d51861c328dd3d2d9ca6b7
+                    git checkout 1bb5ae1b34aeb74009b7b4b5ebefc957cddc30a6
                     echo "ldk-c-bindings commit hash:"
                     git rev-parse HEAD
                     cd ..

bindings/LDK/Bindings.swift

@@ -6057,7 +6057,7 @@ withUnsafePointer(to: scorer.cOpaqueStruct!) { (scorerPointer: UnsafePointer<LDK
 	*/
 
 	public class func get_ldk_swift_bindings_version() -> String {
-        return "46e7ffb00908db26c46f9c226903baedf93d316c"
+        return "ad87781697755854cb84ee584d82448b2c05a0bd"
     }
 
 }

bindings/LDK/structs/BackgroundProcessor.swift

@@ -6,22 +6,22 @@ public class BackgroundProcessor: NativeTypeWrapper {
     internal var cOpaqueStruct: LDKBackgroundProcessor?
 
 
-    /* DEFAULT_CONSTRUCTOR_START */
-#warning("This method passes non-cloneable objects by owned value. Here be dragons.")
-    @available(*, deprecated, message: "This method passes non-cloneable objects by owned value. Here be dragons.")
-    public init(persister: ChannelManagerPersister, event_handler: EventHandler, chain_monitor: ChainMonitor, channel_manager: ChannelManager, net_graph_msg_handler: NetGraphMsgHandler?, peer_manager: PeerManager, logger: Logger) {
-        Self.instanceCounter += 1
-        self.instanceNumber = Self.instanceCounter
-        
-        let graphMessageHandler = net_graph_msg_handler?.dangle().cOpaqueStruct! ?? LDKNetGraphMsgHandler(inner: nil, is_owned: true)
-        
+	/* DEFAULT_CONSTRUCTOR_START */
+    #warning("This method passes non-cloneable objects by owned value. Here be dragons.")
+@available(*, deprecated, message: "This method passes non-cloneable objects by owned value. Here be dragons.")
+public init(persister: ChannelManagerPersister, event_handler: EventHandler, chain_monitor: ChainMonitor, channel_manager: ChannelManager, net_graph_msg_handler: NetGraphMsgHandler?, peer_manager: PeerManager, logger: Logger) {
+    	Self.instanceCounter += 1
+		self.instanceNumber = Self.instanceCounter
+    	
+let graphMessageHandler = net_graph_msg_handler?.dangle().cOpaqueStruct! ?? LDKNetGraphMsgHandler(inner: nil, is_owned: true)
+
         self.cOpaqueStruct = withUnsafePointer(to: chain_monitor.cOpaqueStruct!) { (chain_monitorPointer: UnsafePointer<LDKChainMonitor>) in
-            withUnsafePointer(to: channel_manager.cOpaqueStruct!) { (channel_managerPointer: UnsafePointer<LDKChannelManager>) in
-                withUnsafePointer(to: peer_manager.cOpaqueStruct!) { (peer_managerPointer: UnsafePointer<LDKPeerManager>) in
-                    BackgroundProcessor_start(persister.cOpaqueStruct!, event_handler.cOpaqueStruct!, chain_monitorPointer, channel_managerPointer, graphMessageHandler, peer_managerPointer, logger.cOpaqueStruct!)
-                }
-            }
-        }
+withUnsafePointer(to: channel_manager.cOpaqueStruct!) { (channel_managerPointer: UnsafePointer<LDKChannelManager>) in
+withUnsafePointer(to: peer_manager.cOpaqueStruct!) { (peer_managerPointer: UnsafePointer<LDKPeerManager>) in
+BackgroundProcessor_start(persister.cOpaqueStruct!, event_handler.cOpaqueStruct!, chain_monitorPointer, channel_managerPointer, graphMessageHandler, peer_managerPointer, logger.cOpaqueStruct!)
+}
+}
+}
         super.init(conflictAvoidingVariableName: 0)
     }
     /* DEFAULT_CONSTRUCTOR_END */

ci/fix_header_includes.py

@@ -1,9 +1,14 @@
 import os
+import sys
 
 directory_path = os.path.dirname(os.path.realpath(__file__))
-header_directory = f'{directory_path}/LDKSwift/Sources/LDKHeaders'
+default_header_directory = f'{directory_path}/LDKSwift/Sources/LDKHeaders'
+header_directory = sys.argv[1] if len(sys.argv) >= 2 else default_header_directory
 # header_directory = f'{directory_path}/../xcode/LDKFramework'
 
+if not os.path.exists(header_directory):
+	sys.exit(f'Directory "{header_directory}" does not exist')
+
 header_files = []
 
 # Create a collection of local header (or C) files

src/generators/opaque_struct_generator.py

@@ -56,6 +56,21 @@ def generate_opaque_struct(self, struct_name, struct_details, all_type_details={
 				cloneability_type_message = '; '.join(cloneability_types)
 				print(f'(opaque_struct_generator.py#constructor, warned, deprecated) {cloneability_warning}: {constructor_native_name} [{cloneability_type_message}]')
 
+			if constructor_native_name == 'BackgroundProcessor_start':
+				previous_swift_argument = constructor_swift_arguments[4]
+				previous_native_argument = constructor_native_arguments[4]
+				new_swift_argument = 'net_graph_msg_handler: NetGraphMsgHandler?'
+				new_native_argument = 'graphMessageHandler'
+				print(f'''
+					Replacing {constructor_native_name}:
+						Swift argument `{previous_swift_argument}` -> `{new_swift_argument}`
+						Native argument `{previous_native_argument}` -> `{new_native_argument}`
+				''')
+
+				constructor_swift_arguments[4] = new_swift_argument
+				constructor_native_call_prep += '\nlet graphMessageHandler = net_graph_msg_handler?.dangle().cOpaqueStruct! ?? LDKNetGraphMsgHandler(inner: nil, is_owned: true)\n'
+				constructor_native_arguments[4] = new_native_argument
+
 
 			mutating_output_file_contents = mutating_output_file_contents.replace('public init', f'{deprecation_prefix}public init')
 

xcode/compile_dependency_binaries.sh

@@ -16,7 +16,6 @@ usage() {
 [ ! -d "${LDK_DIRECTORY}" ] && echo "Provided directory does not exist" && exit 1;
 
 
-
 cp "${C_BINDINGS_SOURCE_DIRECTORY}/include/"*.h $FRAMEWORK_PROJECT_DIRECTORY_IOS
 cp "${C_BINDINGS_SOURCE_DIRECTORY}/include/"*.h $FRAMEWORK_PROJECT_DIRECTORY_MAC
 cp "${C_BINDINGS_SOURCE_DIRECTORY}/include/"*.h $DIRECT_BINDINGS_PROJECT_DIRECTORY
@@ -25,6 +24,10 @@ cp "${LDK_DIRECTORY}/ldk-net/ldk_net."{c,h} $FRAMEWORK_PROJECT_DIRECTORY_IOS
 cp "${LDK_DIRECTORY}/ldk-net/ldk_net."{c,h} $FRAMEWORK_PROJECT_DIRECTORY_MAC
 cp "${LDK_DIRECTORY}/ldk-net/ldk_net."{c,h} $DIRECT_BINDINGS_PROJECT_DIRECTORY
 
+python3 ../ci/fix_header_includes.py $FRAMEWORK_PROJECT_DIRECTORY_IOS
+python3 ../ci/fix_header_includes.py $FRAMEWORK_PROJECT_DIRECTORY_MAC
+python3 ../ci/fix_header_includes.py $DIRECT_BINDINGS_PROJECT_DIRECTORY
+
 
 # build for Catalyst
 pushd $C_BINDINGS_SOURCE_DIRECTORY