Skip to content

Commit 1a71420

Browse files
authored
Merge pull request #47 from synonymdev/v0-1-22
Release v0.1.22
2 parents 9a3c720 + 30b6bd1 commit 1a71420

File tree

19 files changed

+3465
-3576
lines changed

19 files changed

+3465
-3576
lines changed

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "bitkitcore"
3-
version = "0.1.21"
3+
version = "0.1.22"
44
edition = "2021"
55

66
[lib]

Package.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
import PackageDescription
55

6-
let tag = "v0.1.21"
7-
let checksum = "aea7a02fde241bfdb5899d4b0070508914ce801fe10af670a25c175fed757957"
6+
let tag = "v0.1.22"
7+
let checksum = "4dbbfe4851589690d272c631a0e8473da3ca63cf52578d2f739b406d19de6c3e"
88
let url = "https://github.com/synonymdev/bitkit-core/releases/download/\(tag)/BitkitCore.xcframework.zip"
99

1010
let package = Package(

bindings/android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ android.useAndroidX=true
33
android.enableJetifier=true
44
kotlin.code.style=official
55
group=com.synonym
6-
version=0.1.21
6+
version=0.1.22
Binary file not shown.
Binary file not shown.
235 KB
Binary file not shown.
187 KB
Binary file not shown.

bindings/android/lib/src/main/kotlin/com/synonym/bitkitcore/bitkitcore.android.kt

Lines changed: 237 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1115,6 +1115,20 @@ internal interface UniffiForeignFutureCompleteVoid: com.sun.jna.Callback {
11151115

11161116

11171117

1118+
1119+
1120+
1121+
1122+
1123+
1124+
1125+
1126+
1127+
1128+
1129+
1130+
1131+
11181132

11191133

11201134

@@ -1335,10 +1349,6 @@ internal interface UniffiLib : Library {
13351349
`activity`: RustBufferByValue,
13361350
uniffiCallStatus: UniffiRustCallStatus,
13371351
): Unit
1338-
fun uniffi_bitkitcore_fn_func_insert_closed_channel(
1339-
`channel`: RustBufferByValue,
1340-
uniffiCallStatus: UniffiRustCallStatus,
1341-
): Unit
13421352
fun uniffi_bitkitcore_fn_func_is_valid_bip39_word(
13431353
`word`: RustBufferByValue,
13441354
uniffiCallStatus: UniffiRustCallStatus,
@@ -1530,10 +1540,39 @@ internal interface UniffiLib : Library {
15301540
fun uniffi_bitkitcore_fn_func_update_blocktank_url(
15311541
`newUrl`: RustBufferByValue,
15321542
): Long
1543+
fun uniffi_bitkitcore_fn_func_upsert_activities(
1544+
`activities`: RustBufferByValue,
1545+
uniffiCallStatus: UniffiRustCallStatus,
1546+
): Unit
15331547
fun uniffi_bitkitcore_fn_func_upsert_activity(
15341548
`activity`: RustBufferByValue,
15351549
uniffiCallStatus: UniffiRustCallStatus,
15361550
): Unit
1551+
fun uniffi_bitkitcore_fn_func_upsert_cjit_entries(
1552+
`entries`: RustBufferByValue,
1553+
): Long
1554+
fun uniffi_bitkitcore_fn_func_upsert_closed_channel(
1555+
`channel`: RustBufferByValue,
1556+
uniffiCallStatus: UniffiRustCallStatus,
1557+
): Unit
1558+
fun uniffi_bitkitcore_fn_func_upsert_closed_channels(
1559+
`channels`: RustBufferByValue,
1560+
uniffiCallStatus: UniffiRustCallStatus,
1561+
): Unit
1562+
fun uniffi_bitkitcore_fn_func_upsert_info(
1563+
`info`: RustBufferByValue,
1564+
): Long
1565+
fun uniffi_bitkitcore_fn_func_upsert_lightning_activities(
1566+
`activities`: RustBufferByValue,
1567+
uniffiCallStatus: UniffiRustCallStatus,
1568+
): Unit
1569+
fun uniffi_bitkitcore_fn_func_upsert_onchain_activities(
1570+
`activities`: RustBufferByValue,
1571+
uniffiCallStatus: UniffiRustCallStatus,
1572+
): Unit
1573+
fun uniffi_bitkitcore_fn_func_upsert_orders(
1574+
`orders`: RustBufferByValue,
1575+
): Long
15371576
fun uniffi_bitkitcore_fn_func_validate_bitcoin_address(
15381577
`address`: RustBufferByValue,
15391578
uniffiCallStatus: UniffiRustCallStatus,
@@ -1835,8 +1874,6 @@ internal interface UniffiLib : Library {
18351874
): Short
18361875
fun uniffi_bitkitcore_checksum_func_insert_activity(
18371876
): Short
1838-
fun uniffi_bitkitcore_checksum_func_insert_closed_channel(
1839-
): Short
18401877
fun uniffi_bitkitcore_checksum_func_is_valid_bip39_word(
18411878
): Short
18421879
fun uniffi_bitkitcore_checksum_func_lnurl_auth(
@@ -1889,8 +1926,24 @@ internal interface UniffiLib : Library {
18891926
): Short
18901927
fun uniffi_bitkitcore_checksum_func_update_blocktank_url(
18911928
): Short
1929+
fun uniffi_bitkitcore_checksum_func_upsert_activities(
1930+
): Short
18921931
fun uniffi_bitkitcore_checksum_func_upsert_activity(
18931932
): Short
1933+
fun uniffi_bitkitcore_checksum_func_upsert_cjit_entries(
1934+
): Short
1935+
fun uniffi_bitkitcore_checksum_func_upsert_closed_channel(
1936+
): Short
1937+
fun uniffi_bitkitcore_checksum_func_upsert_closed_channels(
1938+
): Short
1939+
fun uniffi_bitkitcore_checksum_func_upsert_info(
1940+
): Short
1941+
fun uniffi_bitkitcore_checksum_func_upsert_lightning_activities(
1942+
): Short
1943+
fun uniffi_bitkitcore_checksum_func_upsert_onchain_activities(
1944+
): Short
1945+
fun uniffi_bitkitcore_checksum_func_upsert_orders(
1946+
): Short
18941947
fun uniffi_bitkitcore_checksum_func_validate_bitcoin_address(
18951948
): Short
18961949
fun uniffi_bitkitcore_checksum_func_validate_mnemonic(
@@ -2030,9 +2083,6 @@ private fun uniffiCheckApiChecksums(lib: UniffiLib) {
20302083
if (lib.uniffi_bitkitcore_checksum_func_insert_activity() != 1510.toShort()) {
20312084
throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
20322085
}
2033-
if (lib.uniffi_bitkitcore_checksum_func_insert_closed_channel() != 43559.toShort()) {
2034-
throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
2035-
}
20362086
if (lib.uniffi_bitkitcore_checksum_func_is_valid_bip39_word() != 31846.toShort()) {
20372087
throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
20382088
}
@@ -2111,9 +2161,33 @@ private fun uniffiCheckApiChecksums(lib: UniffiLib) {
21112161
if (lib.uniffi_bitkitcore_checksum_func_update_blocktank_url() != 52161.toShort()) {
21122162
throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
21132163
}
2164+
if (lib.uniffi_bitkitcore_checksum_func_upsert_activities() != 58470.toShort()) {
2165+
throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
2166+
}
21142167
if (lib.uniffi_bitkitcore_checksum_func_upsert_activity() != 32175.toShort()) {
21152168
throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
21162169
}
2170+
if (lib.uniffi_bitkitcore_checksum_func_upsert_cjit_entries() != 57141.toShort()) {
2171+
throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
2172+
}
2173+
if (lib.uniffi_bitkitcore_checksum_func_upsert_closed_channel() != 18711.toShort()) {
2174+
throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
2175+
}
2176+
if (lib.uniffi_bitkitcore_checksum_func_upsert_closed_channels() != 2086.toShort()) {
2177+
throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
2178+
}
2179+
if (lib.uniffi_bitkitcore_checksum_func_upsert_info() != 7349.toShort()) {
2180+
throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
2181+
}
2182+
if (lib.uniffi_bitkitcore_checksum_func_upsert_lightning_activities() != 8564.toShort()) {
2183+
throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
2184+
}
2185+
if (lib.uniffi_bitkitcore_checksum_func_upsert_onchain_activities() != 15461.toShort()) {
2186+
throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
2187+
}
2188+
if (lib.uniffi_bitkitcore_checksum_func_upsert_orders() != 45856.toShort()) {
2189+
throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
2190+
}
21172191
if (lib.uniffi_bitkitcore_checksum_func_validate_bitcoin_address() != 56003.toShort()) {
21182192
throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
21192193
}
@@ -8754,6 +8828,56 @@ object FfiConverterSequenceTypeIManualRefund: FfiConverterRustBuffer<List<IManua
87548828

87558829

87568830

8831+
object FfiConverterSequenceTypeLightningActivity: FfiConverterRustBuffer<List<LightningActivity>> {
8832+
override fun read(buf: ByteBuffer): List<LightningActivity> {
8833+
val len = buf.getInt()
8834+
return List<LightningActivity>(len) {
8835+
FfiConverterTypeLightningActivity.read(buf)
8836+
}
8837+
}
8838+
8839+
override fun allocationSize(value: List<LightningActivity>): ULong {
8840+
val sizeForLength = 4UL
8841+
val sizeForItems = value.sumOf { FfiConverterTypeLightningActivity.allocationSize(it) }
8842+
return sizeForLength + sizeForItems
8843+
}
8844+
8845+
override fun write(value: List<LightningActivity>, buf: ByteBuffer) {
8846+
buf.putInt(value.size)
8847+
value.iterator().forEach {
8848+
FfiConverterTypeLightningActivity.write(it, buf)
8849+
}
8850+
}
8851+
}
8852+
8853+
8854+
8855+
8856+
object FfiConverterSequenceTypeOnchainActivity: FfiConverterRustBuffer<List<OnchainActivity>> {
8857+
override fun read(buf: ByteBuffer): List<OnchainActivity> {
8858+
val len = buf.getInt()
8859+
return List<OnchainActivity>(len) {
8860+
FfiConverterTypeOnchainActivity.read(buf)
8861+
}
8862+
}
8863+
8864+
override fun allocationSize(value: List<OnchainActivity>): ULong {
8865+
val sizeForLength = 4UL
8866+
val sizeForItems = value.sumOf { FfiConverterTypeOnchainActivity.allocationSize(it) }
8867+
return sizeForLength + sizeForItems
8868+
}
8869+
8870+
override fun write(value: List<OnchainActivity>, buf: ByteBuffer) {
8871+
buf.putInt(value.size)
8872+
value.iterator().forEach {
8873+
FfiConverterTypeOnchainActivity.write(it, buf)
8874+
}
8875+
}
8876+
}
8877+
8878+
8879+
8880+
87578881
object FfiConverterSequenceTypePaymentRequestMemo: FfiConverterRustBuffer<List<PaymentRequestMemo>> {
87588882
override fun read(buf: ByteBuffer): List<PaymentRequestMemo> {
87598883
val len = buf.getInt()
@@ -9638,16 +9762,6 @@ fun `insertActivity`(`activity`: Activity) {
96389762
}
96399763
}
96409764

9641-
@Throws(ActivityException::class)
9642-
fun `insertClosedChannel`(`channel`: ClosedChannelDetails) {
9643-
uniffiRustCallWithError(ActivityExceptionErrorHandler) { uniffiRustCallStatus ->
9644-
UniffiLib.INSTANCE.uniffi_bitkitcore_fn_func_insert_closed_channel(
9645-
FfiConverterTypeClosedChannelDetails.lower(`channel`),
9646-
uniffiRustCallStatus,
9647-
)
9648-
}
9649-
}
9650-
96519765
fun `isValidBip39Word`(`word`: kotlin.String): kotlin.Boolean {
96529766
return FfiConverterBoolean.lift(uniffiRustCall { uniffiRustCallStatus ->
96539767
UniffiLib.INSTANCE.uniffi_bitkitcore_fn_func_is_valid_bip39_word(
@@ -10098,6 +10212,16 @@ suspend fun `updateBlocktankUrl`(`newUrl`: kotlin.String) {
1009810212
)
1009910213
}
1010010214

10215+
@Throws(ActivityException::class)
10216+
fun `upsertActivities`(`activities`: List<Activity>) {
10217+
uniffiRustCallWithError(ActivityExceptionErrorHandler) { uniffiRustCallStatus ->
10218+
UniffiLib.INSTANCE.uniffi_bitkitcore_fn_func_upsert_activities(
10219+
FfiConverterSequenceTypeActivity.lower(`activities`),
10220+
uniffiRustCallStatus,
10221+
)
10222+
}
10223+
}
10224+
1010110225
@Throws(ActivityException::class)
1010210226
fun `upsertActivity`(`activity`: Activity) {
1010310227
uniffiRustCallWithError(ActivityExceptionErrorHandler) { uniffiRustCallStatus ->
@@ -10108,6 +10232,100 @@ fun `upsertActivity`(`activity`: Activity) {
1010810232
}
1010910233
}
1011010234

10235+
@Throws(BlocktankException::class, kotlin.coroutines.cancellation.CancellationException::class)
10236+
suspend fun `upsertCjitEntries`(`entries`: List<IcJitEntry>) {
10237+
return uniffiRustCallAsync(
10238+
UniffiLib.INSTANCE.uniffi_bitkitcore_fn_func_upsert_cjit_entries(
10239+
FfiConverterSequenceTypeICJitEntry.lower(`entries`),
10240+
),
10241+
{ future, callback, continuation -> UniffiLib.INSTANCE.ffi_bitkitcore_rust_future_poll_void(future, callback, continuation) },
10242+
{ future, continuation -> UniffiLib.INSTANCE.ffi_bitkitcore_rust_future_complete_void(future, continuation) },
10243+
{ future -> UniffiLib.INSTANCE.ffi_bitkitcore_rust_future_free_void(future) },
10244+
{ future -> UniffiLib.INSTANCE.ffi_bitkitcore_rust_future_cancel_void(future) },
10245+
// lift function
10246+
{ Unit },
10247+
10248+
// Error FFI converter
10249+
BlocktankExceptionErrorHandler,
10250+
)
10251+
}
10252+
10253+
@Throws(ActivityException::class)
10254+
fun `upsertClosedChannel`(`channel`: ClosedChannelDetails) {
10255+
uniffiRustCallWithError(ActivityExceptionErrorHandler) { uniffiRustCallStatus ->
10256+
UniffiLib.INSTANCE.uniffi_bitkitcore_fn_func_upsert_closed_channel(
10257+
FfiConverterTypeClosedChannelDetails.lower(`channel`),
10258+
uniffiRustCallStatus,
10259+
)
10260+
}
10261+
}
10262+
10263+
@Throws(ActivityException::class)
10264+
fun `upsertClosedChannels`(`channels`: List<ClosedChannelDetails>) {
10265+
uniffiRustCallWithError(ActivityExceptionErrorHandler) { uniffiRustCallStatus ->
10266+
UniffiLib.INSTANCE.uniffi_bitkitcore_fn_func_upsert_closed_channels(
10267+
FfiConverterSequenceTypeClosedChannelDetails.lower(`channels`),
10268+
uniffiRustCallStatus,
10269+
)
10270+
}
10271+
}
10272+
10273+
@Throws(BlocktankException::class, kotlin.coroutines.cancellation.CancellationException::class)
10274+
suspend fun `upsertInfo`(`info`: IBtInfo) {
10275+
return uniffiRustCallAsync(
10276+
UniffiLib.INSTANCE.uniffi_bitkitcore_fn_func_upsert_info(
10277+
FfiConverterTypeIBtInfo.lower(`info`),
10278+
),
10279+
{ future, callback, continuation -> UniffiLib.INSTANCE.ffi_bitkitcore_rust_future_poll_void(future, callback, continuation) },
10280+
{ future, continuation -> UniffiLib.INSTANCE.ffi_bitkitcore_rust_future_complete_void(future, continuation) },
10281+
{ future -> UniffiLib.INSTANCE.ffi_bitkitcore_rust_future_free_void(future) },
10282+
{ future -> UniffiLib.INSTANCE.ffi_bitkitcore_rust_future_cancel_void(future) },
10283+
// lift function
10284+
{ Unit },
10285+
10286+
// Error FFI converter
10287+
BlocktankExceptionErrorHandler,
10288+
)
10289+
}
10290+
10291+
@Throws(ActivityException::class)
10292+
fun `upsertLightningActivities`(`activities`: List<LightningActivity>) {
10293+
uniffiRustCallWithError(ActivityExceptionErrorHandler) { uniffiRustCallStatus ->
10294+
UniffiLib.INSTANCE.uniffi_bitkitcore_fn_func_upsert_lightning_activities(
10295+
FfiConverterSequenceTypeLightningActivity.lower(`activities`),
10296+
uniffiRustCallStatus,
10297+
)
10298+
}
10299+
}
10300+
10301+
@Throws(ActivityException::class)
10302+
fun `upsertOnchainActivities`(`activities`: List<OnchainActivity>) {
10303+
uniffiRustCallWithError(ActivityExceptionErrorHandler) { uniffiRustCallStatus ->
10304+
UniffiLib.INSTANCE.uniffi_bitkitcore_fn_func_upsert_onchain_activities(
10305+
FfiConverterSequenceTypeOnchainActivity.lower(`activities`),
10306+
uniffiRustCallStatus,
10307+
)
10308+
}
10309+
}
10310+
10311+
@Throws(BlocktankException::class, kotlin.coroutines.cancellation.CancellationException::class)
10312+
suspend fun `upsertOrders`(`orders`: List<IBtOrder>) {
10313+
return uniffiRustCallAsync(
10314+
UniffiLib.INSTANCE.uniffi_bitkitcore_fn_func_upsert_orders(
10315+
FfiConverterSequenceTypeIBtOrder.lower(`orders`),
10316+
),
10317+
{ future, callback, continuation -> UniffiLib.INSTANCE.ffi_bitkitcore_rust_future_poll_void(future, callback, continuation) },
10318+
{ future, continuation -> UniffiLib.INSTANCE.ffi_bitkitcore_rust_future_complete_void(future, continuation) },
10319+
{ future -> UniffiLib.INSTANCE.ffi_bitkitcore_rust_future_free_void(future) },
10320+
{ future -> UniffiLib.INSTANCE.ffi_bitkitcore_rust_future_cancel_void(future) },
10321+
// lift function
10322+
{ Unit },
10323+
10324+
// Error FFI converter
10325+
BlocktankExceptionErrorHandler,
10326+
)
10327+
}
10328+
1011110329
@Throws(AddressException::class)
1011210330
fun `validateBitcoinAddress`(`address`: kotlin.String): ValidationResult {
1011310331
return FfiConverterTypeValidationResult.lift(uniffiRustCallWithError(AddressExceptionErrorHandler) { uniffiRustCallStatus ->

bindings/android/lib/src/main/kotlin/com/synonym/bitkitcore/bitkitcore.common.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3088,6 +3088,10 @@ enum class WordCount {
30883088

30893089

30903090

3091+
3092+
3093+
3094+
30913095

30923096

30933097

0 commit comments

Comments
 (0)