Update to 0.0.14 step 3

Author: arik-so

__main__.py

@@ -1,3 +1,4 @@
-from src.sdk_generator import generate_sdk
+from src.sdk_generator import generate_sdk, cleanup_bindings
 
+cleanup_bindings()
 generate_sdk()

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 "e1e1c09ce5f801f30ca2b644e540821050272436"
+        return "0e8a8e97affee47cd2c0af734ee76c3bb396663c"
     }
 
 }

bindings/LDK/options/Option_TypeZ.swift

@@ -6,7 +6,7 @@ public class Option_TypeZ: NativeTypeWrapper {
     internal var cOpaqueStruct: LDKCOption_TypeZ?
 
 	/* DEFAULT_CONSTRUCTOR_START */
-    public init(value: Type?) {
+    public init(value: BindingsType?) {
     	Self.instanceCounter += 1
 		self.instanceNumber = Self.instanceCounter
 
@@ -42,22 +42,22 @@ public class Option_TypeZ: NativeTypeWrapper {
 
     /* OPTION_METHODS_START */
 
-    public func getValue() -> Type? {
+    public func getValue() -> BindingsType? {
 
 
 				if self.cOpaqueStruct!.tag == LDKCOption_TypeZ_None {
 						return nil
 				}
 				if self.cOpaqueStruct!.tag == LDKCOption_TypeZ_Some {
-					return Type(pointer: self.cOpaqueStruct!.some)
+					return BindingsType(pointer: self.cOpaqueStruct!.some)
 				}
 				assert(false, "invalid option enum value")
 				return nil
 
 
     }
 
-    public class func some(o: Type) -> Option_TypeZ {
+    public class func some(o: BindingsType) -> Option_TypeZ {
 
         return Option_TypeZ(pointer: COption_TypeZ_some(o.danglingClone().cOpaqueStruct!));
     }

bindings/LDK/traits/CustomMessageHandler.swift

@@ -16,7 +16,7 @@ open class CustomMessageHandler: NativeTypeWrapper {
 		func handle_custom_messageCallback(pointer: UnsafeRawPointer?, msg: LDKType, sender_node_id: LDKPublicKey) -> LDKCResult_NoneLightningErrorZ {
 			let instance: CustomMessageHandler = Bindings.pointerToInstance(pointer: pointer!, sourceMarker: "CustomMessageHandler.swift::handle_custom_message")
 
-			return instance.handle_custom_message(msg: Type(pointer: msg), sender_node_id: Bindings.tuple33_to_array(nativeType: sender_node_id.compressed_form)).cOpaqueStruct!
+			return instance.handle_custom_message(msg: BindingsType(pointer: msg), sender_node_id: Bindings.tuple33_to_array(nativeType: sender_node_id.compressed_form)).cOpaqueStruct!
 		}
 
 		func get_and_clear_pending_msgCallback(pointer: UnsafeRawPointer?) -> LDKCVec_C2Tuple_PublicKeyTypeZZ {
@@ -83,7 +83,7 @@ open class CustomMessageHandler: NativeTypeWrapper {
 					}
 
 
-    open func handle_custom_message(msg: Type, sender_node_id: [UInt8]) -> Result_NoneLightningErrorZ {
+    open func handle_custom_message(msg: BindingsType, sender_node_id: [UInt8]) -> Result_NoneLightningErrorZ {
     	/* EDIT ME */
 		Bindings.print("CustomMessageHandler::handle_custom_message should be overridden!", severity: .WARNING)
 
@@ -112,7 +112,7 @@ return [LDKC2Tuple_PublicKeyTypeZ]()
 public class NativelyImplementedCustomMessageHandler: CustomMessageHandler {
 	/* SWIFT_DEFAULT_CALLBACKS_START */
 
-	public override func handle_custom_message(msg: Type, sender_node_id: [UInt8]) -> Result_NoneLightningErrorZ {
+	public override func handle_custom_message(msg: BindingsType, sender_node_id: [UInt8]) -> Result_NoneLightningErrorZ {
 
 
 				return 

bindings/LDK/traits/Type.swift

@@ -74,17 +74,17 @@ open class Type: NativeTypeWrapper {
     /* SWIFT_CALLBACKS_START */
 
 
-				public func clone() -> Type {
+				public func clone() -> BindingsType {
 
 					return withUnsafePointer(to: self.cOpaqueStruct!) { (origPointer: UnsafePointer<LDKType>) in
 
-					Type(pointer: Type_clone(origPointer))
+					BindingsType(pointer: Type_clone(origPointer))
 
 }
 				}
 
 
-					internal func danglingClone() -> Type {
+					internal func danglingClone() -> BindingsType {
         				let dangledClone = self.clone()
 						dangledClone.dangling = true
 						return dangledClone

bindings/LDK/tuples/C2Tuple_PublicKeyTypeZ.swift

@@ -37,7 +37,7 @@ C2Tuple_PublicKeyTypeZ_clone(origPointer)
 					}
 
 
-    public class func new(a: [UInt8], b: Type) -> C2Tuple_PublicKeyTypeZ {
+    public class func new(a: [UInt8], b: BindingsType) -> C2Tuple_PublicKeyTypeZ {
 
         return C2Tuple_PublicKeyTypeZ(pointer: C2Tuple_PublicKeyTypeZ_new(Bindings.new_LDKPublicKey(array: a), b.danglingClone().cOpaqueStruct!));
     }

src/conversion_helper.py

@@ -10,6 +10,25 @@ class ConversionHelper:
 	freeable_types = set()
 	nullable_inner_types = {'LDKOutPoint'}
 
+	@classmethod
+	def is_instance_type(cls, swift_type: str, raw_rust_type: str, include_options_and_results: bool = True):
+		if raw_rust_type == 'LDK' + swift_type:
+			return True
+
+		if include_options_and_results:
+			if raw_rust_type == 'LDKC' + swift_type:
+				return True
+
+		# for edge cases
+		if raw_rust_type == 'LDKType' and swift_type == 'BindingsType':
+			return True
+
+		return False
+
+	@classmethod
+	def is_array_type(cls, swift_type: str):
+		return swift_type.startswith('[')
+
 	@classmethod
 	def prepare_swift_to_native_arguments(cls, argument_types, is_trait_callback=False, force_pass_instance=False, is_free_method=False, is_returned_value_freeable=False, unwrap_complex_arrays = True, array_unwrapping_preparation_only = False, is_trait_default_redirect = False):
 		swift_arguments = []
@@ -204,9 +223,7 @@ def prepare_swift_to_native_arguments(cls, argument_types, is_trait_callback=Fal
 					swift_redirection_arguments.append(f'{argument_name}: {argument_name}')
 
 			# native_arguments.append(f'{passed_argument_name}')
-			if current_argument_details.rust_obj == 'LDK' + swift_argument_type and not current_argument_details.is_ptr:
-				native_arguments.append(f'{passed_argument_name}{clone_infix}.cOpaqueStruct!')
-			elif current_argument_details.rust_obj == 'LDKC' + swift_argument_type and not current_argument_details.is_ptr:
+			if cls.is_instance_type(swift_argument_type, current_argument_details.rust_obj) and not current_argument_details.is_ptr:
 				native_arguments.append(f'{passed_argument_name}{clone_infix}.cOpaqueStruct!')
 			elif current_argument_details.rust_obj is not None and current_argument_details.rust_obj.startswith('LDK') and swift_argument_type.startswith('[') and not is_pointer_to_array:
 				# if current_argument_details.swift_type == '[UInt8]' and not current_argument_details.swift_raw_type.startswith('LDKC'):
@@ -308,7 +325,13 @@ def prepare_native_to_swift_callback_arguments(cls, argument_types, array_unwrap
 					swift_local_conversion_suffix = ')'
 					published_swift_type = '[UInt8]'
 			elif received_raw_type is not None and received_raw_type.startswith('LDK'):
-				if received_raw_type == 'LDK' + published_swift_type:
+				if cls.is_instance_type(published_swift_type, received_raw_type):
+					swift_local_conversion_prefix = f'{published_swift_type}(pointer: '
+					swift_local_conversion_suffix = ')'
+					# TODO: see if `current_argument_details.pass_by_ref` condition is necessary
+					if current_argument_details.passed_as_ptr and current_argument_details.pass_by_ref:
+						swift_local_conversion_suffix = ').dangle()'
+				elif received_raw_type.startswith('LDKCOption_') and received_raw_type == 'LDKC' + published_swift_type:
 					swift_local_conversion_prefix = f'{published_swift_type}(pointer: '
 					swift_local_conversion_suffix = ')'
 					# TODO: see if `current_argument_details.pass_by_ref` condition is necessary
@@ -439,7 +462,7 @@ def prepare_return_value(cls, return_type, is_clone_method=False, is_trait_insta
 			array_length = return_type.arr_len
 			return_prefix = f'Bindings.tuple{array_length}_to_array(nativeType: '
 			return_suffix = ')'
-		elif rust_return_type == 'LDK' + return_type_string:
+		elif cls.is_instance_type(return_type_string, rust_return_type):
 			return_prefix = f'{swift_return_instantiation_type}(pointer: '
 			if is_clone_method:
 				# return_prefix = 'Self(pointer: '
@@ -450,15 +473,6 @@ def prepare_return_value(cls, return_type, is_clone_method=False, is_trait_insta
 			if is_trait_instantiator or is_raw_property_getter:
 				# replace if with elif if it's only to be used for _as methods (ChannelManagerReadArgs with get_ vs KeysManager with as_)
 				return_suffix = return_suffix.rstrip(')') + ', anchor: self)'
-		elif rust_return_type == 'LDKC' + return_type_string:
-			return_prefix = f'{swift_return_instantiation_type}(pointer: '
-			if is_clone_method:
-				# return_prefix = 'Self(pointer: '
-				pass
-			return_suffix = ')'
-			if is_raw_property_getter:
-				# return_suffix += '.dangle()'
-				return_suffix = return_suffix.rstrip(')') + ', anchor: self)'
 		# if is_trait_instantiator:
 		# only applies to tuples, but is never hit
 		# return_suffix = ', anchor: self)'

src/generators/option_generator.py

@@ -97,7 +97,7 @@ def generate_option(self, struct_name, struct_details, all_type_details={}):
 			swift_local_conversion_prefix = ''
 			swift_local_conversion_suffix = ''
 
-			if raw_rust_type == 'LDK' + swift_type:
+			if ConversionHelper.is_instance_type(swift_type, raw_rust_type):
 				native_conversion_prefix = ''
 				native_conversion_suffix = '.cOpaqueStruct!'
 				swift_local_conversion_prefix = f'{swift_type}(pointer: '

src/generators/trait_generator.py

@@ -151,8 +151,7 @@ def generate_trait(self, struct_name, struct_details):
 			# if current_lambda['return_type'].rust_obj is not None and current_lambda['return_type'].rust_obj.startswith(
 			# 	'LDK'):
 			current_return_type_details = current_lambda['return_type']
-			if current_return_type_details.rust_obj is not None and (
-				current_return_type_details.rust_obj == 'LDK' + swift_return_type or current_return_type_details.rust_obj == 'LDKC' + swift_return_type):
+			if current_return_type_details.rust_obj is not None and ConversionHelper.is_instance_type(swift_return_type, current_return_type_details.rust_obj):
 				swift_raw_return_type = current_return_type_details.rust_obj
 				return_conversion_suffix = '.cOpaqueStruct!'
 			elif swift_raw_return_type.startswith('(UInt'):

src/generators/util_generators/static_method_generator.py

@@ -27,6 +27,9 @@ def generate_static_methods(self, static_methods):
 				# continue
 				pass
 
+			if native_method_name == '__unmangle_inner_ptr':
+				continue
+
 			arguments = ConversionHelper.prepare_swift_to_native_arguments(current_method['argument_types'], False)
 			return_wrappers = ConversionHelper.prepare_return_value(current_method['return_type'], False)