Return swift-typed arrays outside of traits.

arik-so · arik-so · commit bcfba40a21ed · 2021-09-08T13:24:25.000-07:00
diff --git a/bindings/LDK/Bindings.swift b/bindings/LDK/Bindings.swift
@@ -8,7 +8,9 @@
 import Foundation
 
 public typealias LDKTransactionOutputs = LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ
+public typealias TransactionOutputs = C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ
 public typealias LDKTxid = LDKThirtyTwoBytes
+public typealias Txid = [UInt8]
 
 open class NativeTypeWrapper: Hashable {
 
diff --git a/bindings/LDK/options/Event.swift b/bindings/LDK/options/Event.swift
@@ -363,8 +363,12 @@ Event_write(objPointer)
 			
 				
 				
-					public func getOutputs() -> [LDKSpendableOutputDescriptor] {
+					public func getOutputs() -> [SpendableOutputDescriptor] {
 						return Bindings.LDKCVec_SpendableOutputDescriptorZ_to_array(nativeType: self.cOpaqueStruct!.outputs, deallocate: false)
+						.map { (cOpaqueStruct) in
+							SpendableOutputDescriptor(pointer: cOpaqueStruct).dangle()
+						}
+					
 					}
 				
 				
diff --git a/bindings/LDK/options/PaymentSendFailure.swift b/bindings/LDK/options/PaymentSendFailure.swift
@@ -53,25 +53,37 @@ public class PaymentSendFailure: NativeTypeWrapper {
 						return APIError(pointer: self.cOpaqueStruct!.parameter_error, anchor: self)
 					}
 				
-					public func getValueAsPathParameterError() -> [LDKCResult_NoneAPIErrorZ]? {
+					public func getValueAsPathParameterError() -> [Result_NoneAPIErrorZ]? {
 						if self.cOpaqueStruct?.tag != LDKPaymentSendFailure_PathParameterError {
 							return nil
 						}
 						return Bindings.LDKCVec_CResult_NoneAPIErrorZZ_to_array(nativeType: self.cOpaqueStruct!.path_parameter_error, deallocate: false)
+						.map { (cOpaqueStruct) in
+							Result_NoneAPIErrorZ(pointer: cOpaqueStruct).dangle()
+						}
+					
 					}
 				
-					public func getValueAsAllFailedRetrySafe() -> [LDKAPIError]? {
+					public func getValueAsAllFailedRetrySafe() -> [APIError]? {
 						if self.cOpaqueStruct?.tag != LDKPaymentSendFailure_AllFailedRetrySafe {
 							return nil
 						}
 						return Bindings.LDKCVec_APIErrorZ_to_array(nativeType: self.cOpaqueStruct!.all_failed_retry_safe, deallocate: false)
+						.map { (cOpaqueStruct) in
+							APIError(pointer: cOpaqueStruct).dangle()
+						}
+					
 					}
 				
-					public func getValueAsPartialFailure() -> [LDKCResult_NoneAPIErrorZ]? {
+					public func getValueAsPartialFailure() -> [Result_NoneAPIErrorZ]? {
 						if self.cOpaqueStruct?.tag != LDKPaymentSendFailure_PartialFailure {
 							return nil
 						}
 						return Bindings.LDKCVec_CResult_NoneAPIErrorZZ_to_array(nativeType: self.cOpaqueStruct!.partial_failure, deallocate: false)
+						.map { (cOpaqueStruct) in
+							Result_NoneAPIErrorZ(pointer: cOpaqueStruct).dangle()
+						}
+					
 					}
 				
 			
diff --git a/bindings/LDK/results/Result_CVec_C2Tuple_BlockHashChannelMonitorZZErrorZ.swift b/bindings/LDK/results/Result_CVec_C2Tuple_BlockHashChannelMonitorZZErrorZ.swift
@@ -45,9 +45,13 @@ public class Result_CVec_C2Tuple_BlockHashChannelMonitorZZErrorZ: NativeTypeWrap
 				return nil
 			}
 			
-			public func getValue() -> [LDKC2Tuple_BlockHashChannelMonitorZ]? {
+			public func getValue() -> [C2Tuple_BlockHashChannelMonitorZ]? {
 				if self.cOpaqueStruct?.result_ok == true {
 					return Bindings.LDKCVec_C2Tuple_BlockHashChannelMonitorZZ_to_array(nativeType: self.cOpaqueStruct!.contents.result.pointee, deallocate: false)
+						.map { (cOpaqueStruct) in
+							C2Tuple_BlockHashChannelMonitorZ(pointer: cOpaqueStruct).dangle()
+						}
+					
 				}
 				return nil
 			}
diff --git a/bindings/LDK/structs/ChannelManager.swift b/bindings/LDK/structs/ChannelManager.swift
@@ -48,18 +48,26 @@ ChannelManager_create_channel(this_argPointer, Bindings.new_LDKPublicKey(array:
 });
     }
 
-    public func list_channels() -> [LDKChannelDetails] {
+    public func list_channels() -> [ChannelDetails] {
     	
         return Bindings.LDKCVec_ChannelDetailsZ_to_array(nativeType: withUnsafePointer(to: self.cOpaqueStruct!) { (this_argPointer: UnsafePointer<LDKChannelManager>) in
 ChannelManager_list_channels(this_argPointer)
-});
+})
+						.map { (cOpaqueStruct) in
+							ChannelDetails(pointer: cOpaqueStruct)
+						}
+					;
     }
 
-    public func list_usable_channels() -> [LDKChannelDetails] {
+    public func list_usable_channels() -> [ChannelDetails] {
     	
         return Bindings.LDKCVec_ChannelDetailsZ_to_array(nativeType: withUnsafePointer(to: self.cOpaqueStruct!) { (this_argPointer: UnsafePointer<LDKChannelManager>) in
 ChannelManager_list_usable_channels(this_argPointer)
-});
+})
+						.map { (cOpaqueStruct) in
+							ChannelDetails(pointer: cOpaqueStruct)
+						}
+					;
     }
 
     public func close_channel(channel_id: [UInt8]) -> Result_NoneAPIErrorZ {
diff --git a/bindings/LDK/structs/ChannelMonitor.swift b/bindings/LDK/structs/ChannelMonitor.swift
@@ -76,11 +76,15 @@ ChannelMonitor_get_funding_txo(this_argPointer)
 });
     }
 
-    public func get_outputs_to_watch() -> [LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ] {
+    public func get_outputs_to_watch() -> [C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ] {
     	
         return Bindings.LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ_to_array(nativeType: withUnsafePointer(to: self.cOpaqueStruct!) { (this_argPointer: UnsafePointer<LDKChannelMonitor>) in
 ChannelMonitor_get_outputs_to_watch(this_argPointer)
-});
+})
+						.map { (cOpaqueStruct) in
+							C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ(pointer: cOpaqueStruct)
+						}
+					;
     }
 
     public func load_outputs_to_watch(filter: Filter) -> Void {
@@ -92,18 +96,26 @@ ChannelMonitor_load_outputs_to_watch(this_argPointer, filterPointer)
 };
     }
 
-    public func get_and_clear_pending_monitor_events() -> [LDKMonitorEvent] {
+    public func get_and_clear_pending_monitor_events() -> [MonitorEvent] {
     	
         return Bindings.LDKCVec_MonitorEventZ_to_array(nativeType: withUnsafePointer(to: self.cOpaqueStruct!) { (this_argPointer: UnsafePointer<LDKChannelMonitor>) in
 ChannelMonitor_get_and_clear_pending_monitor_events(this_argPointer)
-});
+})
+						.map { (cOpaqueStruct) in
+							MonitorEvent(pointer: cOpaqueStruct)
+						}
+					;
     }
 
-    public func get_and_clear_pending_events() -> [LDKEvent] {
+    public func get_and_clear_pending_events() -> [Event] {
     	
         return Bindings.LDKCVec_EventZ_to_array(nativeType: withUnsafePointer(to: self.cOpaqueStruct!) { (this_argPointer: UnsafePointer<LDKChannelMonitor>) in
 ChannelMonitor_get_and_clear_pending_events(this_argPointer)
-});
+})
+						.map { (cOpaqueStruct) in
+							Event(pointer: cOpaqueStruct)
+						}
+					;
     }
 
     public func get_latest_holder_commitment_txn(logger: Logger) -> [[UInt8]] {
@@ -115,7 +127,7 @@ ChannelMonitor_get_latest_holder_commitment_txn(this_argPointer, loggerPointer)
 });
     }
 
-    public func block_connected(header: [UInt8], txdata: [C2Tuple_usizeTransactionZ], height: UInt32, broadcaster: BroadcasterInterface, fee_estimator: FeeEstimator, logger: Logger) -> [LDKTransactionOutputs] {
+    public func block_connected(header: [UInt8], txdata: [C2Tuple_usizeTransactionZ], height: UInt32, broadcaster: BroadcasterInterface, fee_estimator: FeeEstimator, logger: Logger) -> [TransactionOutputs] {
     	
 							let txdataUnwrapped = txdata.map { (txdataCurrentValue) in
 							txdataCurrentValue
@@ -125,7 +137,7 @@ ChannelMonitor_get_latest_holder_commitment_txn(this_argPointer, loggerPointer)
         return self.block_connected(header: header, txdata: txdataUnwrapped, height: height, broadcaster: broadcaster, fee_estimator: fee_estimator, logger: logger);
     }
 
-    internal func block_connected(header: [UInt8], txdata: [LDKC2Tuple_usizeTransactionZ], height: UInt32, broadcaster: BroadcasterInterface, fee_estimator: FeeEstimator, logger: Logger) -> [LDKTransactionOutputs] {
+    internal func block_connected(header: [UInt8], txdata: [LDKC2Tuple_usizeTransactionZ], height: UInt32, broadcaster: BroadcasterInterface, fee_estimator: FeeEstimator, logger: Logger) -> [TransactionOutputs] {
     	
 						let txdataWrapper = Bindings.new_LDKCVec_C2Tuple_usizeTransactionZZWrapper(array: txdata)
 						defer {
@@ -136,7 +148,11 @@ ChannelMonitor_get_latest_holder_commitment_txn(this_argPointer, loggerPointer)
 withUnsafePointer(to: Bindings.array_to_tuple80(array: header)) { (headerPointer: UnsafePointer<(UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8)>) in
 ChannelMonitor_block_connected(this_argPointer, headerPointer, txdataWrapper.dangle().cOpaqueStruct!, height, broadcaster.cOpaqueStruct!, fee_estimator.cOpaqueStruct!, logger.cOpaqueStruct!)
 }
-});
+})
+						.map { (cOpaqueStruct) in
+							TransactionOutputs(pointer: cOpaqueStruct)
+						}
+					;
     }
 
     public func block_disconnected(header: [UInt8], height: UInt32, broadcaster: BroadcasterInterface, fee_estimator: FeeEstimator, logger: Logger) -> Void {
@@ -148,7 +164,7 @@ ChannelMonitor_block_disconnected(this_argPointer, headerPointer, height, broadc
 };
     }
 
-    public func transactions_confirmed(header: [UInt8], txdata: [C2Tuple_usizeTransactionZ], height: UInt32, broadcaster: BroadcasterInterface, fee_estimator: FeeEstimator, logger: Logger) -> [LDKTransactionOutputs] {
+    public func transactions_confirmed(header: [UInt8], txdata: [C2Tuple_usizeTransactionZ], height: UInt32, broadcaster: BroadcasterInterface, fee_estimator: FeeEstimator, logger: Logger) -> [TransactionOutputs] {
     	
 							let txdataUnwrapped = txdata.map { (txdataCurrentValue) in
 							txdataCurrentValue
@@ -158,7 +174,7 @@ ChannelMonitor_block_disconnected(this_argPointer, headerPointer, height, broadc
         return self.transactions_confirmed(header: header, txdata: txdataUnwrapped, height: height, broadcaster: broadcaster, fee_estimator: fee_estimator, logger: logger);
     }
 
-    internal func transactions_confirmed(header: [UInt8], txdata: [LDKC2Tuple_usizeTransactionZ], height: UInt32, broadcaster: BroadcasterInterface, fee_estimator: FeeEstimator, logger: Logger) -> [LDKTransactionOutputs] {
+    internal func transactions_confirmed(header: [UInt8], txdata: [LDKC2Tuple_usizeTransactionZ], height: UInt32, broadcaster: BroadcasterInterface, fee_estimator: FeeEstimator, logger: Logger) -> [TransactionOutputs] {
     	
 						let txdataWrapper = Bindings.new_LDKCVec_C2Tuple_usizeTransactionZZWrapper(array: txdata)
 						defer {
@@ -169,7 +185,11 @@ ChannelMonitor_block_disconnected(this_argPointer, headerPointer, height, broadc
 withUnsafePointer(to: Bindings.array_to_tuple80(array: header)) { (headerPointer: UnsafePointer<(UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8)>) in
 ChannelMonitor_transactions_confirmed(this_argPointer, headerPointer, txdataWrapper.dangle().cOpaqueStruct!, height, broadcaster.cOpaqueStruct!, fee_estimator.cOpaqueStruct!, logger.cOpaqueStruct!)
 }
-});
+})
+						.map { (cOpaqueStruct) in
+							TransactionOutputs(pointer: cOpaqueStruct)
+						}
+					;
     }
 
     public func transaction_unconfirmed(txid: [UInt8], broadcaster: BroadcasterInterface, fee_estimator: FeeEstimator, logger: Logger) -> Void {
@@ -181,20 +201,28 @@ ChannelMonitor_transaction_unconfirmed(this_argPointer, txidPointer, broadcaster
 };
     }
 
-    public func best_block_updated(header: [UInt8], height: UInt32, broadcaster: BroadcasterInterface, fee_estimator: FeeEstimator, logger: Logger) -> [LDKTransactionOutputs] {
+    public func best_block_updated(header: [UInt8], height: UInt32, broadcaster: BroadcasterInterface, fee_estimator: FeeEstimator, logger: Logger) -> [TransactionOutputs] {
     	
         return Bindings.LDKCVec_TransactionOutputsZ_to_array(nativeType: withUnsafePointer(to: self.cOpaqueStruct!) { (this_argPointer: UnsafePointer<LDKChannelMonitor>) in
 withUnsafePointer(to: Bindings.array_to_tuple80(array: header)) { (headerPointer: UnsafePointer<(UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8)>) in
 ChannelMonitor_best_block_updated(this_argPointer, headerPointer, height, broadcaster.cOpaqueStruct!, fee_estimator.cOpaqueStruct!, logger.cOpaqueStruct!)
 }
-});
+})
+						.map { (cOpaqueStruct) in
+							TransactionOutputs(pointer: cOpaqueStruct)
+						}
+					;
     }
 
-    public func get_relevant_txids() -> [LDKTxid] {
+    public func get_relevant_txids() -> [Txid] {
     	
         return Bindings.LDKCVec_TxidZ_to_array(nativeType: withUnsafePointer(to: self.cOpaqueStruct!) { (this_argPointer: UnsafePointer<LDKChannelMonitor>) in
 ChannelMonitor_get_relevant_txids(this_argPointer)
-});
+})
+					.map { (bytes) in
+						   Bindings.LDKThirtyTwoBytes_to_array(nativeType: bytes)
+					}
+				;
     }
 
     public func current_best_block() -> BestBlock {
diff --git a/bindings/LDK/structs/Invoice.swift b/bindings/LDK/structs/Invoice.swift
@@ -122,18 +122,26 @@ Invoice_min_final_cltv_expiry(this_argPointer)
 };
     }
 
-    public func private_routes() -> [LDKPrivateRoute] {
+    public func private_routes() -> [PrivateRoute] {
     	
         return Bindings.LDKCVec_PrivateRouteZ_to_array(nativeType: withUnsafePointer(to: self.cOpaqueStruct!) { (this_argPointer: UnsafePointer<LDKInvoice>) in
 Invoice_private_routes(this_argPointer)
-});
+})
+						.map { (cOpaqueStruct) in
+							PrivateRoute(pointer: cOpaqueStruct)
+						}
+					;
     }
 
-    public func route_hints() -> [LDKRouteHint] {
+    public func route_hints() -> [RouteHint] {
     	
         return Bindings.LDKCVec_RouteHintZ_to_array(nativeType: withUnsafePointer(to: self.cOpaqueStruct!) { (this_argPointer: UnsafePointer<LDKInvoice>) in
 Invoice_route_hints(this_argPointer)
-});
+})
+						.map { (cOpaqueStruct) in
+							RouteHint(pointer: cOpaqueStruct)
+						}
+					;
     }
 
     public func currency() -> LDKCurrency {
diff --git a/bindings/LDK/structs/RawInvoice.swift b/bindings/LDK/structs/RawInvoice.swift
@@ -127,11 +127,15 @@ RawInvoice_features(this_argPointer)
 });
     }
 
-    public func private_routes() -> [LDKPrivateRoute] {
+    public func private_routes() -> [PrivateRoute] {
     	
         return Bindings.LDKCVec_PrivateRouteZ_to_array(nativeType: withUnsafePointer(to: self.cOpaqueStruct!) { (this_argPointer: UnsafePointer<LDKRawInvoice>) in
 RawInvoice_private_routes(this_argPointer)
-});
+})
+						.map { (cOpaqueStruct) in
+							PrivateRoute(pointer: cOpaqueStruct)
+						}
+					;
     }
 
     public func amount_pico_btc() -> Option_u64Z {
diff --git a/bindings/LDK/traits/Confirm.swift b/bindings/LDK/traits/Confirm.swift
@@ -165,7 +165,7 @@ public class NativelyImplementedConfirm: Confirm {
 	}
 
 @available(*, deprecated, message: "Use method taking Swift object array type instead.")
-	internal override func transactions_confirmed(header: [UInt8]?, txdata: [LDKC2Tuple_usizeTransactionZ], height: UInt32) -> Void {
+	public override func transactions_confirmed(header: [UInt8]?, txdata: [LDKC2Tuple_usizeTransactionZ], height: UInt32) -> Void {
 		
 				
 						let txdataWrapper = Bindings.new_LDKCVec_C2Tuple_usizeTransactionZZWrapper(array: txdata)
diff --git a/src/conversion_helper.py b/src/conversion_helper.py
@@ -347,7 +347,7 @@ def prepare_native_to_swift_callback_arguments(cls, argument_types, array_unwrap
 				'swift_callback_prep': swift_callback_prep}
 
 	@classmethod
-	def prepare_return_value(cls, return_type, is_clone_method=False, is_trait_instantiator=False, is_raw_property_getter=False):
+	def prepare_return_value(cls, return_type, is_clone_method=False, is_trait_instantiator=False, is_raw_property_getter=False, is_trait_callback=False):
 		rust_return_type = return_type.rust_obj
 		return_prefix = ''
 		return_suffix = ''
@@ -360,8 +360,32 @@ def prepare_return_value(cls, return_type, is_clone_method=False, is_trait_insta
 		if rust_return_type is not None and rust_return_type.startswith('LDK') and return_type_string.startswith('['):
 			return_prefix = f'Bindings.{rust_return_type}_to_array(nativeType: '
 			return_suffix = ')'
+			map_suffix = ''
 			if (rust_return_type.startswith('LDKCVec_') or rust_return_type == 'LDKTransaction') and is_raw_property_getter:
 				return_suffix = ', deallocate: false)'
+				map_suffix = '.dangle()'
+				
+			if TypeParsingRegeces.WRAPPER_TYPE_ARRAY_BRACKET_REGEX.search(return_type_string) and not is_trait_callback:
+				# replace the last [ with [LDK (in case
+				constructor_type = return_type_string.lstrip('[').rstrip(']')
+				# native_return_type_string = TypeParsingRegeces.WRAPPER_TYPE_ARRAY_BRACKET_REGEX.sub('[LDK', return_type_string)
+				# native_return_type_string = return_type_string.replace('LDKResult_', 'LDKCResult_').replace('LDKTuple_', 'LDKCTuple_').replace('LDKVec_', 'LDKCVec_')
+
+				if constructor_type == 'Txid':
+					return_suffix += f'''
+					.map {{ (bytes) in
+						   Bindings.LDKThirtyTwoBytes_to_array(nativeType: bytes)
+					}}
+				'''
+				else:
+					return_suffix += f'''
+						.map {{ (cOpaqueStruct) in
+							{constructor_type}(pointer: cOpaqueStruct){map_suffix}
+						}}
+					'''
+				
+				
+				
 		elif return_type.swift_raw_type.startswith('(UInt8'):
 			# TODO: get array length
 			array_length = return_type.arr_len
@@ -394,7 +418,7 @@ def prepare_return_value(cls, return_type, is_clone_method=False, is_trait_insta
 			return_suffix = '.pointee)'
 			pass
 
-		if TypeParsingRegeces.WRAPPER_TYPE_ARRAY_BRACKET_REGEX.search(return_type_string):
+		if TypeParsingRegeces.WRAPPER_TYPE_ARRAY_BRACKET_REGEX.search(return_type_string) and is_trait_callback:
 			# replace the last [ with [LDK (in case
 			return_type_string = TypeParsingRegeces.WRAPPER_TYPE_ARRAY_BRACKET_REGEX.sub('[LDK', return_type_string)
 			return_type_string = return_type_string.replace('LDKResult_', 'LDKCResult_').replace('LDKTuple_', 'LDKCTuple_').replace('LDKVec_', 'LDKCVec_')
diff --git a/src/generators/trait_generator.py b/src/generators/trait_generator.py
@@ -244,7 +244,7 @@ def generate_trait(self, struct_name, struct_details):
 
 			# let's create a native default implementation
 			default_callback_prepared_arguments = ConversionHelper.prepare_swift_to_native_arguments(current_lambda['argument_types'], True)
-			default_callback_return_wrappers = ConversionHelper.prepare_return_value(current_return_type_details, is_clone)
+			default_callback_return_wrappers = ConversionHelper.prepare_return_value(current_return_type_details, is_clone, is_trait_callback=True)
 
 			if len(default_callback_prepared_arguments['non_cloneable_argument_indices_passed_by_ownership']) > 0:
 				cloneability_warning = 'Non-cloneable types passed by ownership. Here be dragons!'
@@ -254,7 +254,9 @@ def generate_trait(self, struct_name, struct_details):
 			current_default_callback_replacement = current_default_callback_replacement.replace('public_swift_argument_list', public_swift_argument_list)
 			current_default_callback_replacement = current_default_callback_replacement.replace('-> Void {', f'-> {swift_return_type} {{')
 			if default_callback_prepared_arguments['has_unwrapped_arrays']:
-				current_default_callback_replacement = current_default_callback_replacement.replace('public override func', 'internal override func')
+				# not yet possible due to override method's visibility requirements
+				# current_default_callback_replacement = current_default_callback_replacement.replace('public override func', 'internal override func')
+				pass
 				
 			current_default_callback_replacement = current_default_callback_replacement.replace('func methodName(', f'func {current_lambda_name}(')
 			default_native_call_arguments = default_callback_prepared_arguments['native_arguments']
diff --git a/templates/BindingsTemplate.swift b/templates/BindingsTemplate.swift
@@ -8,7 +8,9 @@
 import Foundation
 
 public typealias LDKTransactionOutputs = LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ
+public typealias TransactionOutputs = C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ
 public typealias LDKTxid = LDKThirtyTwoBytes
+public typealias Txid = [UInt8]
 
 open class NativeTypeWrapper: Hashable {
 

Original file line number	Diff line number	Diff line change
`@@ -363,8 +363,12 @@ Event_write(objPointer)`
`363`	`363`
`364`	`364`
`365`	`365`
`366`		`- public func getOutputs() -> [LDKSpendableOutputDescriptor] {`
	`366`	`+ public func getOutputs() -> [SpendableOutputDescriptor] {`
`367`	`367`	`return Bindings.LDKCVec_SpendableOutputDescriptorZ_to_array(nativeType: self.cOpaqueStruct!.outputs, deallocate: false)`
	`368`	`+ .map { (cOpaqueStruct) in`
	`369`	`+ SpendableOutputDescriptor(pointer: cOpaqueStruct).dangle()`
	`370`	`+ }`
	`371`	`+`
`368`	`372`	`}`
`369`	`373`
`370`	`374`
Original file line number	Diff line number	Diff line change
`@@ -53,25 +53,37 @@ public class PaymentSendFailure: NativeTypeWrapper {`
`53`	`53`	`return APIError(pointer: self.cOpaqueStruct!.parameter_error, anchor: self)`
`54`	`54`	`}`
`55`	`55`
`56`		`- public func getValueAsPathParameterError() -> [LDKCResult_NoneAPIErrorZ]? {`
	`56`	`+ public func getValueAsPathParameterError() -> [Result_NoneAPIErrorZ]? {`
`57`	`57`	`if self.cOpaqueStruct?.tag != LDKPaymentSendFailure_PathParameterError {`
`58`	`58`	`return nil`
`59`	`59`	`}`
`60`	`60`	`return Bindings.LDKCVec_CResult_NoneAPIErrorZZ_to_array(nativeType: self.cOpaqueStruct!.path_parameter_error, deallocate: false)`
	`61`	`+ .map { (cOpaqueStruct) in`
	`62`	`+ Result_NoneAPIErrorZ(pointer: cOpaqueStruct).dangle()`
	`63`	`+ }`
	`64`	`+`
`61`	`65`	`}`
`62`	`66`
`63`		`- public func getValueAsAllFailedRetrySafe() -> [LDKAPIError]? {`
	`67`	`+ public func getValueAsAllFailedRetrySafe() -> [APIError]? {`
`64`	`68`	`if self.cOpaqueStruct?.tag != LDKPaymentSendFailure_AllFailedRetrySafe {`
`65`	`69`	`return nil`
`66`	`70`	`}`
`67`	`71`	`return Bindings.LDKCVec_APIErrorZ_to_array(nativeType: self.cOpaqueStruct!.all_failed_retry_safe, deallocate: false)`
	`72`	`+ .map { (cOpaqueStruct) in`
	`73`	`+ APIError(pointer: cOpaqueStruct).dangle()`
	`74`	`+ }`
	`75`	`+`
`68`	`76`	`}`
`69`	`77`
`70`		`- public func getValueAsPartialFailure() -> [LDKCResult_NoneAPIErrorZ]? {`
	`78`	`+ public func getValueAsPartialFailure() -> [Result_NoneAPIErrorZ]? {`
`71`	`79`	`if self.cOpaqueStruct?.tag != LDKPaymentSendFailure_PartialFailure {`
`72`	`80`	`return nil`
`73`	`81`	`}`
`74`	`82`	`return Bindings.LDKCVec_CResult_NoneAPIErrorZZ_to_array(nativeType: self.cOpaqueStruct!.partial_failure, deallocate: false)`
	`83`	`+ .map { (cOpaqueStruct) in`
	`84`	`+ Result_NoneAPIErrorZ(pointer: cOpaqueStruct).dangle()`
	`85`	`+ }`
	`86`	`+`
`75`	`87`	`}`
`76`	`88`
`77`	`89`
Original file line number	Diff line number	Diff line change
`@@ -45,9 +45,13 @@ public class Result_CVec_C2Tuple_BlockHashChannelMonitorZZErrorZ: NativeTypeWrap`
`45`	`45`	`return nil`
`46`	`46`	`}`
`47`	`47`
`48`		`- public func getValue() -> [LDKC2Tuple_BlockHashChannelMonitorZ]? {`
	`48`	`+ public func getValue() -> [C2Tuple_BlockHashChannelMonitorZ]? {`
`49`	`49`	`if self.cOpaqueStruct?.result_ok == true {`
`50`	`50`	`return Bindings.LDKCVec_C2Tuple_BlockHashChannelMonitorZZ_to_array(nativeType: self.cOpaqueStruct!.contents.result.pointee, deallocate: false)`
	`51`	`+ .map { (cOpaqueStruct) in`
	`52`	`+ C2Tuple_BlockHashChannelMonitorZ(pointer: cOpaqueStruct).dangle()`
	`53`	`+ }`
	`54`	`+`
`51`	`55`	`}`
`52`	`56`	`return nil`
`53`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ public class NativelyImplementedConfirm: Confirm {`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`@available(*, deprecated, message: "Use method taking Swift object array type instead.")`
`168`		`- internal override func transactions_confirmed(header: [UInt8]?, txdata: [LDKC2Tuple_usizeTransactionZ], height: UInt32) -> Void {`
	`168`	`+ public override func transactions_confirmed(header: [UInt8]?, txdata: [LDKC2Tuple_usizeTransactionZ], height: UInt32) -> Void {`
`169`	`169`
`170`	`170`
`171`	`171`	`let txdataWrapper = Bindings.new_LDKCVec_C2Tuple_usizeTransactionZZWrapper(array: txdata)`