feat: android lsp log hook

synonymdev · Apr 25, 2024 · 85b6938 · 85b6938
1 parent 5ce205d
commit 85b6938
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 19 deletions.
diff --git a/lib/android/src/main/java/com/reactnativeldk/LdkModule.kt b/lib/android/src/main/java/com/reactnativeldk/LdkModule.kt
@@ -53,7 +53,8 @@ enum class EventTypes {
     new_channel,
     network_graph_updated,
     channel_manager_restarted,
-    backup_state_update
+    backup_state_update,
+    lsp_log
 }
 //*****************************************************************
 

diff --git a/lib/android/src/main/java/com/reactnativeldk/classes/LdkChannelManagerPersister.kt b/lib/android/src/main/java/com/reactnativeldk/classes/LdkChannelManagerPersister.kt
@@ -5,8 +5,10 @@ import com.facebook.react.bridge.WritableMap
 import com.reactnativeldk.*
 import org.json.JSONArray
 import org.ldk.batteries.ChannelManagerConstructor
+import org.ldk.structs.BumpTransactionEvent
 import org.ldk.structs.ClosureReason
 import org.ldk.structs.Event
+import org.ldk.structs.Event.BumpTransaction
 import org.ldk.structs.Option_ThirtyTwoBytesZ
 import org.ldk.structs.Option_u64Z
 import org.ldk.structs.PaymentPurpose
@@ -190,6 +192,18 @@ class LdkChannelManagerPersister: ChannelManagerConstructor.EventHandler {
 
         (event as? Event.ChannelPending)?.let { channelPending ->
         }
+
+        (event as? Event.BumpTransaction)?.let { bumpTransaction ->
+            LdkEventEmitter.send(EventTypes.native_log, "BumpTransaction request")
+
+            (bumpTransaction.bump_transaction as? BumpTransactionEvent.ChannelClose)?.let { channelClose ->
+                val body = Arguments.createMap()
+                body.putString("commitment_tx", channelClose.commitment_tx.hexEncodedString())
+                body.putInt("commitment_tx_fee", channelClose.commitment_tx_fee_satoshis.toInt())
+                body.putInt("pending_htlcs_count", channelClose.pending_htlcs.size)
+                return LdkEventEmitter.send(EventTypes.lsp_log, body)
+            }
+        }
     }
 
     override fun persist_manager(channel_manager_bytes: ByteArray?) {

diff --git a/lib/ios/Classes/LdkChannelManagerPersister.swift b/lib/ios/Classes/LdkChannelManagerPersister.swift
@@ -299,7 +299,7 @@ class LdkChannelManagerPersister: Persister, ExtendedChannelManagerPersister {
 
             if let channelClose = bumpTransaction.getValueAsChannelClose() {
                 let body: [String: Encodable] = [
-                    "commitment_txid": Data(channelClose.getCommitmentTx()).hexEncodedString(),
+                    "commitment_tx": Data(channelClose.getCommitmentTx()).hexEncodedString(),
                     "commitment_tx_fee": channelClose.getCommitmentTxFeeSatoshis(),
                     "pending_htlcs_count": channelClose.getPendingHtlcs().count
                 ]

diff --git a/lib/ios/Ldk.swift b/lib/ios/Ldk.swift
@@ -190,7 +190,6 @@ class Ldk: NSObject {
         }
 
         Logfile.log.setFilePath(logFile)
-        print("log file: \(path)")
         return handleResolve(resolve, .log_path_updated)
     }
 
@@ -495,22 +494,6 @@ class Ldk: NSObject {
         currentBlockchainTipHash = blockHash
         currentBlockchainHeight = blockHeight
         addForegroundObserver()
-
-
-
-
-
-        ///TODO DELETE
-        let body: [String: Encodable] = [
-            "commitment_txid": "Data(channelClose.getCommitmentTx()).hexEncodedString()",
-            "commitment_tx_fee": "channelClose.getCommitmentTxFeeSatoshis()",
-            "pending_htlcs_count": 69
-        ]
-
-        LdkEventEmitter.shared.send(withEvent: .lsp_log, body: body)
-        ///
-
-
 
         return handleResolve(resolve, .channel_manager_init_success)
     }