feat: update android ldk to 0.0.125

Author: Jasonvdb

lib/android/libs/LDK-release.aar

@@ -116,7 +116,7 @@ val ChannelDetails.asJson: WritableMap
         val result = Arguments.createMap()
 
         result.putHexString("channel_id", _channel_id._a)
-        result.putBoolean("is_public", _is_public)
+        result.putBoolean("is_public", _is_announced)
         result.putBoolean("is_usable", _is_usable)
         result.putBoolean("is_channel_ready", _is_channel_ready)
         result.putBoolean("is_outbound", _is_outbound)
@@ -188,7 +188,7 @@ val NodeInfo.asJson: WritableMap
         val shortChannelIds = Arguments.createArray()
         _channels.iterator().forEach { shortChannelIds.pushString(it.toString()) }
         result.putArray("shortChannelIds", shortChannelIds)
-        result.putDouble("announcement_info_last_update", (_announcement_info?._last_update ?: 0).toDouble() * 1000)
+        result.putDouble("announcement_info_last_update", ((_announcement_info as Option_NodeAnnouncementInfoZ.Some).some.last_update()).toDouble() * 1000)
         return result
     }
 
@@ -335,7 +335,7 @@ fun ChannelHandshakeConfig.mergeWithMap(map: ReadableMap?): ChannelHandshakeConf
         _negotiate_scid_privacy = map.getBoolean("negotiate_scid_privacy")
     } catch (_: Exception) {}
     try {
-        _announced_channel = map.getBoolean("announced_channel")
+        _announce_for_forwarding = map.getBoolean("announced_channel")
     } catch (_: Exception) {}
     try {
         _commit_upfront_shutdown_pubkey = map.getBoolean("commit_upfront_shutdown_pubkey")

lib/android/libs/ldk-java-javadoc.jar

@@ -21,7 +21,7 @@ import org.ldk.structs.Result_ChannelIdAPIErrorZ.Result_ChannelIdAPIErrorZ_OK
 import org.ldk.structs.Result_NoneAPIErrorZ.Result_NoneAPIErrorZ_OK
 import org.ldk.structs.Result_NoneRetryableSendFailureZ.Result_NoneRetryableSendFailureZ_Err
 import org.ldk.structs.Result_PublicKeyNoneZ.Result_PublicKeyNoneZ_OK
-import org.ldk.structs.Result_StrSecp256k1ErrorZ.Result_StrSecp256k1ErrorZ_OK
+//import org.ldk.structs.Result_StrSecp256k1ErrorZ.Result_StrSecp256k1ErrorZ_OK
 import org.ldk.util.UInt128
 import java.io.File
 import java.net.InetSocketAddress
@@ -592,8 +592,27 @@ class LdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMod
     //MARK: Update methods
 
     @ReactMethod
-    fun updateFees(anchorChannelFee: Double, nonAnchorChannelFee: Double, channelCloseMinimum: Double, minAllowedAnchorChannelRemoteFee: Double, onChainSweep: Double, minAllowedNonAnchorChannelRemoteFee: Double, outputSpendingFee: Double, promise: Promise) {
-        feeEstimator.update(anchorChannelFee.toInt(), nonAnchorChannelFee.toInt(), channelCloseMinimum.toInt(), minAllowedAnchorChannelRemoteFee.toInt(), onChainSweep.toInt(), minAllowedNonAnchorChannelRemoteFee.toInt(), outputSpendingFee.toInt())
+    fun updateFees(
+        anchorChannelFee: Double,
+        nonAnchorChannelFee: Double,
+        channelCloseMinimum: Double,
+        minAllowedAnchorChannelRemoteFee: Double,
+        minAllowedNonAnchorChannelRemoteFee: Double,
+        outputSpendingFee: Double,
+        maximumFeeEstimate: Double,
+        urgentOnChainSweep: Double,
+        promise: Promise
+    ) {
+        feeEstimator.update(
+            anchorChannelFee.toInt(),
+            nonAnchorChannelFee.toInt(),
+            channelCloseMinimum.toInt(),
+            minAllowedAnchorChannelRemoteFee.toInt(),
+            minAllowedNonAnchorChannelRemoteFee.toInt(),
+            outputSpendingFee.toInt(),
+            maximumFeeEstimate.toInt(),
+            urgentOnChainSweep.toInt(),
+        )
         handleResolve(promise, LdkCallbackResponses.fees_updated)
     }
 
@@ -761,7 +780,7 @@ class LdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMod
         channelManager ?: return handleReject(promise, LdkErrors.init_channel_manager)
 
         val channelIdObj = ChannelId.of(channelId.hexa())
-        val res = if (force) channelManager!!.force_close_broadcasting_latest_txn(channelIdObj, counterpartyNodeId.hexa()) else channelManager!!.close_channel(channelIdObj, counterpartyNodeId.hexa())
+        val res = if (force) channelManager!!.force_close_broadcasting_latest_txn(channelIdObj, counterpartyNodeId.hexa(), "Force close") else channelManager!!.close_channel(channelIdObj, counterpartyNodeId.hexa())
         if (!res.is_ok) {
             return handleReject(promise, LdkErrors.channel_close_fail)
         }
@@ -846,9 +865,9 @@ class LdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMod
         channelManager ?: return handleReject(promise, LdkErrors.init_channel_manager)
 
         if (broadcastLatestTx) {
-            channelManager!!.force_close_all_channels_broadcasting_latest_txn()
+            channelManager!!.force_close_all_channels_broadcasting_latest_txn("Force close broadcasting latest tx")
         } else {
-            channelManager!!.force_close_all_channels_without_broadcasting_txn()
+            channelManager!!.force_close_all_channels_without_broadcasting_txn("Force close without broadcasting latest tx")
         }
 
         handleResolve(promise, LdkCallbackResponses.close_channel_success)
@@ -1353,15 +1372,15 @@ class LdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMod
                         descriptors,
                         emptyArray(),
                         changeDestinationScript.hexa(),
-                        feeEstimator.onChainSweep,
+                        feeEstimator.urgentOnChainSweep,
                         Option_u32Z.none()
                     )
                 } else {
                     keysManager!!.spend_spendable_outputs(
                         descriptors,
                         emptyArray(),
                         changeDestinationScript.hexa(),
-                        feeEstimator.onChainSweep,
+                        feeEstimator.urgentOnChainSweep,
                         Option_u32Z.none()
                     )
                 }
@@ -1381,13 +1400,7 @@ class LdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMod
     fun nodeSign(message: String, promise: Promise) {
         keysManager ?: return handleReject(promise, LdkErrors.init_keys_manager)
 
-        val res = UtilMethods.sign(message.toByteArray(Charsets.UTF_8), keysManager!!.inner._node_secret_key)
-
-        if (!res.is_ok) {
-            return handleReject(promise, LdkErrors.failed_signing_request)
-        }
-
-        promise.resolve((res as Result_StrSecp256k1ErrorZ_OK).res)
+        promise.resolve(UtilMethods.sign(message.toByteArray(Charsets.UTF_8), keysManager!!.inner._node_secret_key))
     }
 
     @ReactMethod

lib/android/src/main/java/com/reactnativeldk/Helpers.kt

@@ -9,7 +9,6 @@ import com.reactnativeldk.hexEncodedString
 import com.reactnativeldk.hexa
 import com.reactnativeldk.putDateOrNull
 import org.json.JSONObject
-import org.ldk.structs.Result_StrSecp256k1ErrorZ.Result_StrSecp256k1ErrorZ_OK
 import org.ldk.structs.UtilMethods
 import java.net.HttpURLConnection
 import java.net.URL
@@ -458,12 +457,7 @@ class BackupClient {
                 throw BackupError.requiresSetup
             }
 
-            val res = UtilMethods.sign("$signedMessagePrefix$message".toByteArray(Charsets.UTF_8), secretKey)
-            if (!res.is_ok) {
-                throw BackupError.signingError
-            }
-
-            return (res as Result_StrSecp256k1ErrorZ_OK).res
+            return UtilMethods.sign("$signedMessagePrefix$message".toByteArray(Charsets.UTF_8), secretKey)
         }
 
         private fun verifySignature(message: String, signature: String, pubKey: String): Boolean {

lib/android/src/main/java/com/reactnativeldk/LdkModule.kt

@@ -2,19 +2,19 @@ package com.reactnativeldk.classes
 
 import com.reactnativeldk.EventTypes
 import com.reactnativeldk.LdkEventEmitter
+import org.ldk.structs.EcdsaChannelSigner
 import org.ldk.structs.KeysManager
 import org.ldk.structs.Option_u32Z
 import org.ldk.structs.Result_CVec_u8ZNoneZ
+import org.ldk.structs.Result_EcdsaChannelSignerDecodeErrorZ
 import org.ldk.structs.Result_ShutdownScriptInvalidShutdownScriptZ
 import org.ldk.structs.Result_ShutdownScriptNoneZ
 import org.ldk.structs.Result_TransactionNoneZ
-import org.ldk.structs.Result_WriteableEcdsaChannelSignerDecodeErrorZ
 import org.ldk.structs.ShutdownScript
 import org.ldk.structs.SignerProvider.SignerProviderInterface
 import org.ldk.structs.SpendableOutputDescriptor
 import org.ldk.structs.TxOut
 import org.ldk.structs.WitnessProgram
-import org.ldk.structs.WriteableEcdsaChannelSigner
 import org.ldk.util.UInt128
 import org.ldk.util.WitnessVersion
 
@@ -79,15 +79,15 @@ class CustomSignerProvider : SignerProviderInterface {
     override fun derive_channel_signer(
         channel_value_satoshis: Long,
         channel_keys_id: ByteArray?
-    ): WriteableEcdsaChannelSigner {
+    ): EcdsaChannelSigner {
         return customKeysManager.inner.as_SignerProvider().derive_channel_signer(channel_value_satoshis, channel_keys_id)
     }
 
     override fun generate_channel_keys_id(p0: Boolean, p1: Long, p2: UInt128?): ByteArray {
         return customKeysManager.inner.as_SignerProvider().generate_channel_keys_id(p0, p1, p2)
     }
 
-    override fun read_chan_signer(p0: ByteArray?): Result_WriteableEcdsaChannelSignerDecodeErrorZ {
+    override fun read_chan_signer(p0: ByteArray?): Result_EcdsaChannelSignerDecodeErrorZ? {
         return customKeysManager.inner.as_SignerProvider().read_chan_signer(p0!!)
     }
 }

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

@@ -12,17 +12,18 @@ import org.ldk.structs.Event.BumpTransaction
 import org.ldk.structs.Option_ThirtyTwoBytesZ
 import org.ldk.structs.Option_u64Z
 import org.ldk.structs.PaymentPurpose
+import org.ldk.structs.Result_NoneReplayEventZ
 import java.io.File
 
 class LdkChannelManagerPersister: ChannelManagerConstructor.EventHandler {
-    override fun handle_event(event: Event) {
+    override fun handle_event(event: Event): Result_NoneReplayEventZ {
         (event as? Event.FundingGenerationReady)?.let { fundingGenerationReady ->
             val body = Arguments.createMap()
             body.putHexString("temp_channel_id", fundingGenerationReady.temporary_channel_id._a)
             body.putHexString("output_script", fundingGenerationReady.output_script)
             body.putHexString("user_channel_id", fundingGenerationReady.user_channel_id.leBytes)
             body.putInt("value_satoshis", fundingGenerationReady.channel_value_satoshis.toInt())
-            return LdkEventEmitter.send(EventTypes.channel_manager_funding_generation_ready, body)
+            LdkEventEmitter.send(EventTypes.channel_manager_funding_generation_ready, body)
         }
 
         (event as? Event.PaymentClaimable)?.let { paymentClaimable ->
@@ -40,7 +41,7 @@ class LdkChannelManagerPersister: ChannelManagerConstructor.EventHandler {
             body.putString("state", "pending")
 
             persistPaymentClaimed(body)
-            return LdkEventEmitter.send(EventTypes.channel_manager_payment_claimable, body)
+            LdkEventEmitter.send(EventTypes.channel_manager_payment_claimable, body)
         }
 
         (event as? Event.PaymentSent)?.let { paymentSent ->
@@ -54,7 +55,7 @@ class LdkChannelManagerPersister: ChannelManagerConstructor.EventHandler {
 
             persistPaymentSent(body.toHashMap())
 
-            return LdkEventEmitter.send(EventTypes.channel_manager_payment_sent, body)
+            LdkEventEmitter.send(EventTypes.channel_manager_payment_sent, body)
         }
 
         (event as? Event.OpenChannelRequest)?.let { openChannelRequest ->
@@ -67,7 +68,7 @@ class LdkChannelManagerPersister: ChannelManagerConstructor.EventHandler {
             body.putBoolean("requires_zero_conf", openChannelRequest.channel_type.requires_zero_conf())
             body.putBoolean("supports_zero_conf", openChannelRequest.channel_type.supports_zero_conf())
             body.putBoolean("requires_anchors_zero_fee_htlc_tx", openChannelRequest.channel_type.requires_anchors_zero_fee_htlc_tx())
-            return LdkEventEmitter.send(EventTypes.channel_manager_open_channel_request, body)
+            LdkEventEmitter.send(EventTypes.channel_manager_open_channel_request, body)
         }
 
         (event as? Event.PaymentPathSuccessful)?.let { paymentPathSuccessful ->
@@ -80,7 +81,7 @@ class LdkChannelManagerPersister: ChannelManagerConstructor.EventHandler {
             event.path._hops.forEach { pathHops.pushMap(it.asJson) }
             body.putArray("path_hops", pathHops)
 
-            return LdkEventEmitter.send(EventTypes.channel_manager_payment_path_successful, body)
+            LdkEventEmitter.send(EventTypes.channel_manager_payment_path_successful, body)
         }
 
         (event as? Event.PaymentPathFailed)?.let { paymentPathFailed ->
@@ -102,22 +103,22 @@ class LdkChannelManagerPersister: ChannelManagerConstructor.EventHandler {
                 ))
             }
 
-            return LdkEventEmitter.send(EventTypes.channel_manager_payment_path_failed, body)
+            LdkEventEmitter.send(EventTypes.channel_manager_payment_path_failed, body)
         }
 
         (event as? Event.PaymentFailed)?.let { paymentFailed ->
             val body = Arguments.createMap()
             body.putHexString("payment_id", paymentFailed.payment_id)
-            body.putHexString("payment_hash", paymentFailed.payment_hash)
+            body.putHexString("payment_hash", (paymentFailed.payment_hash as Option_ThirtyTwoBytesZ.Some).some)
 
             persistPaymentSent(hashMapOf(
                 "payment_id" to paymentFailed.payment_id!!.hexEncodedString(),
-                "payment_hash" to paymentFailed.payment_hash.hexEncodedString(),
+                "payment_hash" to (paymentFailed.payment_hash as Option_ThirtyTwoBytesZ.Some).some.hexEncodedString(),
                 "unix_timestamp" to (System.currentTimeMillis() / 1000).toInt(),
                 "state" to "failed"
             ))
 
-            return LdkEventEmitter.send(EventTypes.channel_manager_payment_failed, body)
+            LdkEventEmitter.send(EventTypes.channel_manager_payment_failed, body)
         }
 
         (event as? Event.PaymentForwarded)?.let { paymentForwarded ->
@@ -127,7 +128,7 @@ class LdkChannelManagerPersister: ChannelManagerConstructor.EventHandler {
         (event as? Event.PendingHTLCsForwardable)?.let { pendingHTLCsForwardable ->
             val body = Arguments.createMap()
             body.putInt("time_forwardable", pendingHTLCsForwardable.time_forwardable.toInt())
-            return LdkEventEmitter.send(EventTypes.channel_manager_pending_htlcs_forwardable, body)
+            LdkEventEmitter.send(EventTypes.channel_manager_pending_htlcs_forwardable, body)
         }
 
         (event as? Event.SpendableOutputs)?.let { spendableOutputs ->
@@ -137,7 +138,7 @@ class LdkChannelManagerPersister: ChannelManagerConstructor.EventHandler {
                 outputs.pushHexString(it.write())
             }
             body.putArray("outputsSerialized", outputs)
-            return LdkEventEmitter.send(EventTypes.channel_manager_spendable_outputs, body)
+            LdkEventEmitter.send(EventTypes.channel_manager_spendable_outputs, body)
         }
 
         (event as? Event.ChannelClosed)?.let { channelClosed ->
@@ -170,14 +171,14 @@ class LdkChannelManagerPersister: ChannelManagerConstructor.EventHandler {
 
             println("Channel closed: ${channelClosed.channel_id._a.hexEncodedString()}")
 
-            return LdkEventEmitter.send(EventTypes.channel_manager_channel_closed, body)
+            LdkEventEmitter.send(EventTypes.channel_manager_channel_closed, body)
         }
 
         (event as? Event.DiscardFunding)?.let { discardFunding ->
             val body = Arguments.createMap()
             body.putHexString("channel_id", discardFunding.channel_id._a)
-            body.putHexString("tx", discardFunding.transaction)
-            return LdkEventEmitter.send(EventTypes.channel_manager_discard_funding, body)
+            body.putHexString("tx", discardFunding.channel_id._a)
+            LdkEventEmitter.send(EventTypes.channel_manager_discard_funding, body)
         }
 
         (event as? Event.PaymentClaimed)?.let { paymentClaimed ->
@@ -195,7 +196,7 @@ class LdkChannelManagerPersister: ChannelManagerConstructor.EventHandler {
             body.putString("state", "successful")
 
             persistPaymentClaimed(body)
-            return LdkEventEmitter.send(EventTypes.channel_manager_payment_claimed, body)
+            LdkEventEmitter.send(EventTypes.channel_manager_payment_claimed, body)
         }
 
         (event as? Event.ChannelReady)?.let { channelReady ->
@@ -212,9 +213,11 @@ class LdkChannelManagerPersister: ChannelManagerConstructor.EventHandler {
                 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)
+                LdkEventEmitter.send(EventTypes.lsp_log, body)
             }
         }
+
+        return Result_NoneReplayEventZ.ok()
     }
 
     override fun persist_manager(channel_manager_bytes: ByteArray?) {

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

@@ -9,18 +9,29 @@ class LdkFeeEstimator {
     var nonAnchorChannelFee: Int = 0
     var channelCloseMinimum: Int = 0
     var minAllowedAnchorChannelRemoteFee: Int = 0
-    var onChainSweep: Int = 0
     var minAllowedNonAnchorChannelRemoteFee: Int = 0
     var outputSpendingFee: Int = 0
+    var maximumFeeEstimate: Int = 0
+    var urgentOnChainSweep: Int = 0
 
-    fun update(anchorChannelFee: Int, nonAnchorChannelFee: Int, channelCloseMinimum: Int, minAllowedAnchorChannelRemoteFee: Int, onChainSweep: Int, minAllowedNonAnchorChannelRemoteFee: Int, outputSpendingFee: Int) {
+    fun update(
+        anchorChannelFee: Int,
+        nonAnchorChannelFee: Int,
+        channelCloseMinimum: Int,
+        minAllowedAnchorChannelRemoteFee: Int,
+        minAllowedNonAnchorChannelRemoteFee: Int,
+        outputSpendingFee: Int,
+        maximumFeeEstimate: Int,
+        urgentOnChainSweep: Int
+    ) {
         this.anchorChannelFee = anchorChannelFee
         this.nonAnchorChannelFee = nonAnchorChannelFee
         this.channelCloseMinimum = channelCloseMinimum
         this.minAllowedAnchorChannelRemoteFee = minAllowedAnchorChannelRemoteFee
-        this.onChainSweep = onChainSweep
         this.minAllowedNonAnchorChannelRemoteFee = minAllowedNonAnchorChannelRemoteFee
         this.outputSpendingFee = outputSpendingFee
+        this.maximumFeeEstimate = maximumFeeEstimate
+        this.urgentOnChainSweep = urgentOnChainSweep
 
         LdkEventEmitter.send(EventTypes.native_log, "Fee estimator updated")
     }
@@ -31,9 +42,10 @@ class LdkFeeEstimator {
             ConfirmationTarget.LDKConfirmationTarget_NonAnchorChannelFee -> nonAnchorChannelFee
             ConfirmationTarget.LDKConfirmationTarget_ChannelCloseMinimum -> channelCloseMinimum
             ConfirmationTarget.LDKConfirmationTarget_MinAllowedAnchorChannelRemoteFee -> minAllowedAnchorChannelRemoteFee
-            ConfirmationTarget.LDKConfirmationTarget_OnChainSweep -> onChainSweep
             ConfirmationTarget.LDKConfirmationTarget_MinAllowedNonAnchorChannelRemoteFee -> minAllowedNonAnchorChannelRemoteFee
             ConfirmationTarget.LDKConfirmationTarget_OutputSpendingFee -> outputSpendingFee
+            ConfirmationTarget.LDKConfirmationTarget_MaximumFeeEstimate -> maximumFeeEstimate
+            ConfirmationTarget.LDKConfirmationTarget_UrgentOnChainSweep -> urgentOnChainSweep
         }
     }
 }