Ignore custom message types

arik-so · arik-so · commit e837a1d14bda · 2021-09-24T15:01:46.000-07:00
diff --git a/bindings/LDK/options/Event.swift b/bindings/LDK/options/Event.swift
@@ -351,6 +351,7 @@ Event_write(objPointer)
 				
 					public func getPath() -> [RouteHop] {
 						return Bindings.LDKCVec_RouteHopZ_to_array(nativeType: self.cOpaqueStruct!.path, deallocate: false)
+						
 						.map { (cOpaqueStruct) in
 							RouteHop(pointer: cOpaqueStruct).dangle()
 						}
@@ -405,6 +406,7 @@ Event_write(objPointer)
 				
 					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/MonitorEvent.swift b/bindings/LDK/options/MonitorEvent.swift
@@ -53,7 +53,16 @@ public class MonitorEvent: NativeTypeWrapper {
 						if self.cOpaqueStruct?.tag != LDKMonitorEvent_CommitmentTxConfirmed {
 							return nil
 						}
-						return OutPoint(pointer: self.cOpaqueStruct!.commitment_tx_confirmed, anchor: self)
+						return 
+				{ () in
+					let cStruct =
+				self.cOpaqueStruct!.commitment_tx_confirmed;
+				if cStruct.inner == nil {
+					return nil
+				}	
+				return OutPoint(pointer: cStruct, anchor: self)
+				}()
+			
 					}
 				
 			
diff --git a/bindings/LDK/options/PaymentSendFailure.swift b/bindings/LDK/options/PaymentSendFailure.swift
@@ -58,6 +58,7 @@ public class PaymentSendFailure: NativeTypeWrapper {
 							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()
 						}
@@ -69,6 +70,7 @@ public class PaymentSendFailure: NativeTypeWrapper {
 							return nil
 						}
 						return Bindings.LDKCVec_APIErrorZ_to_array(nativeType: self.cOpaqueStruct!.all_failed_retry_safe, deallocate: false)
+						
 						.map { (cOpaqueStruct) in
 							APIError(pointer: cOpaqueStruct).dangle()
 						}
@@ -80,6 +82,7 @@ public class PaymentSendFailure: NativeTypeWrapper {
 							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/options/SpendableOutputDescriptor.swift b/bindings/LDK/options/SpendableOutputDescriptor.swift
@@ -153,8 +153,17 @@ SpendableOutputDescriptor_write(objPointer)
 			
 				
 				
-					public func getOutpoint() -> OutPoint {
-						return OutPoint(pointer: self.cOpaqueStruct!.outpoint, anchor: self)
+					public func getOutpoint() -> OutPoint? {
+						return 
+				{ () in
+					let cStruct =
+				self.cOpaqueStruct!.outpoint;
+				if cStruct.inner == nil {
+					return nil
+				}	
+				return OutPoint(pointer: cStruct, anchor: self)
+				}()
+			
 					}
 				
 					public func getOutput() -> TxOut {
diff --git a/bindings/LDK/results/Result_CVec_C2Tuple_BlockHashChannelMonitorZZErrorZ.swift b/bindings/LDK/results/Result_CVec_C2Tuple_BlockHashChannelMonitorZZErrorZ.swift
@@ -48,6 +48,7 @@ public class Result_CVec_C2Tuple_BlockHashChannelMonitorZZErrorZ: NativeTypeWrap
 			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()
 						}
diff --git a/bindings/LDK/results/Result_OutPointDecodeErrorZ.swift b/bindings/LDK/results/Result_OutPointDecodeErrorZ.swift
@@ -47,7 +47,16 @@ public class Result_OutPointDecodeErrorZ: NativeTypeWrapper {
 			
 			public func getValue() -> OutPoint? {
 				if self.cOpaqueStruct?.result_ok == true {
-					return OutPoint(pointer: self.cOpaqueStruct!.contents.result.pointee, anchor: self)
+					return 
+				{ () in
+					let cStruct =
+				self.cOpaqueStruct!.contents.result.pointee;
+				if cStruct.inner == nil {
+					return nil
+				}	
+				return OutPoint(pointer: cStruct, anchor: self)
+				}()
+			
 				}
 				return nil
 			}
diff --git a/bindings/LDK/structs/ChainMonitor.swift b/bindings/LDK/structs/ChainMonitor.swift
@@ -60,6 +60,7 @@ public init(pointer: LDKChainMonitor, anchor: NativeTypeWrapper){
         return Bindings.LDKCVec_BalanceZ_to_array(nativeType: withUnsafePointer(to: self.cOpaqueStruct!) { (this_argPointer: UnsafePointer<LDKChainMonitor>) in
 ChainMonitor_get_claimable_balances(this_argPointer, ignored_channelsWrapper.dangle().cOpaqueStruct!)
 })
+						
 						.map { (cOpaqueStruct) in
 							Balance(pointer: cOpaqueStruct)
 						}
diff --git a/bindings/LDK/structs/ChannelDetails.swift b/bindings/LDK/structs/ChannelDetails.swift
@@ -64,11 +64,20 @@ ChannelDetails_get_counterparty(this_ptrPointer)
         return ChannelDetails_set_counterparty(this_ptrPointer, val.danglingClone().cOpaqueStruct!);
     }
 
-    public func get_funding_txo() -> OutPoint {
+    public func get_funding_txo() -> OutPoint? {
     	
-        return OutPoint(pointer: withUnsafePointer(to: self.cOpaqueStruct!) { (this_ptrPointer: UnsafePointer<LDKChannelDetails>) in
+        return 
+				{ () in
+					let cStruct =
+				withUnsafePointer(to: self.cOpaqueStruct!) { (this_ptrPointer: UnsafePointer<LDKChannelDetails>) in
 ChannelDetails_get_funding_txo(this_ptrPointer)
-});
+};
+				if cStruct.inner == nil {
+					return nil
+				}	
+				return OutPoint(pointer: cStruct)
+				}()
+			;
     }
 
     public func set_funding_txo(val: OutPoint) -> Void {
diff --git a/bindings/LDK/structs/ChannelManager.swift b/bindings/LDK/structs/ChannelManager.swift
@@ -53,6 +53,7 @@ ChannelManager_create_channel(this_argPointer, Bindings.new_LDKPublicKey(array:
         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)
 						}
@@ -64,6 +65,7 @@ ChannelManager_list_channels(this_argPointer)
         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)
 						}
diff --git a/bindings/LDK/structs/ChannelMonitor.swift b/bindings/LDK/structs/ChannelMonitor.swift
@@ -81,6 +81,7 @@ ChannelMonitor_get_funding_txo(this_argPointer)
         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)
 						}
@@ -101,6 +102,7 @@ ChannelMonitor_load_outputs_to_watch(this_argPointer, filterPointer)
         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)
 						}
@@ -112,6 +114,7 @@ ChannelMonitor_get_and_clear_pending_monitor_events(this_argPointer)
         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)
 						}
@@ -149,6 +152,7 @@ withUnsafePointer(to: Bindings.array_to_tuple80(array: header)) { (headerPointer
 ChannelMonitor_block_connected(this_argPointer, headerPointer, txdataWrapper.dangle().cOpaqueStruct!, height, broadcaster.cOpaqueStruct!, fee_estimator.cOpaqueStruct!, logger.cOpaqueStruct!)
 }
 })
+						
 						.map { (cOpaqueStruct) in
 							TransactionOutputs(pointer: cOpaqueStruct)
 						}
@@ -186,6 +190,7 @@ withUnsafePointer(to: Bindings.array_to_tuple80(array: header)) { (headerPointer
 ChannelMonitor_transactions_confirmed(this_argPointer, headerPointer, txdataWrapper.dangle().cOpaqueStruct!, height, broadcaster.cOpaqueStruct!, fee_estimator.cOpaqueStruct!, logger.cOpaqueStruct!)
 }
 })
+						
 						.map { (cOpaqueStruct) in
 							TransactionOutputs(pointer: cOpaqueStruct)
 						}
@@ -208,6 +213,7 @@ withUnsafePointer(to: Bindings.array_to_tuple80(array: header)) { (headerPointer
 ChannelMonitor_best_block_updated(this_argPointer, headerPointer, height, broadcaster.cOpaqueStruct!, fee_estimator.cOpaqueStruct!, logger.cOpaqueStruct!)
 }
 })
+						
 						.map { (cOpaqueStruct) in
 							TransactionOutputs(pointer: cOpaqueStruct)
 						}
@@ -237,6 +243,7 @@ ChannelMonitor_current_best_block(this_argPointer)
         return Bindings.LDKCVec_BalanceZ_to_array(nativeType: withUnsafePointer(to: self.cOpaqueStruct!) { (this_argPointer: UnsafePointer<LDKChannelMonitor>) in
 ChannelMonitor_get_claimable_balances(this_argPointer)
 })
+						
 						.map { (cOpaqueStruct) in
 							Balance(pointer: cOpaqueStruct)
 						}
diff --git a/bindings/LDK/structs/ChannelTransactionParameters.swift b/bindings/LDK/structs/ChannelTransactionParameters.swift
@@ -94,11 +94,20 @@ ChannelTransactionParameters_get_counterparty_parameters(this_ptrPointer)
         return ChannelTransactionParameters_set_counterparty_parameters(this_ptrPointer, val.danglingClone().cOpaqueStruct!);
     }
 
-    public func get_funding_outpoint() -> OutPoint {
+    public func get_funding_outpoint() -> OutPoint? {
     	
-        return OutPoint(pointer: withUnsafePointer(to: self.cOpaqueStruct!) { (this_ptrPointer: UnsafePointer<LDKChannelTransactionParameters>) in
+        return 
+				{ () in
+					let cStruct =
+				withUnsafePointer(to: self.cOpaqueStruct!) { (this_ptrPointer: UnsafePointer<LDKChannelTransactionParameters>) in
 ChannelTransactionParameters_get_funding_outpoint(this_ptrPointer)
-});
+};
+				if cStruct.inner == nil {
+					return nil
+				}	
+				return OutPoint(pointer: cStruct)
+				}()
+			;
     }
 
     public func set_funding_outpoint(val: OutPoint) -> Void {
diff --git a/bindings/LDK/structs/CommitmentUpdate.swift b/bindings/LDK/structs/CommitmentUpdate.swift
@@ -83,6 +83,7 @@ public class CommitmentUpdate: NativeTypeWrapper {
         return Bindings.LDKCVec_UpdateAddHTLCZ_to_array(nativeType: withUnsafePointer(to: self.cOpaqueStruct!) { (this_ptrPointer: UnsafePointer<LDKCommitmentUpdate>) in
 CommitmentUpdate_get_update_add_htlcs(this_ptrPointer)
 })
+						
 						.map { (cOpaqueStruct) in
 							UpdateAddHTLC(pointer: cOpaqueStruct)
 						}
@@ -117,6 +118,7 @@ CommitmentUpdate_get_update_add_htlcs(this_ptrPointer)
         return Bindings.LDKCVec_UpdateFulfillHTLCZ_to_array(nativeType: withUnsafePointer(to: self.cOpaqueStruct!) { (this_ptrPointer: UnsafePointer<LDKCommitmentUpdate>) in
 CommitmentUpdate_get_update_fulfill_htlcs(this_ptrPointer)
 })
+						
 						.map { (cOpaqueStruct) in
 							UpdateFulfillHTLC(pointer: cOpaqueStruct)
 						}
@@ -151,6 +153,7 @@ CommitmentUpdate_get_update_fulfill_htlcs(this_ptrPointer)
         return Bindings.LDKCVec_UpdateFailHTLCZ_to_array(nativeType: withUnsafePointer(to: self.cOpaqueStruct!) { (this_ptrPointer: UnsafePointer<LDKCommitmentUpdate>) in
 CommitmentUpdate_get_update_fail_htlcs(this_ptrPointer)
 })
+						
 						.map { (cOpaqueStruct) in
 							UpdateFailHTLC(pointer: cOpaqueStruct)
 						}
@@ -185,6 +188,7 @@ CommitmentUpdate_get_update_fail_htlcs(this_ptrPointer)
         return Bindings.LDKCVec_UpdateFailMalformedHTLCZ_to_array(nativeType: withUnsafePointer(to: self.cOpaqueStruct!) { (this_ptrPointer: UnsafePointer<LDKCommitmentUpdate>) in
 CommitmentUpdate_get_update_fail_malformed_htlcs(this_ptrPointer)
 })
+						
 						.map { (cOpaqueStruct) in
 							UpdateFailMalformedHTLC(pointer: cOpaqueStruct)
 						}
diff --git a/bindings/LDK/structs/DelayedPaymentOutputDescriptor.swift b/bindings/LDK/structs/DelayedPaymentOutputDescriptor.swift
@@ -34,11 +34,20 @@ public class DelayedPaymentOutputDescriptor: NativeTypeWrapper {
 
     /* STRUCT_METHODS_START */
 
-    public func get_outpoint() -> OutPoint {
+    public func get_outpoint() -> OutPoint? {
     	
-        return OutPoint(pointer: withUnsafePointer(to: self.cOpaqueStruct!) { (this_ptrPointer: UnsafePointer<LDKDelayedPaymentOutputDescriptor>) in
+        return 
+				{ () in
+					let cStruct =
+				withUnsafePointer(to: self.cOpaqueStruct!) { (this_ptrPointer: UnsafePointer<LDKDelayedPaymentOutputDescriptor>) in
 DelayedPaymentOutputDescriptor_get_outpoint(this_ptrPointer)
-});
+};
+				if cStruct.inner == nil {
+					return nil
+				}	
+				return OutPoint(pointer: cStruct)
+				}()
+			;
     }
 
     public func set_outpoint(val: OutPoint) -> Void {
diff --git a/bindings/LDK/structs/DirectedChannelTransactionParameters.swift b/bindings/LDK/structs/DirectedChannelTransactionParameters.swift
@@ -54,11 +54,20 @@ DirectedChannelTransactionParameters_is_outbound(this_argPointer)
 };
     }
 
-    public func funding_outpoint() -> OutPoint {
+    public func funding_outpoint() -> OutPoint? {
     	
-        return OutPoint(pointer: withUnsafePointer(to: self.cOpaqueStruct!) { (this_argPointer: UnsafePointer<LDKDirectedChannelTransactionParameters>) in
+        return 
+				{ () in
+					let cStruct =
+				withUnsafePointer(to: self.cOpaqueStruct!) { (this_argPointer: UnsafePointer<LDKDirectedChannelTransactionParameters>) in
 DirectedChannelTransactionParameters_funding_outpoint(this_argPointer)
-});
+};
+				if cStruct.inner == nil {
+					return nil
+				}	
+				return OutPoint(pointer: cStruct)
+				}()
+			;
     }
 
     internal func free() -> Void {
diff --git a/bindings/LDK/structs/InMemorySigner.swift b/bindings/LDK/structs/InMemorySigner.swift
@@ -166,11 +166,20 @@ InMemorySigner_is_outbound(this_argPointer)
 };
     }
 
-    public func funding_outpoint() -> OutPoint {
+    public func funding_outpoint() -> OutPoint? {
     	
-        return OutPoint(pointer: withUnsafePointer(to: self.cOpaqueStruct!) { (this_argPointer: UnsafePointer<LDKInMemorySigner>) in
+        return 
+				{ () in
+					let cStruct =
+				withUnsafePointer(to: self.cOpaqueStruct!) { (this_argPointer: UnsafePointer<LDKInMemorySigner>) in
 InMemorySigner_funding_outpoint(this_argPointer)
-});
+};
+				if cStruct.inner == nil {
+					return nil
+				}	
+				return OutPoint(pointer: cStruct)
+				}()
+			;
     }
 
     public func get_channel_parameters() -> ChannelTransactionParameters {
diff --git a/bindings/LDK/structs/Invoice.swift b/bindings/LDK/structs/Invoice.swift
@@ -127,6 +127,7 @@ Invoice_min_final_cltv_expiry(this_argPointer)
         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)
 						}
@@ -138,6 +139,7 @@ Invoice_private_routes(this_argPointer)
         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)
 						}
diff --git a/bindings/LDK/structs/RawInvoice.swift b/bindings/LDK/structs/RawInvoice.swift
@@ -132,6 +132,7 @@ RawInvoice_features(this_argPointer)
         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)
 						}
diff --git a/bindings/LDK/structs/Route.swift b/bindings/LDK/structs/Route.swift
@@ -54,9 +54,11 @@ public class Route: NativeTypeWrapper {
         return Bindings.LDKCVec_CVec_RouteHopZZ_to_array(nativeType: withUnsafePointer(to: self.cOpaqueStruct!) { (this_ptrPointer: UnsafePointer<LDKRoute>) in
 Route_get_paths(this_ptrPointer)
 })
+						.map { (cOpaqueStruct) in 
+						cOpaqueStruct
 						.map { (cOpaqueStruct) in
 							RouteHop(pointer: cOpaqueStruct)
-						}
+						}}
 					;
     }
 
diff --git a/bindings/LDK/structs/StaticPaymentOutputDescriptor.swift b/bindings/LDK/structs/StaticPaymentOutputDescriptor.swift
@@ -34,11 +34,20 @@ public class StaticPaymentOutputDescriptor: NativeTypeWrapper {
 
     /* STRUCT_METHODS_START */
 
-    public func get_outpoint() -> OutPoint {
+    public func get_outpoint() -> OutPoint? {
     	
-        return OutPoint(pointer: withUnsafePointer(to: self.cOpaqueStruct!) { (this_ptrPointer: UnsafePointer<LDKStaticPaymentOutputDescriptor>) in
+        return 
+				{ () in
+					let cStruct =
+				withUnsafePointer(to: self.cOpaqueStruct!) { (this_ptrPointer: UnsafePointer<LDKStaticPaymentOutputDescriptor>) in
 StaticPaymentOutputDescriptor_get_outpoint(this_ptrPointer)
-});
+};
+				if cStruct.inner == nil {
+					return nil
+				}	
+				return OutPoint(pointer: cStruct)
+				}()
+			;
     }
 
     public func set_outpoint(val: OutPoint) -> Void {
diff --git a/bindings/LDK/structs/WatchedOutput.swift b/bindings/LDK/structs/WatchedOutput.swift
diff --git a/bindings/LDK/traits/Type.swift b/bindings/LDK/traits/Type.swift
diff --git a/bindings/batteries/ChannelManagerConstructor.swift b/bindings/batteries/ChannelManagerConstructor.swift
diff --git a/src/conversion_helper.py b/src/conversion_helper.py

Original file line number	Diff line number	Diff line change
`@@ -351,6 +351,7 @@ Event_write(objPointer)`
`351`	`351`
`352`	`352`	`public func getPath() -> [RouteHop] {`
`353`	`353`	`return Bindings.LDKCVec_RouteHopZ_to_array(nativeType: self.cOpaqueStruct!.path, deallocate: false)`
	`354`	`+`
`354`	`355`	`.map { (cOpaqueStruct) in`
`355`	`356`	`RouteHop(pointer: cOpaqueStruct).dangle()`
`356`	`357`	`}`
`@@ -405,6 +406,7 @@ Event_write(objPointer)`
`405`	`406`
`406`	`407`	`public func getOutputs() -> [SpendableOutputDescriptor] {`
`407`	`408`	`return Bindings.LDKCVec_SpendableOutputDescriptorZ_to_array(nativeType: self.cOpaqueStruct!.outputs, deallocate: false)`
	`409`	`+`
`408`	`410`	`.map { (cOpaqueStruct) in`
`409`	`411`	`SpendableOutputDescriptor(pointer: cOpaqueStruct).dangle()`
`410`	`412`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ public class PaymentSendFailure: NativeTypeWrapper {`
`58`	`58`	`return nil`
`59`	`59`	`}`
`60`	`60`	`return Bindings.LDKCVec_CResult_NoneAPIErrorZZ_to_array(nativeType: self.cOpaqueStruct!.path_parameter_error, deallocate: false)`
	`61`	`+`
`61`	`62`	`.map { (cOpaqueStruct) in`
`62`	`63`	`Result_NoneAPIErrorZ(pointer: cOpaqueStruct).dangle()`
`63`	`64`	`}`
`@@ -69,6 +70,7 @@ public class PaymentSendFailure: NativeTypeWrapper {`
`69`	`70`	`return nil`
`70`	`71`	`}`
`71`	`72`	`return Bindings.LDKCVec_APIErrorZ_to_array(nativeType: self.cOpaqueStruct!.all_failed_retry_safe, deallocate: false)`
	`73`	`+`
`72`	`74`	`.map { (cOpaqueStruct) in`
`73`	`75`	`APIError(pointer: cOpaqueStruct).dangle()`
`74`	`76`	`}`
`@@ -80,6 +82,7 @@ public class PaymentSendFailure: NativeTypeWrapper {`
`80`	`82`	`return nil`
`81`	`83`	`}`
`82`	`84`	`return Bindings.LDKCVec_CResult_NoneAPIErrorZZ_to_array(nativeType: self.cOpaqueStruct!.partial_failure, deallocate: false)`
	`85`	`+`
`83`	`86`	`.map { (cOpaqueStruct) in`
`84`	`87`	`Result_NoneAPIErrorZ(pointer: cOpaqueStruct).dangle()`
`85`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ public class Result_CVec_C2Tuple_BlockHashChannelMonitorZZErrorZ: NativeTypeWrap`
`48`	`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`	`+`
`51`	`52`	`.map { (cOpaqueStruct) in`
`52`	`53`	`C2Tuple_BlockHashChannelMonitorZ(pointer: cOpaqueStruct).dangle()`
`53`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ public init(pointer: LDKChainMonitor, anchor: NativeTypeWrapper){`
`60`	`60`	`return Bindings.LDKCVec_BalanceZ_to_array(nativeType: withUnsafePointer(to: self.cOpaqueStruct!) { (this_argPointer: UnsafePointer<LDKChainMonitor>) in`
`61`	`61`	`ChainMonitor_get_claimable_balances(this_argPointer, ignored_channelsWrapper.dangle().cOpaqueStruct!)`
`62`	`62`	`})`
	`63`	`+`
`63`	`64`	`.map { (cOpaqueStruct) in`
`64`	`65`	`Balance(pointer: cOpaqueStruct)`
`65`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,7 @@ ChannelMonitor_get_funding_txo(this_argPointer)`
`81`	`81`	`return Bindings.LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ_to_array(nativeType: withUnsafePointer(to: self.cOpaqueStruct!) { (this_argPointer: UnsafePointer<LDKChannelMonitor>) in`
`82`	`82`	`ChannelMonitor_get_outputs_to_watch(this_argPointer)`
`83`	`83`	`})`
	`84`	`+`
`84`	`85`	`.map { (cOpaqueStruct) in`
`85`	`86`	`C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ(pointer: cOpaqueStruct)`
`86`	`87`	`}`
`@@ -101,6 +102,7 @@ ChannelMonitor_load_outputs_to_watch(this_argPointer, filterPointer)`
`101`	`102`	`return Bindings.LDKCVec_MonitorEventZ_to_array(nativeType: withUnsafePointer(to: self.cOpaqueStruct!) { (this_argPointer: UnsafePointer<LDKChannelMonitor>) in`
`102`	`103`	`ChannelMonitor_get_and_clear_pending_monitor_events(this_argPointer)`
`103`	`104`	`})`
	`105`	`+`
`104`	`106`	`.map { (cOpaqueStruct) in`
`105`	`107`	`MonitorEvent(pointer: cOpaqueStruct)`
`106`	`108`	`}`
`@@ -112,6 +114,7 @@ ChannelMonitor_get_and_clear_pending_monitor_events(this_argPointer)`
`112`	`114`	`return Bindings.LDKCVec_EventZ_to_array(nativeType: withUnsafePointer(to: self.cOpaqueStruct!) { (this_argPointer: UnsafePointer<LDKChannelMonitor>) in`
`113`	`115`	`ChannelMonitor_get_and_clear_pending_events(this_argPointer)`
`114`	`116`	`})`
	`117`	`+`
`115`	`118`	`.map { (cOpaqueStruct) in`
`116`	`119`	`Event(pointer: cOpaqueStruct)`
`117`	`120`	`}`
`@@ -149,6 +152,7 @@ withUnsafePointer(to: Bindings.array_to_tuple80(array: header)) { (headerPointer`
`149`	`152`	`ChannelMonitor_block_connected(this_argPointer, headerPointer, txdataWrapper.dangle().cOpaqueStruct!, height, broadcaster.cOpaqueStruct!, fee_estimator.cOpaqueStruct!, logger.cOpaqueStruct!)`
`150`	`153`	`}`
`151`	`154`	`})`
	`155`	`+`
`152`	`156`	`.map { (cOpaqueStruct) in`
`153`	`157`	`TransactionOutputs(pointer: cOpaqueStruct)`
`154`	`158`	`}`
`@@ -186,6 +190,7 @@ withUnsafePointer(to: Bindings.array_to_tuple80(array: header)) { (headerPointer`
`186`	`190`	`ChannelMonitor_transactions_confirmed(this_argPointer, headerPointer, txdataWrapper.dangle().cOpaqueStruct!, height, broadcaster.cOpaqueStruct!, fee_estimator.cOpaqueStruct!, logger.cOpaqueStruct!)`
`187`	`191`	`}`
`188`	`192`	`})`
	`193`	`+`
`189`	`194`	`.map { (cOpaqueStruct) in`
`190`	`195`	`TransactionOutputs(pointer: cOpaqueStruct)`
`191`	`196`	`}`
`@@ -208,6 +213,7 @@ withUnsafePointer(to: Bindings.array_to_tuple80(array: header)) { (headerPointer`
`208`	`213`	`ChannelMonitor_best_block_updated(this_argPointer, headerPointer, height, broadcaster.cOpaqueStruct!, fee_estimator.cOpaqueStruct!, logger.cOpaqueStruct!)`
`209`	`214`	`}`
`210`	`215`	`})`
	`216`	`+`
`211`	`217`	`.map { (cOpaqueStruct) in`
`212`	`218`	`TransactionOutputs(pointer: cOpaqueStruct)`
`213`	`219`	`}`
`@@ -237,6 +243,7 @@ ChannelMonitor_current_best_block(this_argPointer)`
`237`	`243`	`return Bindings.LDKCVec_BalanceZ_to_array(nativeType: withUnsafePointer(to: self.cOpaqueStruct!) { (this_argPointer: UnsafePointer<LDKChannelMonitor>) in`
`238`	`244`	`ChannelMonitor_get_claimable_balances(this_argPointer)`
`239`	`245`	`})`
	`246`	`+`
`240`	`247`	`.map { (cOpaqueStruct) in`
`241`	`248`	`Balance(pointer: cOpaqueStruct)`
`242`	`249`	`}`