fix owned==true premature deallocation and make this_arg use instance values

Author: arik-so

bindings/LDK/Bindings.swift

@@ -10,11 +10,11 @@ public class AcceptChannel {
 
     /* STRUCT_METHODS_START */
 
-    public func get_temporary_channel_id() -> (UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8) {
+    public func get_temporary_channel_id() -> [UInt8] {
 
-        return withUnsafePointer(to: self.cOpaqueStruct!) { (this_ptrPointer: UnsafePointer<LDKAcceptChannel>) in
+        return Bindings.tuple32_to_array(nativeType: withUnsafePointer(to: self.cOpaqueStruct!) { (this_ptrPointer: UnsafePointer<LDKAcceptChannel>) in
 AcceptChannel_get_temporary_channel_id(this_ptrPointer)
-}.pointee;
+}.pointee);
     }
 
     public func set_temporary_channel_id(val: [UInt8]) -> Void {
@@ -241,9 +241,13 @@ AcceptChannel_write(objPointer)
 
 
 	deinit {
+					if self.cOpaqueStruct?.is_owned == false {
+
 
 
 		AcceptChannel_free(self.cOpaqueStruct!)
+					
+}
 
 	}
 

bindings/LDK/structs/AcceptChannel.swift

@@ -15,11 +15,11 @@ public class AnnouncementSignatures {
 
     /* STRUCT_METHODS_START */
 
-    public func get_channel_id() -> (UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8) {
+    public func get_channel_id() -> [UInt8] {
 
-        return withUnsafePointer(to: self.cOpaqueStruct!) { (this_ptrPointer: UnsafePointer<LDKAnnouncementSignatures>) in
+        return Bindings.tuple32_to_array(nativeType: withUnsafePointer(to: self.cOpaqueStruct!) { (this_ptrPointer: UnsafePointer<LDKAnnouncementSignatures>) in
 AnnouncementSignatures_get_channel_id(this_ptrPointer)
-}.pointee;
+}.pointee);
     }
 
     public func set_channel_id(val: [UInt8]) -> Void {
@@ -96,9 +96,13 @@ AnnouncementSignatures_write(objPointer)
 
 
 	deinit {
+					if self.cOpaqueStruct?.is_owned == false {
+
 
 
 		AnnouncementSignatures_free(self.cOpaqueStruct!)
+					
+}
 
 	}
 

bindings/LDK/structs/AnnouncementSignatures.swift

@@ -22,25 +22,29 @@ BestBlock(pointer: BestBlock_clone(origPointer))
 };
     }
 
-    public func block_hash(this_arg: BestBlock) -> [UInt8] {
+    public func block_hash() -> [UInt8] {
 
-        return Bindings.LDKThirtyTwoBytes_to_array(nativeType: withUnsafePointer(to: this_arg.cOpaqueStruct!) { (this_argPointer: UnsafePointer<LDKBestBlock>) in
+        return Bindings.LDKThirtyTwoBytes_to_array(nativeType: withUnsafePointer(to: self.cOpaqueStruct!) { (this_argPointer: UnsafePointer<LDKBestBlock>) in
 BestBlock_block_hash(this_argPointer)
 });
     }
 
-    public func height(this_arg: BestBlock) -> UInt32 {
+    public func height() -> UInt32 {
 
-        return withUnsafePointer(to: this_arg.cOpaqueStruct!) { (this_argPointer: UnsafePointer<LDKBestBlock>) in
+        return withUnsafePointer(to: self.cOpaqueStruct!) { (this_argPointer: UnsafePointer<LDKBestBlock>) in
 BestBlock_height(this_argPointer)
 };
     }
 
 
 	deinit {
+					if self.cOpaqueStruct?.is_owned == false {
+
 
 
 		BestBlock_free(self.cOpaqueStruct!)
+					
+}
 
 	}
 

bindings/LDK/structs/BestBlock.swift

@@ -30,11 +30,11 @@ BuiltCommitmentTransaction_get_transaction(this_ptrPointer)
         return BuiltCommitmentTransaction_set_transaction(this_ptrPointer, Bindings.new_LDKTransaction(array: val));
     }
 
-    public func get_txid() -> (UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8) {
+    public func get_txid() -> [UInt8] {
 
-        return withUnsafePointer(to: self.cOpaqueStruct!) { (this_ptrPointer: UnsafePointer<LDKBuiltCommitmentTransaction>) in
+        return Bindings.tuple32_to_array(nativeType: withUnsafePointer(to: self.cOpaqueStruct!) { (this_ptrPointer: UnsafePointer<LDKBuiltCommitmentTransaction>) in
 BuiltCommitmentTransaction_get_txid(this_ptrPointer)
-}.pointee;
+}.pointee);
     }
 
     public func set_txid(val: [UInt8]) -> Void {
@@ -64,16 +64,16 @@ BuiltCommitmentTransaction_write(objPointer)
         return Result_BuiltCommitmentTransactionDecodeErrorZ(pointer: BuiltCommitmentTransaction_read(Bindings.new_LDKu8slice(array: ser)));
     }
 
-    public func get_sighash_all(this_arg: BuiltCommitmentTransaction, funding_redeemscript: [UInt8], channel_value_satoshis: UInt64) -> [UInt8] {
+    public func get_sighash_all(funding_redeemscript: [UInt8], channel_value_satoshis: UInt64) -> [UInt8] {
 
-        return Bindings.LDKThirtyTwoBytes_to_array(nativeType: withUnsafePointer(to: this_arg.cOpaqueStruct!) { (this_argPointer: UnsafePointer<LDKBuiltCommitmentTransaction>) in
+        return Bindings.LDKThirtyTwoBytes_to_array(nativeType: withUnsafePointer(to: self.cOpaqueStruct!) { (this_argPointer: UnsafePointer<LDKBuiltCommitmentTransaction>) in
 BuiltCommitmentTransaction_get_sighash_all(this_argPointer, Bindings.new_LDKu8slice(array: funding_redeemscript), channel_value_satoshis)
 });
     }
 
-    public func sign(this_arg: BuiltCommitmentTransaction, funding_key: [UInt8], funding_redeemscript: [UInt8], channel_value_satoshis: UInt64) -> [UInt8] {
+    public func sign(funding_key: [UInt8], funding_redeemscript: [UInt8], channel_value_satoshis: UInt64) -> [UInt8] {
 
-        return Bindings.LDKSignature_to_array(nativeType: withUnsafePointer(to: this_arg.cOpaqueStruct!) { (this_argPointer: UnsafePointer<LDKBuiltCommitmentTransaction>) in
+        return Bindings.LDKSignature_to_array(nativeType: withUnsafePointer(to: self.cOpaqueStruct!) { (this_argPointer: UnsafePointer<LDKBuiltCommitmentTransaction>) in
 withUnsafePointer(to: Bindings.array_to_tuple32(array: funding_key)) { (funding_keyPointer: 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)>) in
 BuiltCommitmentTransaction_sign(this_argPointer, funding_keyPointer, Bindings.new_LDKu8slice(array: funding_redeemscript), channel_value_satoshis)
 }
@@ -82,9 +82,13 @@ BuiltCommitmentTransaction_sign(this_argPointer, funding_keyPointer, Bindings.ne
 
 
 	deinit {
+					if self.cOpaqueStruct?.is_owned == false {
+
 
 
 		BuiltCommitmentTransaction_free(self.cOpaqueStruct!)
+					
+}
 
 	}
 

bindings/LDK/structs/BuiltCommitmentTransaction.swift

@@ -18,39 +18,43 @@ public class ChainMonitor {
 
     /* STRUCT_METHODS_START */
 
-    public func as_Listen(this_arg: ChainMonitor) -> Listen {
+    public func as_Listen() -> Listen {
 
-        return Listen(pointer: withUnsafePointer(to: this_arg.cOpaqueStruct!) { (this_argPointer: UnsafePointer<LDKChainMonitor>) in
+        return Listen(pointer: withUnsafePointer(to: self.cOpaqueStruct!) { (this_argPointer: UnsafePointer<LDKChainMonitor>) in
 ChainMonitor_as_Listen(this_argPointer)
 });
     }
 
-    public func as_Confirm(this_arg: ChainMonitor) -> Confirm {
+    public func as_Confirm() -> Confirm {
 
-        return Confirm(pointer: withUnsafePointer(to: this_arg.cOpaqueStruct!) { (this_argPointer: UnsafePointer<LDKChainMonitor>) in
+        return Confirm(pointer: withUnsafePointer(to: self.cOpaqueStruct!) { (this_argPointer: UnsafePointer<LDKChainMonitor>) in
 ChainMonitor_as_Confirm(this_argPointer)
 });
     }
 
-    public func as_Watch(this_arg: ChainMonitor) -> Watch {
+    public func as_Watch() -> Watch {
 
-        return Watch(pointer: withUnsafePointer(to: this_arg.cOpaqueStruct!) { (this_argPointer: UnsafePointer<LDKChainMonitor>) in
+        return Watch(pointer: withUnsafePointer(to: self.cOpaqueStruct!) { (this_argPointer: UnsafePointer<LDKChainMonitor>) in
 ChainMonitor_as_Watch(this_argPointer)
 });
     }
 
-    public func as_EventsProvider(this_arg: ChainMonitor) -> EventsProvider {
+    public func as_EventsProvider() -> EventsProvider {
 
-        return EventsProvider(pointer: withUnsafePointer(to: this_arg.cOpaqueStruct!) { (this_argPointer: UnsafePointer<LDKChainMonitor>) in
+        return EventsProvider(pointer: withUnsafePointer(to: self.cOpaqueStruct!) { (this_argPointer: UnsafePointer<LDKChainMonitor>) in
 ChainMonitor_as_EventsProvider(this_argPointer)
 });
     }
 
 
 	deinit {
+					if self.cOpaqueStruct?.is_owned == false {
+
 
 
 		ChainMonitor_free(self.cOpaqueStruct!)
+					
+}
 
 	}
 

bindings/LDK/structs/ChainMonitor.swift

@@ -47,9 +47,13 @@ ChainParameters_get_best_block(this_ptrPointer)
 
 
 	deinit {
+					if self.cOpaqueStruct?.is_owned == false {
+
 
 
 		ChainParameters_free(self.cOpaqueStruct!)
+					
+}
 
 	}
 

bindings/LDK/structs/ChainParameters.swift

@@ -111,9 +111,13 @@ ChannelAnnouncement_write(objPointer)
 
 
 	deinit {
+					if self.cOpaqueStruct?.is_owned == false {
+
 
 
 		ChannelAnnouncement_free(self.cOpaqueStruct!)
+					
+}
 
 	}
 

bindings/LDK/structs/ChannelAnnouncement.swift

@@ -96,9 +96,13 @@ ChannelConfig_write(objPointer)
 
 
 	deinit {
+					if self.cOpaqueStruct?.is_owned == false {
+
 
 
 		ChannelConfig_free(self.cOpaqueStruct!)
+					
+}
 
 	}
 

bindings/LDK/structs/ChannelConfig.swift

@@ -10,11 +10,11 @@ public class ChannelDetails {
 
     /* STRUCT_METHODS_START */
 
-    public func get_channel_id() -> (UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8,UInt8) {
+    public func get_channel_id() -> [UInt8] {
 
-        return withUnsafePointer(to: self.cOpaqueStruct!) { (this_ptrPointer: UnsafePointer<LDKChannelDetails>) in
+        return Bindings.tuple32_to_array(nativeType: withUnsafePointer(to: self.cOpaqueStruct!) { (this_ptrPointer: UnsafePointer<LDKChannelDetails>) in
 ChannelDetails_get_channel_id(this_ptrPointer)
-}.pointee;
+}.pointee);
     }
 
     public func set_channel_id(val: [UInt8]) -> Void {
@@ -154,9 +154,13 @@ ChannelDetails(pointer: ChannelDetails_clone(origPointer))
 
 
 	deinit {
+					if self.cOpaqueStruct?.is_owned == false {
+
 
 
 		ChannelDetails_free(self.cOpaqueStruct!)
+					
+}
 
 	}