Skip to content
This repository was archived by the owner on Feb 9, 2026. It is now read-only.

Commit de58478

Browse files
JasonvdbJasonvdb
committed
feat: android updated for ldk 0.0.117
1 parent bcb5dbc commit de58478

7 files changed

Lines changed: 19 additions & 24 deletions

File tree

‎lib/android/libs/LDK-release.aar‎

945 KB
Binary file not shown.

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

465 KB
Binary file not shown.

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

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,13 @@ import org.ldk.batteries.NioPeerHandler
99
import org.ldk.enums.Currency
1010
import org.ldk.enums.Network
1111
import org.ldk.enums.Recipient
12-
import org.ldk.impl.bindings.LDKDestination.Node
1312
import org.ldk.impl.bindings.get_ldk_c_bindings_version
1413
import org.ldk.impl.bindings.get_ldk_version
1514
import org.ldk.structs.*
1615
import org.ldk.structs.Result_Bolt11InvoiceParseOrSemanticErrorZ.Result_Bolt11InvoiceParseOrSemanticErrorZ_OK
1716
import org.ldk.structs.Result_Bolt11InvoiceSignOrCreationErrorZ.Result_Bolt11InvoiceSignOrCreationErrorZ_OK
18-
import org.ldk.structs.Result_PaymentIdPaymentErrorZ.Result_PaymentIdPaymentErrorZ_OK
19-
import org.ldk.structs.Result_PublicKeyErrorZ.Result_PublicKeyErrorZ_OK
2017
import org.ldk.structs.Result_PublicKeyNoneZ.Result_PublicKeyNoneZ_OK
21-
import org.ldk.structs.Result_StringErrorZ.Result_StringErrorZ_OK
18+
import org.ldk.structs.Result_StrSecp256k1ErrorZ.Result_StrSecp256k1ErrorZ_OK
2219
import org.ldk.util.UInt128
2320
import java.io.File
2421
import java.net.InetSocketAddress
@@ -685,7 +682,7 @@ class LdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMod
685682
ldkOutputs.toTypedArray(),
686683
changeDestinationScript.hexa(),
687684
feeRate.toInt(),
688-
Option_PackedLockTimeZ.none()
685+
Option_u32Z.none()
689686
)
690687

691688
if (!res.is_ok) {
@@ -735,7 +732,7 @@ class LdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMod
735732
UtilMethods.pay_invoice(invoice, Retry.timeout(timeoutSeconds.toLong()), channelManager)
736733
if (res.is_ok) {
737734
channelManagerPersister.persistPaymentSent(hashMapOf(
738-
"payment_id" to (res as Result_PaymentIdPaymentErrorZ_OK).res.hexEncodedString(),
735+
"payment_id" to (res as Result_ThirtyTwoBytesPaymentErrorZ.Result_ThirtyTwoBytesPaymentErrorZ_OK).res.hexEncodedString(),
739736
"payment_hash" to invoice.payment_hash().hexEncodedString(),
740737
"amount_sat" to if (isZeroValueInvoice) amountSats.toLong() else ((invoice.amount_milli_satoshis() as Option_u64Z.Some).some.toInt() / 1000),
741738
"unix_timestamp" to (System.currentTimeMillis() / 1000).toInt(),
@@ -745,7 +742,7 @@ class LdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMod
745742
return handleResolve(promise, LdkCallbackResponses.invoice_payment_success)
746743
}
747744

748-
val error = res as? Result_PaymentIdPaymentErrorZ.Result_PaymentIdPaymentErrorZ_Err
745+
val error = res as? Result_ThirtyTwoBytesPaymentErrorZ.Result_ThirtyTwoBytesPaymentErrorZ_Err
749746

750747
val invoiceError = error?.err as? PaymentError.Invoice
751748
if (invoiceError != null) {
@@ -1056,7 +1053,7 @@ class LdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMod
10561053
emptyArray(),
10571054
changeDestinationScript.hexa(),
10581055
feeRate.toInt(),
1059-
Option_PackedLockTimeZ.none()
1056+
Option_u32Z.none()
10601057
)
10611058

10621059
if (!res.is_ok) {
@@ -1076,7 +1073,7 @@ class LdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMod
10761073
return handleReject(promise, LdkErrors.failed_signing_request)
10771074
}
10781075

1079-
promise.resolve((res as Result_StringErrorZ_OK).res)
1076+
promise.resolve((res as Result_StrSecp256k1ErrorZ_OK).res)
10801077
}
10811078

10821079
@ReactMethod

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import com.reactnativeldk.handleReject
66
import com.reactnativeldk.hexEncodedString
77
import com.reactnativeldk.hexa
88
import org.json.JSONObject
9-
import org.ldk.structs.Result_StringErrorZ.Result_StringErrorZ_OK
9+
import org.ldk.structs.Result_StrSecp256k1ErrorZ.Result_StrSecp256k1ErrorZ_OK
1010
import org.ldk.structs.UtilMethods
1111
import java.net.HttpURLConnection
1212
import java.net.URL
@@ -370,7 +370,7 @@ class BackupClient {
370370
throw BackupError.signingError
371371
}
372372

373-
return (res as Result_StringErrorZ_OK).res
373+
return (res as Result_StrSecp256k1ErrorZ_OK).res
374374
}
375375

376376
private fun verifySignature(message: String, signature: String, pubKey: String): Boolean {

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ import com.reactnativeldk.*
66
import org.json.JSONArray
77
import org.ldk.batteries.ChannelManagerConstructor
88
import org.ldk.structs.Event
9-
import org.ldk.structs.Option_PaymentHashZ
10-
import org.ldk.structs.Option_PaymentIdZ
11-
import org.ldk.structs.Option_PaymentPreimageZ
9+
import org.ldk.structs.Option_ThirtyTwoBytesZ
1210
import org.ldk.structs.Option_u64Z
1311
import org.ldk.structs.PaymentPurpose
1412
import java.io.File
@@ -29,7 +27,7 @@ class LdkChannelManagerPersister: ChannelManagerConstructor.EventHandler {
2927
body.putHexString("payment_hash", paymentClaimable.payment_hash)
3028
body.putInt("amount_sat", paymentClaimable.amount_msat.toInt() / 1000)
3129
(paymentClaimable.purpose as? PaymentPurpose.InvoicePayment)?.let {
32-
body.putHexString("payment_preimage", (it.payment_preimage as Option_PaymentPreimageZ.Some).some)
30+
body.putHexString("payment_preimage", (it.payment_preimage as Option_ThirtyTwoBytesZ.Some).some)
3331
body.putHexString("payment_secret", it.payment_secret)
3432
}
3533
(paymentClaimable.purpose as? PaymentPurpose.SpontaneousPayment)?.let {
@@ -44,7 +42,7 @@ class LdkChannelManagerPersister: ChannelManagerConstructor.EventHandler {
4442

4543
(event as? Event.PaymentSent)?.let { paymentSent ->
4644
val body = Arguments.createMap()
47-
body.putHexString("payment_id", (paymentSent.payment_id as Option_PaymentIdZ.Some).some)
45+
body.putHexString("payment_id", (paymentSent.payment_id as Option_ThirtyTwoBytesZ.Some).some)
4846
body.putHexString("payment_preimage", paymentSent.payment_preimage)
4947
body.putHexString("payment_hash", paymentSent.payment_hash)
5048
body.putInt("fee_paid_sat", (paymentSent.fee_paid_msat as Option_u64Z.Some).some.toInt() / 1000)
@@ -73,7 +71,7 @@ class LdkChannelManagerPersister: ChannelManagerConstructor.EventHandler {
7371
val body = Arguments.createMap()
7472

7573
body.putHexString("payment_id", paymentPathSuccessful.payment_id)
76-
body.putHexString("payment_hash", (paymentPathSuccessful.payment_hash as Option_PaymentHashZ.Some).some)
74+
body.putHexString("payment_hash", (paymentPathSuccessful.payment_hash as Option_ThirtyTwoBytesZ.Some).some)
7775

7876
val pathHops = Arguments.createArray()
7977
println(paymentPathSuccessful.path)
@@ -84,7 +82,7 @@ class LdkChannelManagerPersister: ChannelManagerConstructor.EventHandler {
8482

8583
(event as? Event.PaymentPathFailed)?.let { paymentPathFailed ->
8684
val body = Arguments.createMap()
87-
body.putHexString("payment_id", (paymentPathFailed.payment_id as Option_PaymentIdZ.Some).some)
85+
body.putHexString("payment_id", (paymentPathFailed.payment_id as Option_ThirtyTwoBytesZ.Some).some)
8886
body.putHexString("payment_hash", paymentPathFailed.payment_hash)
8987
body.putBoolean("payment_failed_permanently", paymentPathFailed.payment_failed_permanently)
9088
body.putInt("short_channel_id", (paymentPathFailed.short_channel_id as Option_u64Z.Some).some.toInt())
@@ -94,7 +92,7 @@ class LdkChannelManagerPersister: ChannelManagerConstructor.EventHandler {
9492

9593
if (paymentPathFailed.payment_id != null) {
9694
persistPaymentSent(hashMapOf(
97-
"payment_id" to (paymentPathFailed.payment_id!! as Option_PaymentIdZ.Some).some.hexEncodedString(),
95+
"payment_id" to (paymentPathFailed.payment_id!! as Option_ThirtyTwoBytesZ.Some).some.hexEncodedString(),
9896
"payment_hash" to paymentPathFailed.payment_hash.hexEncodedString(),
9997
"unix_timestamp" to (System.currentTimeMillis() / 1000).toInt(),
10098
"state" to if (paymentPathFailed.payment_failed_permanently) "failed" else "pending"
@@ -159,7 +157,7 @@ class LdkChannelManagerPersister: ChannelManagerConstructor.EventHandler {
159157
body.putHexString("payment_hash", paymentClaimed.payment_hash)
160158
body.putInt("amount_sat", paymentClaimed.amount_msat.toInt() / 1000)
161159
(paymentClaimed.purpose as? PaymentPurpose.InvoicePayment)?.let {
162-
body.putHexString("payment_preimage", (it.payment_preimage as Option_PaymentPreimageZ.Some).some)
160+
body.putHexString("payment_preimage", (it.payment_preimage as Option_ThirtyTwoBytesZ.Some).some)
163161
body.putHexString("payment_secret", it.payment_secret)
164162
}
165163
(paymentClaimed.purpose as? PaymentPurpose.SpontaneousPayment)?.let {

‎lib/android/src/main/java/com/reactnativeldk/classes/LdkFilter.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import com.reactnativeldk.hexEncodedString
77
import com.reactnativeldk.putHexString
88
import org.ldk.structs.Filter
99
import org.ldk.structs.Filter.FilterInterface
10-
import org.ldk.structs.Option_BlockHashZ
10+
import org.ldk.structs.Option_ThirtyTwoBytesZ
1111
import org.ldk.structs.WatchedOutput
1212

1313
class LdkFilter {
@@ -21,8 +21,8 @@ class LdkFilter {
2121

2222
override fun register_output(output: WatchedOutput) {
2323
val body = Arguments.createMap()
24-
if (output._block_hash is Option_BlockHashZ.Some) {
25-
body.putHexString("block_hash", (output._block_hash as Option_BlockHashZ.Some).some)
24+
if (output._block_hash is Option_ThirtyTwoBytesZ.Some) {
25+
body.putHexString("block_hash", (output._block_hash as Option_ThirtyTwoBytesZ.Some).some)
2626
}
2727
body.putInt("index", output._outpoint._index.toInt())
2828
body.putString("script_pubkey", output._script_pubkey.hexEncodedString())

‎lib/android/src/main/java/com/reactnativeldk/classes/LdkPersister.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class LdkPersister {
3737
return ChannelMonitorUpdateStatus.LDKChannelMonitorUpdateStatus_Completed
3838
} catch (e: Exception) {
3939
LdkEventEmitter.send(EventTypes.emergency_force_close_channel, body)
40-
return ChannelMonitorUpdateStatus.LDKChannelMonitorUpdateStatus_PermanentFailure
40+
return ChannelMonitorUpdateStatus.LDKChannelMonitorUpdateStatus_UnrecoverableError
4141
}
4242
}
4343

0 commit comments

Comments
 (0)