Do not deallocate vectors when returned arrays contain non-primitives.

arik-so · arik-so · commit d1e33c269280 · 2022-10-29T00:55:41.000-07:00
diff --git a/ci/LDKSwift/Sources/LDKSwift/bindings/Bindings.swift b/ci/LDKSwift/Sources/LDKSwift/bindings/Bindings.swift
@@ -6949,7 +6949,7 @@ withUnsafePointer(to: Bindings.array_to_tuple32(array: random_seed_bytes)) { (ra
 	*/
 
 	public class func get_ldk_swift_bindings_version() -> String {
-        return "999dff8638d6c9595c4a0fd8ed416be234374d51"
+        return "3f2c15ddca88239c3ddc57c1e4cf63a02dca5492"
     }
 
 }
diff --git a/ci/LDKSwift/Sources/LDKSwift/bindings/structs/ChainMonitor.swift b/ci/LDKSwift/Sources/LDKSwift/bindings/structs/ChainMonitor.swift
@@ -73,7 +73,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!)
-}, callerContext: "ChainMonitor::get_claimable_balances")
+}, callerContext: "ChainMonitor::get_claimable_balances", deallocate: false)
 						
 						.map { (cOpaqueStruct) in
 							Balance(pointer: cOpaqueStruct)
@@ -92,7 +92,7 @@ ChainMonitor_get_monitor(this_argPointer, funding_txo.danglingClone().cOpaqueStr
 			
 			return Bindings.LDKCVec_OutPointZ_to_array(nativeType: withUnsafePointer(to: self.cOpaqueStruct!) { (this_argPointer: UnsafePointer<LDKChainMonitor>) in
 ChainMonitor_list_monitors(this_argPointer)
-}, callerContext: "ChainMonitor::list_monitors")
+}, callerContext: "ChainMonitor::list_monitors", deallocate: false)
 						
 						.map { (cOpaqueStruct) in
 							OutPoint(pointer: cOpaqueStruct)
diff --git a/ci/LDKSwift/Sources/LDKSwift/bindings/structs/ChannelManager.swift b/ci/LDKSwift/Sources/LDKSwift/bindings/structs/ChannelManager.swift
@@ -66,7 +66,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)
-}, callerContext: "ChannelManager::list_channels")
+}, callerContext: "ChannelManager::list_channels", deallocate: false)
 						
 						.map { (cOpaqueStruct) in
 							ChannelDetails(pointer: cOpaqueStruct)
@@ -78,7 +78,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)
-}, callerContext: "ChannelManager::list_usable_channels")
+}, callerContext: "ChannelManager::list_usable_channels", deallocate: false)
 						
 						.map { (cOpaqueStruct) in
 							ChannelDetails(pointer: cOpaqueStruct)
diff --git a/ci/LDKSwift/Sources/LDKSwift/bindings/structs/ChannelMonitor.swift b/ci/LDKSwift/Sources/LDKSwift/bindings/structs/ChannelMonitor.swift
@@ -86,7 +86,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)
-}, callerContext: "ChannelMonitor::get_outputs_to_watch")
+}, callerContext: "ChannelMonitor::get_outputs_to_watch", deallocate: false)
 						
 						.map { (cOpaqueStruct) in
 							C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ(pointer: cOpaqueStruct)
@@ -107,7 +107,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)
-}, callerContext: "ChannelMonitor::get_and_clear_pending_monitor_events")
+}, callerContext: "ChannelMonitor::get_and_clear_pending_monitor_events", deallocate: false)
 						
 						.map { (cOpaqueStruct) in
 							MonitorEvent(pointer: cOpaqueStruct)
@@ -119,7 +119,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)
-}, callerContext: "ChannelMonitor::get_and_clear_pending_events")
+}, callerContext: "ChannelMonitor::get_and_clear_pending_events", deallocate: false)
 						
 						.map { (cOpaqueStruct) in
 							Event(pointer: cOpaqueStruct)
@@ -164,7 +164,7 @@ 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.activate().cOpaqueStruct!, fee_estimator.activate().cOpaqueStruct!, logger.activate().cOpaqueStruct!)
 }
-}, callerContext: "ChannelMonitor::block_connected")
+}, callerContext: "ChannelMonitor::block_connected", deallocate: false)
 						
 						.map { (cOpaqueStruct) in
 							TransactionOutputs(pointer: cOpaqueStruct)
@@ -202,7 +202,7 @@ 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.activate().cOpaqueStruct!, fee_estimator.activate().cOpaqueStruct!, logger.activate().cOpaqueStruct!)
 }
-}, callerContext: "ChannelMonitor::transactions_confirmed")
+}, callerContext: "ChannelMonitor::transactions_confirmed", deallocate: false)
 						
 						.map { (cOpaqueStruct) in
 							TransactionOutputs(pointer: cOpaqueStruct)
@@ -225,7 +225,7 @@ ChannelMonitor_transaction_unconfirmed(this_argPointer, txidPointer, broadcaster
 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.activate().cOpaqueStruct!, fee_estimator.activate().cOpaqueStruct!, logger.activate().cOpaqueStruct!)
 }
-}, callerContext: "ChannelMonitor::best_block_updated")
+}, callerContext: "ChannelMonitor::best_block_updated", deallocate: false)
 						
 						.map { (cOpaqueStruct) in
 							TransactionOutputs(pointer: cOpaqueStruct)
@@ -251,7 +251,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)
-}, callerContext: "ChannelMonitor::get_claimable_balances")
+}, callerContext: "ChannelMonitor::get_claimable_balances", deallocate: false)
 						
 						.map { (cOpaqueStruct) in
 							Balance(pointer: cOpaqueStruct)
diff --git a/ci/LDKSwift/Sources/LDKSwift/bindings/structs/CommitmentUpdate.swift b/ci/LDKSwift/Sources/LDKSwift/bindings/structs/CommitmentUpdate.swift
@@ -91,7 +91,7 @@ extension Bindings {
 			
 			return Bindings.LDKCVec_UpdateAddHTLCZ_to_array(nativeType: withUnsafePointer(to: self.cOpaqueStruct!) { (this_ptrPointer: UnsafePointer<LDKCommitmentUpdate>) in
 CommitmentUpdate_get_update_add_htlcs(this_ptrPointer)
-}, callerContext: "CommitmentUpdate::get_update_add_htlcs")
+}, callerContext: "CommitmentUpdate::get_update_add_htlcs", deallocate: false)
 						
 						.map { (cOpaqueStruct) in
 							UpdateAddHTLC(pointer: cOpaqueStruct)
@@ -126,7 +126,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)
-}, callerContext: "CommitmentUpdate::get_update_fulfill_htlcs")
+}, callerContext: "CommitmentUpdate::get_update_fulfill_htlcs", deallocate: false)
 						
 						.map { (cOpaqueStruct) in
 							UpdateFulfillHTLC(pointer: cOpaqueStruct)
@@ -161,7 +161,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)
-}, callerContext: "CommitmentUpdate::get_update_fail_htlcs")
+}, callerContext: "CommitmentUpdate::get_update_fail_htlcs", deallocate: false)
 						
 						.map { (cOpaqueStruct) in
 							UpdateFailHTLC(pointer: cOpaqueStruct)
@@ -196,7 +196,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)
-}, callerContext: "CommitmentUpdate::get_update_fail_malformed_htlcs")
+}, callerContext: "CommitmentUpdate::get_update_fail_malformed_htlcs", deallocate: false)
 						
 						.map { (cOpaqueStruct) in
 							UpdateFailMalformedHTLC(pointer: cOpaqueStruct)
diff --git a/ci/LDKSwift/Sources/LDKSwift/bindings/structs/Invoice.swift b/ci/LDKSwift/Sources/LDKSwift/bindings/structs/Invoice.swift
@@ -162,7 +162,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)
-}, callerContext: "Invoice::private_routes")
+}, callerContext: "Invoice::private_routes", deallocate: false)
 						
 						.map { (cOpaqueStruct) in
 							PrivateRoute(pointer: cOpaqueStruct)
@@ -174,7 +174,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)
-}, callerContext: "Invoice::route_hints")
+}, callerContext: "Invoice::route_hints", deallocate: false)
 						
 						.map { (cOpaqueStruct) in
 							RouteHint(pointer: cOpaqueStruct)
diff --git a/ci/LDKSwift/Sources/LDKSwift/bindings/structs/NodeAnnouncementInfo.swift b/ci/LDKSwift/Sources/LDKSwift/bindings/structs/NodeAnnouncementInfo.swift
@@ -121,7 +121,7 @@ NodeAnnouncementInfo_get_alias(this_ptrPointer)
 			
 			return Bindings.LDKCVec_NetAddressZ_to_array(nativeType: withUnsafePointer(to: self.cOpaqueStruct!) { (this_ptrPointer: UnsafePointer<LDKNodeAnnouncementInfo>) in
 NodeAnnouncementInfo_get_addresses(this_ptrPointer)
-}, callerContext: "NodeAnnouncementInfo::get_addresses")
+}, callerContext: "NodeAnnouncementInfo::get_addresses", deallocate: false)
 						
 						.map { (cOpaqueStruct) in
 							NetAddress(pointer: cOpaqueStruct)
diff --git a/ci/LDKSwift/Sources/LDKSwift/bindings/structs/PaymentParameters.swift b/ci/LDKSwift/Sources/LDKSwift/bindings/structs/PaymentParameters.swift
@@ -77,7 +77,7 @@ PaymentParameters_get_features(this_ptrPointer)
 			
 			return Bindings.LDKCVec_RouteHintZ_to_array(nativeType: withUnsafePointer(to: self.cOpaqueStruct!) { (this_ptrPointer: UnsafePointer<LDKPaymentParameters>) in
 PaymentParameters_get_route_hints(this_ptrPointer)
-}, callerContext: "PaymentParameters::get_route_hints")
+}, callerContext: "PaymentParameters::get_route_hints", deallocate: false)
 						
 						.map { (cOpaqueStruct) in
 							RouteHint(pointer: cOpaqueStruct)
diff --git a/ci/LDKSwift/Sources/LDKSwift/bindings/structs/PhantomRouteHints.swift b/ci/LDKSwift/Sources/LDKSwift/bindings/structs/PhantomRouteHints.swift
@@ -61,7 +61,7 @@ extension Bindings {
 			
 			return Bindings.LDKCVec_ChannelDetailsZ_to_array(nativeType: withUnsafePointer(to: self.cOpaqueStruct!) { (this_ptrPointer: UnsafePointer<LDKPhantomRouteHints>) in
 PhantomRouteHints_get_channels(this_ptrPointer)
-}, callerContext: "PhantomRouteHints::get_channels")
+}, callerContext: "PhantomRouteHints::get_channels", deallocate: false)
 						
 						.map { (cOpaqueStruct) in
 							ChannelDetails(pointer: cOpaqueStruct)
diff --git a/ci/LDKSwift/Sources/LDKSwift/bindings/structs/RawInvoice.swift b/ci/LDKSwift/Sources/LDKSwift/bindings/structs/RawInvoice.swift
@@ -146,7 +146,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)
-}, callerContext: "RawInvoice::private_routes")
+}, callerContext: "RawInvoice::private_routes", deallocate: false)
 						
 						.map { (cOpaqueStruct) in
 							PrivateRoute(pointer: cOpaqueStruct)
diff --git a/ci/LDKSwift/Sources/LDKSwift/bindings/structs/ReadOnlyNetworkGraph.swift b/ci/LDKSwift/Sources/LDKSwift/bindings/structs/ReadOnlyNetworkGraph.swift
@@ -61,7 +61,7 @@ ReadOnlyNetworkGraph_node(this_argPointer, node_idPointer)
 			
 			return Bindings.LDKCVec_NodeIdZ_to_array(nativeType: withUnsafePointer(to: self.cOpaqueStruct!) { (this_argPointer: UnsafePointer<LDKReadOnlyNetworkGraph>) in
 ReadOnlyNetworkGraph_list_nodes(this_argPointer)
-}, callerContext: "ReadOnlyNetworkGraph::list_nodes")
+}, callerContext: "ReadOnlyNetworkGraph::list_nodes", deallocate: false)
 						
 						.map { (cOpaqueStruct) in
 							NodeId(pointer: cOpaqueStruct)
diff --git a/ci/LDKSwift/Sources/LDKSwift/bindings/structs/Route.swift b/ci/LDKSwift/Sources/LDKSwift/bindings/structs/Route.swift
@@ -62,7 +62,7 @@ extension Bindings {
 			
 			return Bindings.LDKCVec_CVec_RouteHopZZ_to_array(nativeType: withUnsafePointer(to: self.cOpaqueStruct!) { (this_ptrPointer: UnsafePointer<LDKRoute>) in
 Route_get_paths(this_ptrPointer)
-}, callerContext: "Route::get_paths")
+}, callerContext: "Route::get_paths", deallocate: false)
 						.map { (cOpaqueStruct) in
 						cOpaqueStruct
 						.map { (cOpaqueStruct) in
diff --git a/ci/LDKSwift/Sources/LDKSwift/bindings/structs/RouteHint.swift b/ci/LDKSwift/Sources/LDKSwift/bindings/structs/RouteHint.swift
@@ -61,7 +61,7 @@ extension Bindings {
 			
 			return Bindings.LDKCVec_RouteHintHopZ_to_array(nativeType: withUnsafePointer(to: self.cOpaqueStruct!) { (this_ptrPointer: UnsafePointer<LDKRouteHint>) in
 RouteHint_get_a(this_ptrPointer)
-}, callerContext: "RouteHint::get_a")
+}, callerContext: "RouteHint::get_a", deallocate: false)
 						
 						.map { (cOpaqueStruct) in
 							RouteHintHop(pointer: cOpaqueStruct)
diff --git a/ci/LDKSwift/Sources/LDKSwift/bindings/structs/UnsignedNodeAnnouncement.swift b/ci/LDKSwift/Sources/LDKSwift/bindings/structs/UnsignedNodeAnnouncement.swift
@@ -113,7 +113,7 @@ UnsignedNodeAnnouncement_get_alias(this_ptrPointer)
 			
 			return Bindings.LDKCVec_NetAddressZ_to_array(nativeType: withUnsafePointer(to: self.cOpaqueStruct!) { (this_ptrPointer: UnsafePointer<LDKUnsignedNodeAnnouncement>) in
 UnsignedNodeAnnouncement_get_addresses(this_ptrPointer)
-}, callerContext: "UnsignedNodeAnnouncement::get_addresses")
+}, callerContext: "UnsignedNodeAnnouncement::get_addresses", deallocate: false)
 						
 						.map { (cOpaqueStruct) in
 							NetAddress(pointer: cOpaqueStruct)
diff --git a/src/conversion_helper.py b/src/conversion_helper.py
@@ -554,6 +554,8 @@ def prepare_return_value(cls, return_type, is_clone_method=False, is_trait_insta
 				'''
 				else:
 
+					return_suffix = f', callerContext: "{context_string}", deallocate: false)'
+
 					map_prefix = f'''.map {{ (cOpaqueStruct) in
 						cOpaqueStruct''' * (wrapper_depth-1)
 

Original file line number	Diff line number	Diff line change
`@@ -6949,7 +6949,7 @@ withUnsafePointer(to: Bindings.array_to_tuple32(array: random_seed_bytes)) { (ra`
`6949`	`6949`	`*/`
`6950`	`6950`
`6951`	`6951`	`public class func get_ldk_swift_bindings_version() -> String {`
`6952`		`- return "999dff8638d6c9595c4a0fd8ed416be234374d51"`
	`6952`	`+ return "3f2c15ddca88239c3ddc57c1e4cf63a02dca5492"`
`6953`	`6953`	`}`
`6954`	`6954`
`6955`	`6955`	`}`