feat: updated ios to ldk 0.0.125

Author: Jasonvdb

example/ios/Podfile.lock

@@ -316,7 +316,7 @@ PODS:
   - React-jsinspector (0.72.4)
   - React-logger (0.72.4):
     - glog
-  - react-native-ldk (0.0.154):
+  - react-native-ldk (0.0.155):
     - React
   - react-native-randombytes (3.6.1):
     - React-Core
@@ -621,7 +621,7 @@ SPEC CHECKSUMS:
   React-jsiexecutor: c7f826e40fa9cab5d37cab6130b1af237332b594
   React-jsinspector: aaed4cf551c4a1c98092436518c2d267b13a673f
   React-logger: da1ebe05ae06eb6db4b162202faeafac4b435e77
-  react-native-ldk: 6910154336e57be6702a33acad2191d39a3a214b
+  react-native-ldk: 9ea2f29a6f96cc55f839ee180caf8dc9e58cd6eb
   react-native-randombytes: 421f1c7d48c0af8dbcd471b0324393ebf8fe7846
   react-native-tcp-socket: c1b7297619616b4c9caae6889bcb0aba78086989
   React-NativeModulesApple: edb5ace14f73f4969df6e7b1f3e41bef0012740f

lib/ios/Classes/BackupClient.swift

@@ -23,7 +23,7 @@ class CustomKeysManager {
         self.witnessProgram = witnessProgram
         self.witnessProgramVersion = witnessProgramVersion
         self.signerProvider = CustomSignerProvider()
-        self.signerProvider.customKeysManager = self
+        signerProvider.customKeysManager = self
     }
 
     // We drop all occurences of `SpendableOutputDescriptor::StaticOutput` (since they will be
@@ -41,7 +41,7 @@ class CustomKeysManager {
 
         LdkEventEmitter.shared.send(withEvent: .native_log, body: "Spending \(onlyNonStatic.count) non static outputs")
 
-        let res = self.inner.asOutputSpender().spendSpendableOutputs(
+        let res = inner.asOutputSpender().spendSpendableOutputs(
             descriptors: onlyNonStatic,
             outputs: outputs,
             changeDestinationScript: changeDestinationScript,
@@ -63,7 +63,7 @@ class CustomSignerProvider: SignerProvider {
     override func getShutdownScriptpubkey() -> Bindings.Result_ShutdownScriptNoneZ {
         let res = ShutdownScript.newWitnessProgram(witnessProgram: .init(version: customKeysManager!.witnessProgramVersion, program: customKeysManager!.witnessProgram))
         if res.isOk() {
-            //To record which addresses should be watched for close channel funds
+            // To record which addresses should be watched for close channel funds
             LdkEventEmitter.shared.send(withEvent: .used_close_address, body: customKeysManager!.address)
             return Bindings.Result_ShutdownScriptNoneZ.initWithOk(o: res.getValue()!)
         }
@@ -76,7 +76,7 @@ class CustomSignerProvider: SignerProvider {
         return .initWithErr()
     }
 
-    override func deriveChannelSigner(channelValueSatoshis: UInt64, channelKeysId: [UInt8]) -> Bindings.WriteableEcdsaChannelSigner {
+    override func deriveChannelSigner(channelValueSatoshis: UInt64, channelKeysId: [UInt8]) -> Bindings.EcdsaChannelSigner {
         return customKeysManager!.inner.asSignerProvider().deriveChannelSigner(
             channelValueSatoshis: channelValueSatoshis,
             channelKeysId: channelKeysId
@@ -91,7 +91,7 @@ class CustomSignerProvider: SignerProvider {
         )
     }
 
-    override func readChanSigner(reader: [UInt8]) -> Bindings.Result_WriteableEcdsaChannelSignerDecodeErrorZ {
+    override func readChanSigner(reader: [UInt8]) -> Bindings.Result_EcdsaChannelSignerDecodeErrorZ {
         return customKeysManager!.inner.asSignerProvider().readChanSigner(reader: reader)
     }
 }

lib/ios/Classes/CustomKeysManager.swift

@@ -10,14 +10,16 @@ import LightningDevKit
 
 class LdkChannelManagerPersister: Persister, ExtendedChannelManagerPersister {
     // Custom function to manage any unlikely missing info from the event object
-    func handleEventError(_ event: Event) {
+    func handleEventError(_ event: Event) -> Result_NoneReplayEventZ {
         LdkEventEmitter.shared.send(
             withEvent: .native_log,
             body: "Error missing details for handle_event of type \(event.getValueType())"
         )
+
+        return .initWithErr(e: .init())
     }
 
-    func handleEvent(event: Event) {
+    func handleEvent(event: Event) -> Result_NoneReplayEventZ {
         // Follows ldk-sample event handling structure
         // https://github.com/lightningdevkit/ldk-sample/blob/c0a722430b8fbcb30310d64487a32aae839da3e8/src/main.rs#L600
         switch event.getValueType() {
@@ -35,7 +37,7 @@ class LdkChannelManagerPersister: Persister, ExtendedChannelManagerPersister {
                     "value_satoshis": fundingGeneration.getChannelValueSatoshis()
                 ]
             )
-            return
+            return .initWithOk()
         case .PaymentClaimable:
             guard let paymentClaimable = event.getValueAsPaymentClaimable() else {
                 return handleEventError(event)
@@ -62,7 +64,7 @@ class LdkChannelManagerPersister: Persister, ExtendedChannelManagerPersister {
 
             // Save to disk for TX history
             persistPaymentClaimed(body)
-            return
+            return .initWithOk()
         case .PaymentSent:
             guard let paymentSent = event.getValueAsPaymentSent() else {
                 return handleEventError(event)
@@ -84,7 +86,7 @@ class LdkChannelManagerPersister: Persister, ExtendedChannelManagerPersister {
 
             // Save to disk for tx history
             persistPaymentSent(body)
-            return
+            return .initWithOk()
         case .OpenChannelRequest:
             // Use if we ever manually accept inbound channels. Setting in initConfig.
             guard let openChannelRequest = event.getValueAsOpenChannelRequest() else {
@@ -102,7 +104,7 @@ class LdkChannelManagerPersister: Persister, ExtendedChannelManagerPersister {
                     "requires_anchors_zero_fee_htlc_tx": openChannelRequest.getChannelType().requiresAnchorsZeroFeeHtlcTx()
                 ] as [String: Any]
             )
-            return
+            return .initWithOk()
         case .PaymentPathSuccessful:
             guard let paymentPathSuccessful = event.getValueAsPaymentPathSuccessful() else {
                 return handleEventError(event)
@@ -119,7 +121,7 @@ class LdkChannelManagerPersister: Persister, ExtendedChannelManagerPersister {
                     "path_hops": paymentPathSuccessful.getPath().getHops().map { $0.asJson }
                 ] as [String: Any]
             )
-            return
+            return .initWithOk()
         case .PaymentPathFailed:
             guard let paymentPathFailed = event.getValueAsPaymentPathFailed() else {
                 return handleEventError(event)
@@ -147,14 +149,14 @@ class LdkChannelManagerPersister: Persister, ExtendedChannelManagerPersister {
                     "state": paymentPathFailed.getPaymentFailedPermanently() ? "failed" : "pending"
                 ]
             )
-            return
+            return .initWithOk()
         case .PaymentFailed:
             guard let paymentFailed = event.getValueAsPaymentFailed() else {
                 return handleEventError(event)
             }
 
             let paymentId = Data(paymentFailed.getPaymentId()).hexEncodedString()
-            let paymentHash = Data(paymentFailed.getPaymentHash()).hexEncodedString()
+            let paymentHash = Data(paymentFailed.getPaymentHash() ?? []).hexEncodedString()
 
             LdkEventEmitter.shared.send(
                 withEvent: .channel_manager_payment_failed,
@@ -174,10 +176,10 @@ class LdkChannelManagerPersister: Persister, ExtendedChannelManagerPersister {
                     "state": "failed"
                 ]
             )
-            return
+            return .initWithOk()
         case .PaymentForwarded:
             // Unused on mobile
-            return
+            return .initWithOk()
         case .PendingHTLCsForwardable:
             guard let pendingHtlcsForwardable = event.getValueAsPendingHtlcsForwardable() else {
                 return handleEventError(event)
@@ -189,7 +191,7 @@ class LdkChannelManagerPersister: Persister, ExtendedChannelManagerPersister {
                     "time_forwardable": pendingHtlcsForwardable.getTimeForwardable()
                 ]
             )
-            return
+            return .initWithOk()
         case .SpendableOutputs:
             guard let spendableOutputs = event.getValueAsSpendableOutputs() else {
                 return handleEventError(event)
@@ -201,7 +203,7 @@ class LdkChannelManagerPersister: Persister, ExtendedChannelManagerPersister {
                     "outputsSerialized": spendableOutputs.getOutputs().map { Data($0.write()).hexEncodedString() }
                 ]
             )
-            return
+            return .initWithOk()
         case .ChannelClosed:
             guard let channelClosed = event.getValueAsChannelClosed() else {
                 return handleEventError(event)
@@ -252,7 +254,7 @@ class LdkChannelManagerPersister: Persister, ExtendedChannelManagerPersister {
                 ]
             )
 
-            return
+            return .initWithOk()
         case .DiscardFunding:
             guard let discardFunding = event.getValueAsDiscardFunding() else {
                 return handleEventError(event)
@@ -263,10 +265,10 @@ class LdkChannelManagerPersister: Persister, ExtendedChannelManagerPersister {
                 withEvent: .channel_manager_discard_funding,
                 body: [
                     "channel_id": Data(discardFunding.getChannelId().getA() ?? []).hexEncodedString(),
-                    "tx": Data(discardFunding.getTransaction()).hexEncodedString()
+                    "tx": Data(discardFunding.getChannelId().getA() ?? []).hexEncodedString()
                 ]
             )
-            return
+            return .initWithOk()
         case .PaymentClaimed:
             guard let paymentClaimed = event.getValueAsPaymentClaimed() else {
                 return handleEventError(event)
@@ -293,13 +295,13 @@ class LdkChannelManagerPersister: Persister, ExtendedChannelManagerPersister {
 
             // Save to disk for TX history
             persistPaymentClaimed(body)
-            return
+            return .initWithOk()
         case .ChannelReady:
             LdkEventEmitter.shared.send(withEvent: .native_log, body: "Unused Persister event: ChannelReady")
-            return
+            return .initWithOk()
         case .ChannelPending:
             LdkEventEmitter.shared.send(withEvent: .native_log, body: "Unused Persister event: ChannelPending")
-            return
+            return .initWithOk()
         case .BumpTransaction:
             guard let bumpTransaction = event.getValueAsBumpTransaction() else {
                 return handleEventError(event)
@@ -315,29 +317,38 @@ class LdkChannelManagerPersister: Persister, ExtendedChannelManagerPersister {
                 ]
 
                 LdkEventEmitter.shared.send(withEvent: .lsp_log, body: body)
-                return
+                return .initWithOk()
             }
 
             LdkEventEmitter.shared.send(withEvent: .native_log, body: "BumpTransaction event not handled")
-            return
+            return .initWithOk()
         case .ProbeFailed:
             LdkEventEmitter.shared.send(withEvent: .native_log, body: "Unused Persister event: ProbeFailed")
-            return
+            return .initWithOk()
         case .ProbeSuccessful:
             LdkEventEmitter.shared.send(withEvent: .native_log, body: "Unused Persister event: ProbeSuccessful")
-            return
-        case .InvoiceRequestFailed:
-            LdkEventEmitter.shared.send(withEvent: .native_log, body: "Unused Persister event: InvoiceRequestFailed")
-            return
+            return .initWithOk()
         case .HTLCIntercepted:
             LdkEventEmitter.shared.send(withEvent: .native_log, body: "Unused Persister event: HTLCIntercepted")
-            return
+            return .initWithOk()
         case .HTLCHandlingFailed:
             LdkEventEmitter.shared.send(withEvent: .native_log, body: "Unused Persister event: HTLCHandlingFailed")
-            return
+            return .initWithOk()
         case .ConnectionNeeded:
             LdkEventEmitter.shared.send(withEvent: .native_log, body: "Unused Persister event: ConnectionNeeded")
-            return
+            return .initWithOk()
+        case .FundingTxBroadcastSafe:
+            LdkEventEmitter.shared.send(withEvent: .native_log, body: "Unused Persister event: FundingTxBroadcastSafe")
+            return .initWithOk()
+        case .InvoiceReceived:
+            LdkEventEmitter.shared.send(withEvent: .native_log, body: "Unused Persister event: InvoiceReceived")
+            return .initWithOk()
+        case .OnionMessageIntercepted:
+            LdkEventEmitter.shared.send(withEvent: .native_log, body: "Unused Persister event: OnionMessageIntercepted")
+            return .initWithOk()
+        case .OnionMessagePeerConnected:
+            LdkEventEmitter.shared.send(withEvent: .native_log, body: "Unused Persister event: OnionMessagePeerConnected")
+            return .initWithOk()
         }
     }
 

lib/ios/Classes/LdkChannelManagerPersister.swift

@@ -16,15 +16,29 @@ class LdkFeeEstimator: FeeEstimator {
     private var onChainSweep: UInt32 = 0
     private var minAllowedNonAnchorChannelRemoteFee: UInt32 = 0
     private var outputSpendingFee: UInt32 = 0
+    private var maximumFeeEstimate: UInt32 = 0
+    private var urgentOnChainSweep: UInt32 = 0
 
-    func update(anchorChannelFee: UInt32, nonAnchorChannelFee: UInt32, channelCloseMinimum: UInt32, minAllowedAnchorChannelRemoteFee: UInt32, onChainSweep: UInt32, minAllowedNonAnchorChannelRemoteFee: UInt32, outputSpendingFee: UInt32) {
+    func update(
+        anchorChannelFee: UInt32,
+        nonAnchorChannelFee: UInt32,
+        channelCloseMinimum: UInt32,
+        minAllowedAnchorChannelRemoteFee: UInt32,
+        onChainSweep: UInt32,
+        minAllowedNonAnchorChannelRemoteFee: UInt32,
+        outputSpendingFee: UInt32,
+        maximumFeeEstimate: UInt32,
+        urgentOnChainSweep: UInt32
+    ) {
         self.anchorChannelFee = anchorChannelFee
         self.nonAnchorChannelFee = nonAnchorChannelFee
         self.channelCloseMinimum = channelCloseMinimum
         self.minAllowedAnchorChannelRemoteFee = minAllowedAnchorChannelRemoteFee
         self.onChainSweep = onChainSweep
         self.minAllowedNonAnchorChannelRemoteFee = minAllowedNonAnchorChannelRemoteFee
         self.outputSpendingFee = outputSpendingFee
+        self.maximumFeeEstimate = maximumFeeEstimate
+        self.urgentOnChainSweep = urgentOnChainSweep
 
         LdkEventEmitter.shared.send(withEvent: .native_log, body: "Fee estimator updated")
     }
@@ -41,12 +55,14 @@ class LdkFeeEstimator: FeeEstimator {
             return channelCloseMinimum
         case .MinAllowedAnchorChannelRemoteFee:
             return minAllowedAnchorChannelRemoteFee
-        case .OnChainSweep:
-            return onChainSweep
         case .MinAllowedNonAnchorChannelRemoteFee:
             return minAllowedNonAnchorChannelRemoteFee
         case .OutputSpendingFee:
             return outputSpendingFee
+        case .MaximumFeeEstimate:
+            return maximumFeeEstimate
+        case .UrgentOnChainSweep:
+            return urgentOnChainSweep
         }
     }
 }

lib/ios/Classes/LdkFeeEstimator.swift

@@ -9,7 +9,7 @@ import Foundation
 import LightningDevKit
 
 class LdkPersister: Persist {
-    private func handleChannel(_ channelFundingOutpoint: Bindings.OutPoint, _ data: ChannelMonitor, _ updateId: Bindings.MonitorUpdateId) -> ChannelMonitorUpdateStatus {
+    private func handleChannel(_ channelFundingOutpoint: Bindings.OutPoint, _ data: ChannelMonitor) -> ChannelMonitorUpdateStatus {
         guard let channelId = data.channelId().getA() else {
             LdkEventEmitter.shared.send(withEvent: .native_log, body: "Error. Missing channelFundingOutpoint.getTxid(). Cannot persist channel")
             return .UnrecoverableError
@@ -28,7 +28,7 @@ class LdkPersister: Persist {
 
             let isNew = !FileManager().fileExists(atPath: channelStoragePath.path)
 
-            //If we're not remotely backing up no need to update status later
+            // If we're not remotely backing up no need to update status later
             if BackupClient.skipRemoteBackup {
                 try Data(data.write()).write(to: channelStoragePath)
                 if isNew {
@@ -43,21 +43,21 @@ class LdkPersister: Persist {
                     return
                 }
 
-                //Callback for when the persist queue queue entry is processed
+                // Callback for when the persist queue queue entry is processed
                 do {
                     try Data(data.write()).write(to: channelStoragePath)
                 } catch {
-                    //If this fails we can't do much but LDK will retry on startup
+                    // If this fails we can't do much but LDK will retry on startup
                     LdkEventEmitter.shared.send(withEvent: .native_log, body: "Error. Failed to locally persist channel (\(channelIdHex)). \(error.localizedDescription)")
                     return
                 }
 
-                //Update chainmonitor with successful persist
-                let res = Ldk.chainMonitor?.channelMonitorUpdated(fundingTxo: channelFundingOutpoint, completedUpdateId: updateId)
+                // Update chainmonitor with successful persist
+                let res = Ldk.chainMonitor?.channelMonitorUpdated(fundingTxo: channelFundingOutpoint, completedUpdateId: data.getLatestUpdateId())
                 if let error = res?.getError() {
                     LdkEventEmitter.shared.send(withEvent: .native_log, body: "Error. Failed to update chain monitor for channel (\(channelIdHex)) Error \(error.getValueType()).")
                 } else {
-                    LdkEventEmitter.shared.send(withEvent: .native_log, body: "Persisted channel \(channelIdHex). Update ID: \(updateId.hash())")
+                    LdkEventEmitter.shared.send(withEvent: .native_log, body: "Persisted channel \(channelIdHex). Update ID: \(data.getLatestUpdateId())")
                     if isNew {
                         LdkEventEmitter.shared.send(withEvent: .new_channel, body: body)
                     }
@@ -70,12 +70,12 @@ class LdkPersister: Persist {
             return ChannelMonitorUpdateStatus.UnrecoverableError
         }
     }
-    
-    override func persistNewChannel(channelFundingOutpoint: Bindings.OutPoint, data: Bindings.ChannelMonitor, updateId: Bindings.MonitorUpdateId) -> Bindings.ChannelMonitorUpdateStatus {
-        return handleChannel(channelFundingOutpoint, data, updateId)
+
+    override func persistNewChannel(channelFundingOutpoint: Bindings.OutPoint, monitor: Bindings.ChannelMonitor) -> Bindings.ChannelMonitorUpdateStatus {
+        return handleChannel(channelFundingOutpoint, monitor)
     }
 
-    override func updatePersistedChannel(channelFundingOutpoint: Bindings.OutPoint, update: Bindings.ChannelMonitorUpdate, data: Bindings.ChannelMonitor, updateId: Bindings.MonitorUpdateId) -> Bindings.ChannelMonitorUpdateStatus {
-        return handleChannel(channelFundingOutpoint, data, updateId)
+    override func updatePersistedChannel(channelFundingOutpoint: Bindings.OutPoint, monitorUpdate: Bindings.ChannelMonitorUpdate, monitor: Bindings.ChannelMonitor) -> Bindings.ChannelMonitorUpdateStatus {
+        return handleChannel(channelFundingOutpoint, monitor)
     }
 }