Add pending incoming payments

Author: Jasonvdb

lib/android/src/main/java/com/reactnativeldk/classes/LdkChannelManagerPersister.kt

@@ -32,6 +32,10 @@ class LdkChannelManagerPersister: ChannelManagerConstructor.EventHandler {
             (paymentClaimable.purpose as? PaymentPurpose.SpontaneousPayment)?.let {
                 body.putHexString("spontaneous_payment_preimage", it.spontaneous_payment)
             }
+            body.putInt("unix_timestamp", (System.currentTimeMillis() / 1000).toInt())
+            body.putBoolean("confirmed", false)
+
+            persistPaymentClaimed(body)
             return LdkEventEmitter.send(EventTypes.channel_manager_payment_claimable, body)
         }
 
@@ -135,6 +139,7 @@ class LdkChannelManagerPersister: ChannelManagerConstructor.EventHandler {
                 body.putHexString("spontaneous_payment_preimage", it.spontaneous_payment)
             }
             body.putInt("unix_timestamp", (System.currentTimeMillis() / 1000).toInt())
+            body.putBoolean("confirmed", true)
 
             persistPaymentClaimed(body)
             return LdkEventEmitter.send(EventTypes.channel_manager_payment_claimed, body)
@@ -171,31 +176,44 @@ class LdkChannelManagerPersister: ChannelManagerConstructor.EventHandler {
             return
         }
 
-        var newContent: Array<HashMap<String, Any>> = arrayOf()
+        var payments: Array<HashMap<String, Any>> = arrayOf()
+        var paymentReplaced = false
 
         try {
             if (File(LdkModule.accountStoragePath + "/" + LdkFileNames.paymentsClaimed.fileName).exists()) {
                 val data = File(LdkModule.accountStoragePath + "/" + LdkFileNames.paymentsClaimed.fileName).readBytes()
                 println(String(data))
-                val existingContent = JSONArray(String(data))
-                for (i in 0 until existingContent.length()) {
+                val existingPayments = JSONArray(String(data))
+                for (i in 0 until existingPayments.length()) {
+                    val existingPayment = existingPayments.getJSONObject(i)
+
+                    //Replace entry if payment hash exists (Confirmed payment replacing pending)
+                    if (existingPayment.getString("payment_hash") == payment.getString("payment_hash")) {
+                        payments[i] = payment.toHashMap()
+                        paymentReplaced = true
+                        continue
+                    }
+
                     val map = HashMap<String, Any>()
-                    for (key in existingContent.getJSONObject(i).keys()) {
-                        map[key] = existingContent.getJSONObject(i).get(key)
+                    for (key in existingPayment.keys()) {
+                        map[key] = existingPayments.getJSONObject(i).get(key)
                     }
 
-                    newContent = newContent.plus(map)
+                    payments = payments.plus(map)
                 }
             }
         } catch (e: Exception) {
             LdkEventEmitter.send(EventTypes.native_log, "Error could not read exisitng claimed payments")
         }
 
-        newContent = newContent.plus(payment.toHashMap())
+        //No existing payment found, append as new payment
+        if (!paymentReplaced) {
+            payments = payments.plus(payment.toHashMap())
+        }
 
         println("New content")
-        newContent.iterator().forEach { println(it) }
+        payments.iterator().forEach { println(it) }
 
-        File(LdkModule.accountStoragePath + "/" + LdkFileNames.paymentsClaimed.fileName).writeText(JSONArray(newContent).toString())
+        File(LdkModule.accountStoragePath + "/" + LdkFileNames.paymentsClaimed.fileName).writeText(JSONArray(payments).toString())
     }
 }

lib/ios/Classes/LdkChannelManagerPersister.swift

@@ -45,16 +45,23 @@ class LdkChannelManagerPersister: Persister, ExtendedChannelManagerPersister {
             let paymentSecret = paymentClaimable.getPurpose().getValueAsInvoicePayment()?.getPaymentSecret()
             let spontaneousPayment = paymentClaimable.getPurpose().getValueAsSpontaneousPayment()
 
+            let body: [String: Encodable] = [
+                "payment_hash": Data(paymentClaimable.getPaymentHash()).hexEncodedString(),
+                "amount_sat": paymentClaimable.getAmountMsat() / 1000,
+                "payment_preimage": Data(paymentPreimage ?? []).hexEncodedString(),
+                "payment_secret": Data(paymentSecret ?? []).hexEncodedString(),
+                "spontaneous_payment_preimage": Data(spontaneousPayment ?? []).hexEncodedString(),
+                "unix_timestamp": Int(Date().timeIntervalSince1970),
+                "confirmed": false
+            ]
+            
             LdkEventEmitter.shared.send(
                 withEvent: .channel_manager_payment_claimable,
-                body: [
-                    "payment_hash": Data(paymentClaimable.getPaymentHash()).hexEncodedString(),
-                    "amount_sat": paymentClaimable.getAmountMsat() / 1000,
-                    "payment_preimage": Data(paymentPreimage ?? []).hexEncodedString(),
-                    "payment_secret": Data(paymentSecret ?? []).hexEncodedString(),
-                    "spontaneous_payment_preimage": Data(spontaneousPayment ?? []).hexEncodedString(),
-                ]
+                body: body
             )
+            
+            //Save to disk for TX history
+            persistPaymentClaimed(body)
             return
         case .PaymentSent:
             guard let paymentSent = event.getValueAsPaymentSent() else {
@@ -200,7 +207,8 @@ class LdkChannelManagerPersister: Persister, ExtendedChannelManagerPersister {
                 "payment_preimage": Data(paymentPreimage ?? []).hexEncodedString(),
                 "payment_secret": Data(paymentSecret ?? []).hexEncodedString(),
                 "spontaneous_payment_preimage": Data(spontaneousPayment ?? []).hexEncodedString(),
-                "unix_timestamp": Int(Date().timeIntervalSince1970)
+                "unix_timestamp": Int(Date().timeIntervalSince1970),
+                "confirmed": true
             ]
 
             LdkEventEmitter.shared.send(
@@ -270,21 +278,36 @@ class LdkChannelManagerPersister: Persister, ExtendedChannelManagerPersister {
             return
         }
 
-        var newContent: [[String: Any]] = []
+        var payments: [[String: Any]] = []
 
         do {
             if FileManager.default.fileExists(atPath: claimedPaymentsStorage.path) {
                 let data = try Data(contentsOf: URL(fileURLWithPath: claimedPaymentsStorage.path), options: .mappedIfSafe)
 
                 if let existingContent = try JSONSerialization.jsonObject(with: data, options: []) as? [[String: Any]] {
-                    newContent = existingContent
+                    payments = existingContent
                 } else {
                     LdkEventEmitter.shared.send(withEvent: .native_log, body: "Error could not read existing claimed payments")
                 }
             }
 
-            newContent.append(payment)
-            guard let jsonData = try? JSONSerialization.data(withJSONObject: newContent, options: []) else {
+            //Replace entry if payment hash exists (Confirmed payment replacing pending)
+            var paymentReplaced = false
+            for (index, existingPayment) in payments.enumerated() {
+                if let existingPaymentHash = existingPayment["payment_hash"] as? String, let newPaymentHash = payment["payment_hash"] as? String {
+                    if existingPaymentHash == newPaymentHash {
+                        payments[index] = payment
+                        paymentReplaced = true
+                    }
+                }
+            }
+            
+            //No existing payment found, append as new payment
+            if !paymentReplaced {
+                payments.append(payment)
+            }
+            
+            guard let jsonData = try? JSONSerialization.data(withJSONObject: payments, options: []) else {
                 LdkEventEmitter.shared.send(withEvent: .native_log, body: "Error could not serialize claimed payments")
                 return
             }

lib/src/utils/types.ts

@@ -55,6 +55,7 @@ export type TChannelManagerClaim = {
 	payment_secret: string;
 	spontaneous_payment_preimage: string;
 	unix_timestamp: number;
+	confirmed: boolean;
 };
 
 export type TChannelManagerPaymentSent = {