Merge pull request #81 from arik-so/2022-10-v112

Prepare version 0.0.112

Author: arik-so

.github/actions/install-dependencies/action.yml

@@ -22,8 +22,8 @@ runs:
             run: |
                 echo `pwd`
                 mkdir -p ${{ inputs.destination }}/bin
-                git clone --branch 2022-09-111-java-bindings https://github.com/TheBlueMatt/rust-lightning ${{ inputs.destination }}/rust-lightning
-                git clone --branch v0.0.111.0 https://github.com/lightningdevkit/ldk-c-bindings ${{ inputs.destination }}/ldk-c-bindings
+                git clone --branch 2022-10-112-java-bindings https://github.com/TheBlueMatt/rust-lightning ${{ inputs.destination }}/rust-lightning
+                git clone --branch v0.0.112.0 https://github.com/lightningdevkit/ldk-c-bindings ${{ inputs.destination }}/ldk-c-bindings
         -   name: Install Rust, required targets
             if: ${{ inputs.configureRustNightly == 'true' }}
             shell: bash

README.md

@@ -36,13 +36,13 @@ In order to generate these bindings from scratch, you will need to clone two dep
 **[rust-lightning](https://github.com/lightningdevkit/rust-lightning)**, (a specific branch built for bindings compatibility):
 
 ```shell
-git clone --branch 2022-09-111-java-bindings https://github.com/TheBlueMatt/rust-lightning /path/to/rust-lightning
+git clone --branch 2022-10-112-java-bindings https://github.com/TheBlueMatt/rust-lightning /path/to/rust-lightning
 ```
 
 **[ldk-c-bindings](https://github.com/lightningdevkit/ldk-c-bindings)**:
 
 ```shell
-git clone --branch v0.0.111.0 https://github.com/lightningdevkit/ldk-c-bindings /path/to/ldk-c-bindings
+git clone --branch v0.0.112.0 https://github.com/lightningdevkit/ldk-c-bindings /path/to/ldk-c-bindings
 ```
 
 Take note of where you clone these directories, it's best you save the absolute path somewhere handy for the rest of the remaining steps.

ci/LDKSwift/Sources/LDKSwift/batteries/ChannelManagerConstructor.swift

@@ -133,7 +133,7 @@ public class ChannelManagerConstructor: NativeTypeWrapper {
         guard let nodeSecret = keys_interface.get_node_secret(recipient: LDKRecipient_Node).getValue() else {
             throw InvalidSerializedDataError.badNodeSecret
         }
-        let timestampSeconds = UInt64(NSDate().timeIntervalSince1970)
+        let timestampSeconds = UInt32(NSDate().timeIntervalSince1970)
         self.peerManager = PeerManager(message_handler: messageHandler.dangle(), our_node_secret: nodeSecret, current_time: timestampSeconds, ephemeral_random_data: random_data, logger: self.logger, custom_message_handler: IgnoringMessageHandler().as_CustomMessageHandler())
 
         if let filter = filter {
@@ -178,7 +178,7 @@ public class ChannelManagerConstructor: NativeTypeWrapper {
             messageHandler = MessageHandler(chan_handler_arg: channelManager.as_ChannelMessageHandler(), route_handler_arg: noCustomMessages.as_RoutingMessageHandler(), onion_message_handler_arg: noCustomMessages.as_OnionMessageHandler())
         }
         let nodeSecret = keys_interface.get_node_secret(recipient: LDKRecipient_Node).getValue()!
-        let timestampSeconds = UInt64(NSDate().timeIntervalSince1970)
+        let timestampSeconds = UInt32(NSDate().timeIntervalSince1970)
         self.peerManager = PeerManager(message_handler: messageHandler.dangle(), our_node_secret: nodeSecret, current_time: timestampSeconds, ephemeral_random_data: random_data, logger: logger, custom_message_handler: noCustomMessages.as_CustomMessageHandler())
 
 
@@ -213,8 +213,8 @@ public class ChannelManagerConstructor: NativeTypeWrapper {
             let outPoint = OutPoint(pointer: fundingTxo.cOpaqueStruct!.a).dangle()
             print("watching channel")
             let monitorWatchResult = chainMonitorWatch.watch_channel(funding_txo: outPoint, monitor: monitorClone)
-            if !monitorWatchResult.isOk() {
-                print("Some error occurred with a chainMonitorWatch.watch_channel call")
+            if monitorWatchResult != LDKChannelMonitorUpdateStatus_Completed {
+                print("Some error occurred with a chainMonitorWatch.watch_channel call: \(monitorWatchResult)")
             }
             monitorClone.cOpaqueStruct?.is_owned = true
         }

ci/LDKSwift/Sources/LDKSwift/bindings/Bindings.swift

@@ -5245,16 +5245,6 @@ public class Bindings {
 
 				CResult_TxOutAccessErrorZ_is_ok(oPointer)
 
-}
-			
-	}
-	public class func swift_CResult_NoneChannelMonitorUpdateErrZ_is_ok(o: Result_NoneChannelMonitorUpdateErrZ) -> Bool {
-		
-				
-				return withUnsafePointer(to: o.cOpaqueStruct!) { (oPointer: UnsafePointer<LDKCResult_NoneChannelMonitorUpdateErrZ>) in
-
-				CResult_NoneChannelMonitorUpdateErrZ_is_ok(oPointer)
-				
 }
 
 	}
@@ -5505,6 +5495,16 @@ public class Bindings {
 
 				CResult_SecretKeyNoneZ_is_ok(oPointer)
 
+}
+			
+	}
+	public class func swift_CResult_PublicKeyNoneZ_is_ok(o: Result_PublicKeyNoneZ) -> Bool {
+		
+				
+				return withUnsafePointer(to: o.cOpaqueStruct!) { (oPointer: UnsafePointer<LDKCResult_PublicKeyNoneZ>) in
+
+				CResult_PublicKeyNoneZ_is_ok(oPointer)
+				
 }
 
 	}
@@ -5915,6 +5915,16 @@ public class Bindings {
 
 				CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_is_ok(oPointer)
 
+}
+			
+	}
+	public class func swift_CResult_COption_CustomOnionMessageContentsZDecodeErrorZ_is_ok(o: Result_COption_CustomOnionMessageContentsZDecodeErrorZ) -> Bool {
+		
+				
+				return withUnsafePointer(to: o.cOpaqueStruct!) { (oPointer: UnsafePointer<LDKCResult_COption_CustomOnionMessageContentsZDecodeErrorZ>) in
+
+				CResult_COption_CustomOnionMessageContentsZDecodeErrorZ_is_ok(oPointer)
+				
 }
 
 	}
@@ -6411,6 +6421,30 @@ public class Bindings {
 
 }
 
+	}
+	public class func swift_provided_node_features() -> NodeFeatures {
+		
+				
+				return 
+				NodeFeatures(pointer: provided_node_features())
+				
+			
+	}
+	public class func swift_provided_channel_features() -> ChannelFeatures {
+		
+				
+				return 
+				ChannelFeatures(pointer: provided_channel_features())
+				
+			
+	}
+	public class func swift_provided_init_features() -> InitFeatures {
+		
+				
+				return 
+				InitFeatures(pointer: provided_init_features())
+				
+			
 	}
 	#warning("This method passes non-cloneable objects by owned value. Here be dragons.")
 @available(*, deprecated, message: "This method passes non-cloneable objects by owned value. Here be dragons.")
@@ -6634,7 +6668,7 @@ withUnsafePointer(to: Bindings.array_to_tuple32(array: random_seed_bytes)) { (ra
 }
 
 	}
-	public class func swift_create_phantom_invoice(amt_msat: Option_u64Z, payment_hash: [UInt8], description: String, invoice_expiry_delta_secs: UInt32, phantom_route_hints: [PhantomRouteHints], keys_manager: KeysInterface, network: LDKCurrency) -> Result_InvoiceSignOrCreationErrorZ {
+	public class func swift_create_phantom_invoice(amt_msat: Option_u64Z, payment_hash: [UInt8], description: String, invoice_expiry_delta_secs: UInt32, phantom_route_hints: [PhantomRouteHints], keys_manager: KeysInterface, logger: Logger, network: LDKCurrency) -> Result_InvoiceSignOrCreationErrorZ {
 
 
 							let phantom_route_hintsUnwrapped = phantom_route_hints.map { (phantom_route_hintsCurrentValue) in
@@ -6648,11 +6682,11 @@ withUnsafePointer(to: Bindings.array_to_tuple32(array: random_seed_bytes)) { (ra
 						}
 
 				return 
-				Result_InvoiceSignOrCreationErrorZ(pointer: create_phantom_invoice(amt_msat.danglingClone().cOpaqueStruct!, Bindings.new_LDKThirtyTwoBytes(array: payment_hash), Bindings.new_LDKStr(string: description, chars_is_owned: true), invoice_expiry_delta_secs, phantom_route_hintsWrapper.dangle().cOpaqueStruct!, keys_manager.activate().cOpaqueStruct!, network))
+				Result_InvoiceSignOrCreationErrorZ(pointer: create_phantom_invoice(amt_msat.danglingClone().cOpaqueStruct!, Bindings.new_LDKThirtyTwoBytes(array: payment_hash), Bindings.new_LDKStr(string: description, chars_is_owned: true), invoice_expiry_delta_secs, phantom_route_hintsWrapper.dangle().cOpaqueStruct!, keys_manager.activate().cOpaqueStruct!, logger.activate().cOpaqueStruct!, network))
 
 
 	}
-	public class func swift_create_phantom_invoice_with_description_hash(amt_msat: Option_u64Z, payment_hash: [UInt8], invoice_expiry_delta_secs: UInt32, description_hash: Sha256, phantom_route_hints: [PhantomRouteHints], keys_manager: KeysInterface, network: LDKCurrency) -> Result_InvoiceSignOrCreationErrorZ {
+	public class func swift_create_phantom_invoice_with_description_hash(amt_msat: Option_u64Z, payment_hash: [UInt8], invoice_expiry_delta_secs: UInt32, description_hash: Sha256, phantom_route_hints: [PhantomRouteHints], keys_manager: KeysInterface, logger: Logger, network: LDKCurrency) -> Result_InvoiceSignOrCreationErrorZ {
 
 
 							let phantom_route_hintsUnwrapped = phantom_route_hints.map { (phantom_route_hintsCurrentValue) in
@@ -6666,46 +6700,46 @@ withUnsafePointer(to: Bindings.array_to_tuple32(array: random_seed_bytes)) { (ra
 						}
 
 				return 
-				Result_InvoiceSignOrCreationErrorZ(pointer: create_phantom_invoice_with_description_hash(amt_msat.danglingClone().cOpaqueStruct!, Bindings.new_LDKThirtyTwoBytes(array: payment_hash), invoice_expiry_delta_secs, description_hash.danglingClone().cOpaqueStruct!, phantom_route_hintsWrapper.dangle().cOpaqueStruct!, keys_manager.activate().cOpaqueStruct!, network))
+				Result_InvoiceSignOrCreationErrorZ(pointer: create_phantom_invoice_with_description_hash(amt_msat.danglingClone().cOpaqueStruct!, Bindings.new_LDKThirtyTwoBytes(array: payment_hash), invoice_expiry_delta_secs, description_hash.danglingClone().cOpaqueStruct!, phantom_route_hintsWrapper.dangle().cOpaqueStruct!, keys_manager.activate().cOpaqueStruct!, logger.activate().cOpaqueStruct!, network))
 
 
 	}
-	public class func swift_create_invoice_from_channelmanager(channelmanager: ChannelManager, keys_manager: KeysInterface, network: LDKCurrency, amt_msat: Option_u64Z, description: String, invoice_expiry_delta_secs: UInt32) -> Result_InvoiceSignOrCreationErrorZ {
+	public class func swift_create_invoice_from_channelmanager(channelmanager: ChannelManager, keys_manager: KeysInterface, logger: Logger, network: LDKCurrency, amt_msat: Option_u64Z, description: String, invoice_expiry_delta_secs: UInt32) -> Result_InvoiceSignOrCreationErrorZ {
 
 
 				return withUnsafePointer(to: channelmanager.cOpaqueStruct!) { (channelmanagerPointer: UnsafePointer<LDKChannelManager>) in
 
-				Result_InvoiceSignOrCreationErrorZ(pointer: create_invoice_from_channelmanager(channelmanagerPointer, keys_manager.activate().cOpaqueStruct!, network, amt_msat.danglingClone().cOpaqueStruct!, Bindings.new_LDKStr(string: description, chars_is_owned: true), invoice_expiry_delta_secs))
+				Result_InvoiceSignOrCreationErrorZ(pointer: create_invoice_from_channelmanager(channelmanagerPointer, keys_manager.activate().cOpaqueStruct!, logger.activate().cOpaqueStruct!, network, amt_msat.danglingClone().cOpaqueStruct!, Bindings.new_LDKStr(string: description, chars_is_owned: true), invoice_expiry_delta_secs))
 
 }
 
 	}
-	public class func swift_create_invoice_from_channelmanager_with_description_hash(channelmanager: ChannelManager, keys_manager: KeysInterface, network: LDKCurrency, amt_msat: Option_u64Z, description_hash: Sha256, invoice_expiry_delta_secs: UInt32) -> Result_InvoiceSignOrCreationErrorZ {
+	public class func swift_create_invoice_from_channelmanager_with_description_hash(channelmanager: ChannelManager, keys_manager: KeysInterface, logger: Logger, network: LDKCurrency, amt_msat: Option_u64Z, description_hash: Sha256, invoice_expiry_delta_secs: UInt32) -> Result_InvoiceSignOrCreationErrorZ {
 
 
 				return withUnsafePointer(to: channelmanager.cOpaqueStruct!) { (channelmanagerPointer: UnsafePointer<LDKChannelManager>) in
 
-				Result_InvoiceSignOrCreationErrorZ(pointer: create_invoice_from_channelmanager_with_description_hash(channelmanagerPointer, keys_manager.activate().cOpaqueStruct!, network, amt_msat.danglingClone().cOpaqueStruct!, description_hash.danglingClone().cOpaqueStruct!, invoice_expiry_delta_secs))
+				Result_InvoiceSignOrCreationErrorZ(pointer: create_invoice_from_channelmanager_with_description_hash(channelmanagerPointer, keys_manager.activate().cOpaqueStruct!, logger.activate().cOpaqueStruct!, network, amt_msat.danglingClone().cOpaqueStruct!, description_hash.danglingClone().cOpaqueStruct!, invoice_expiry_delta_secs))
 
 }
 
 	}
-	public class func swift_create_invoice_from_channelmanager_with_description_hash_and_duration_since_epoch(channelmanager: ChannelManager, keys_manager: KeysInterface, network: LDKCurrency, amt_msat: Option_u64Z, description_hash: Sha256, duration_since_epoch: UInt64, invoice_expiry_delta_secs: UInt32) -> Result_InvoiceSignOrCreationErrorZ {
+	public class func swift_create_invoice_from_channelmanager_with_description_hash_and_duration_since_epoch(channelmanager: ChannelManager, keys_manager: KeysInterface, logger: Logger, network: LDKCurrency, amt_msat: Option_u64Z, description_hash: Sha256, duration_since_epoch: UInt64, invoice_expiry_delta_secs: UInt32) -> Result_InvoiceSignOrCreationErrorZ {
 
 
 				return withUnsafePointer(to: channelmanager.cOpaqueStruct!) { (channelmanagerPointer: UnsafePointer<LDKChannelManager>) in
 
-				Result_InvoiceSignOrCreationErrorZ(pointer: create_invoice_from_channelmanager_with_description_hash_and_duration_since_epoch(channelmanagerPointer, keys_manager.activate().cOpaqueStruct!, network, amt_msat.danglingClone().cOpaqueStruct!, description_hash.danglingClone().cOpaqueStruct!, duration_since_epoch, invoice_expiry_delta_secs))
+				Result_InvoiceSignOrCreationErrorZ(pointer: create_invoice_from_channelmanager_with_description_hash_and_duration_since_epoch(channelmanagerPointer, keys_manager.activate().cOpaqueStruct!, logger.activate().cOpaqueStruct!, network, amt_msat.danglingClone().cOpaqueStruct!, description_hash.danglingClone().cOpaqueStruct!, duration_since_epoch, invoice_expiry_delta_secs))
 
 }
 
 	}
-	public class func swift_create_invoice_from_channelmanager_and_duration_since_epoch(channelmanager: ChannelManager, keys_manager: KeysInterface, network: LDKCurrency, amt_msat: Option_u64Z, description: String, duration_since_epoch: UInt64, invoice_expiry_delta_secs: UInt32) -> Result_InvoiceSignOrCreationErrorZ {
+	public class func swift_create_invoice_from_channelmanager_and_duration_since_epoch(channelmanager: ChannelManager, keys_manager: KeysInterface, logger: Logger, network: LDKCurrency, amt_msat: Option_u64Z, description: String, duration_since_epoch: UInt64, invoice_expiry_delta_secs: UInt32) -> Result_InvoiceSignOrCreationErrorZ {
 
 
 				return withUnsafePointer(to: channelmanager.cOpaqueStruct!) { (channelmanagerPointer: UnsafePointer<LDKChannelManager>) in
 
-				Result_InvoiceSignOrCreationErrorZ(pointer: create_invoice_from_channelmanager_and_duration_since_epoch(channelmanagerPointer, keys_manager.activate().cOpaqueStruct!, network, amt_msat.danglingClone().cOpaqueStruct!, Bindings.new_LDKStr(string: description, chars_is_owned: true), duration_since_epoch, invoice_expiry_delta_secs))
+				Result_InvoiceSignOrCreationErrorZ(pointer: create_invoice_from_channelmanager_and_duration_since_epoch(channelmanagerPointer, keys_manager.activate().cOpaqueStruct!, logger.activate().cOpaqueStruct!, network, amt_msat.danglingClone().cOpaqueStruct!, Bindings.new_LDKStr(string: description, chars_is_owned: true), duration_since_epoch, invoice_expiry_delta_secs))
 
 }
 
@@ -6915,7 +6949,7 @@ withUnsafePointer(to: Bindings.array_to_tuple32(array: random_seed_bytes)) { (ra
 	*/
 
 	public class func get_ldk_swift_bindings_version() -> String {
-        return "a184e59437fe43f8e02f8e09c6a5a50745f4bf34"
+        return "3f2c15ddca88239c3ddc57c1e4cf63a02dca5492"
     }
 
 }

ci/LDKSwift/Sources/LDKSwift/bindings/options/APIError.swift

@@ -146,16 +146,25 @@ APIError_clone(origPointer)
 			return APIError(pointer: APIError_channel_unavailable(Bindings.new_LDKStr(string: err, chars_is_owned: true)));
 		}
 
-		public class func monitor_update_failed() -> APIError {
+		public class func monitor_update_in_progress() -> APIError {
 
-			return APIError(pointer: APIError_monitor_update_failed());
+			return APIError(pointer: APIError_monitor_update_in_progress());
 		}
 
 		public class func incompatible_shutdown_script(script: Bindings.ShutdownScript) -> APIError {
 
 			return APIError(pointer: APIError_incompatible_shutdown_script(script.danglingClone().cOpaqueStruct!));
 		}
 
+		public class func eq(a: Bindings.APIError, b: Bindings.APIError) -> Bool {
+			
+			return withUnsafePointer(to: a.cOpaqueStruct!) { (aPointer: UnsafePointer<LDKAPIError>) in
+withUnsafePointer(to: b.cOpaqueStruct!) { (bPointer: UnsafePointer<LDKAPIError>) in
+APIError_eq(aPointer, bPointer)
+}
+};
+		}
+
 		/* OPTION_METHODS_END */
 
 
@@ -282,7 +291,7 @@ APIError_clone(origPointer)
 
 
 					public func getScript() -> Bindings.ShutdownScript {
-						return Bindings.ShutdownScript(pointer: self.cOpaqueStruct!.script, anchor: self)
+						return Bindings.ShutdownScript(pointer: self.cOpaqueStruct!.script, anchor: self).dangle()
 					}
 
 

ci/LDKSwift/Sources/LDKSwift/bindings/options/ClosureReason.swift

@@ -139,6 +139,15 @@ ClosureReason_clone(origPointer)
 			return ClosureReason(pointer: ClosureReason_outdated_channel_manager());
 		}
 
+		public class func eq(a: Bindings.ClosureReason, b: Bindings.ClosureReason) -> Bool {
+			
+			return withUnsafePointer(to: a.cOpaqueStruct!) { (aPointer: UnsafePointer<LDKClosureReason>) in
+withUnsafePointer(to: b.cOpaqueStruct!) { (bPointer: UnsafePointer<LDKClosureReason>) in
+ClosureReason_eq(aPointer, bPointer)
+}
+};
+		}
+
 		public func write() -> [UInt8] {
 
 			return Bindings.LDKCVec_u8Z_to_array(nativeType: withUnsafePointer(to: self.cOpaqueStruct!) { (objPointer: UnsafePointer<LDKClosureReason>) in