Merge pull request #49 from synonymdev/feat/upsert-tags

Add upsert tags and get all tags metadata

Author: ovitrif

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "bitkitcore"
-version = "0.1.23"
+version = "0.1.24"
 edition = "2021"
 
 [lib]

Cargo.toml

@@ -3,8 +3,8 @@
 
 import PackageDescription
 
-let tag = "v0.1.23"
-let checksum = "bc38b62f93ce7b3c7acc22d3a917e2dd343c241c061cf2d7b1b7c779545a1e37"
+let tag = "v0.1.24"
+let checksum = "34cfce19ece822af081969c271862491929ff530c3e23e935e69c68112cc7d09"
 let url = "https://github.com/synonymdev/bitkit-core/releases/download/\(tag)/BitkitCore.xcframework.zip"
 
 let package = Package(

Package.swift

@@ -3,4 +3,4 @@ android.useAndroidX=true
 android.enableJetifier=true
 kotlin.code.style=official
 group=com.synonym
-version=0.1.23
+version=0.1.24

bindings/android/gradle.properties

@@ -1103,6 +1103,10 @@ internal interface UniffiForeignFutureCompleteVoid: com.sun.jna.Callback {
 
 
 
+
+
+
+
 
 
 
@@ -1213,6 +1217,9 @@ internal object IntegrityCheckingUniffiLib : Library {
         if (uniffi_bitkitcore_checksum_func_get_all_closed_channels() != 16828.toShort()) {
             throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
         }
+        if (uniffi_bitkitcore_checksum_func_get_all_tag_metadata() != 23646.toShort()) {
+            throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
+        }
         if (uniffi_bitkitcore_checksum_func_get_all_unique_tags() != 25431.toShort()) {
             throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
         }
@@ -1366,6 +1373,9 @@ internal object IntegrityCheckingUniffiLib : Library {
         if (uniffi_bitkitcore_checksum_func_upsert_orders() != 45856.toShort()) {
             throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
         }
+        if (uniffi_bitkitcore_checksum_func_upsert_tags() != 47513.toShort()) {
+            throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
+        }
         if (uniffi_bitkitcore_checksum_func_validate_bitcoin_address() != 56003.toShort()) {
             throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
         }
@@ -1448,6 +1458,9 @@ internal object IntegrityCheckingUniffiLib : Library {
     external fun uniffi_bitkitcore_checksum_func_get_all_closed_channels(
     ): Short
     @JvmStatic
+    external fun uniffi_bitkitcore_checksum_func_get_all_tag_metadata(
+    ): Short
+    @JvmStatic
     external fun uniffi_bitkitcore_checksum_func_get_all_unique_tags(
     ): Short
     @JvmStatic
@@ -1601,6 +1614,9 @@ internal object IntegrityCheckingUniffiLib : Library {
     external fun uniffi_bitkitcore_checksum_func_upsert_orders(
     ): Short
     @JvmStatic
+    external fun uniffi_bitkitcore_checksum_func_upsert_tags(
+    ): Short
+    @JvmStatic
     external fun uniffi_bitkitcore_checksum_func_validate_bitcoin_address(
     ): Short
     @JvmStatic
@@ -1765,6 +1781,10 @@ internal object UniffiLib : Library {
         uniffiCallStatus: UniffiRustCallStatus,
     ): RustBufferByValue
     @JvmStatic
+    external fun uniffi_bitkitcore_fn_func_get_all_tag_metadata(
+        uniffiCallStatus: UniffiRustCallStatus,
+    ): RustBufferByValue
+    @JvmStatic
     external fun uniffi_bitkitcore_fn_func_get_all_unique_tags(
         uniffiCallStatus: UniffiRustCallStatus,
     ): RustBufferByValue
@@ -2100,6 +2120,11 @@ internal object UniffiLib : Library {
         `orders`: RustBufferByValue,
     ): Long
     @JvmStatic
+    external fun uniffi_bitkitcore_fn_func_upsert_tags(
+        `activityTags`: RustBufferByValue,
+        uniffiCallStatus: UniffiRustCallStatus,
+    ): Unit
+    @JvmStatic
     external fun uniffi_bitkitcore_fn_func_validate_bitcoin_address(
         `address`: RustBufferByValue,
         uniffiCallStatus: UniffiRustCallStatus,
@@ -2662,6 +2687,65 @@ public object FfiConverterTypeAccountUtxo: FfiConverterRustBuffer<AccountUtxo> {
 
 
 
+public object FfiConverterTypeActivityTags: FfiConverterRustBuffer<ActivityTags> {
+    override fun read(buf: ByteBuffer): ActivityTags {
+        return ActivityTags(
+            FfiConverterString.read(buf),
+            FfiConverterSequenceString.read(buf),
+        )
+    }
+
+    override fun allocationSize(value: ActivityTags): ULong = (
+            FfiConverterString.allocationSize(value.`activityId`) +
+            FfiConverterSequenceString.allocationSize(value.`tags`)
+    )
+
+    override fun write(value: ActivityTags, buf: ByteBuffer) {
+        FfiConverterString.write(value.`activityId`, buf)
+        FfiConverterSequenceString.write(value.`tags`, buf)
+    }
+}
+
+
+
+
+public object FfiConverterTypeActivityTagsMetadata: FfiConverterRustBuffer<ActivityTagsMetadata> {
+    override fun read(buf: ByteBuffer): ActivityTagsMetadata {
+        return ActivityTagsMetadata(
+            FfiConverterString.read(buf),
+            FfiConverterOptionalString.read(buf),
+            FfiConverterOptionalString.read(buf),
+            FfiConverterString.read(buf),
+            FfiConverterBoolean.read(buf),
+            FfiConverterSequenceString.read(buf),
+            FfiConverterULong.read(buf),
+        )
+    }
+
+    override fun allocationSize(value: ActivityTagsMetadata): ULong = (
+            FfiConverterString.allocationSize(value.`id`) +
+            FfiConverterOptionalString.allocationSize(value.`paymentHash`) +
+            FfiConverterOptionalString.allocationSize(value.`txId`) +
+            FfiConverterString.allocationSize(value.`address`) +
+            FfiConverterBoolean.allocationSize(value.`isReceive`) +
+            FfiConverterSequenceString.allocationSize(value.`tags`) +
+            FfiConverterULong.allocationSize(value.`createdAt`)
+    )
+
+    override fun write(value: ActivityTagsMetadata, buf: ByteBuffer) {
+        FfiConverterString.write(value.`id`, buf)
+        FfiConverterOptionalString.write(value.`paymentHash`, buf)
+        FfiConverterOptionalString.write(value.`txId`, buf)
+        FfiConverterString.write(value.`address`, buf)
+        FfiConverterBoolean.write(value.`isReceive`, buf)
+        FfiConverterSequenceString.write(value.`tags`, buf)
+        FfiConverterULong.write(value.`createdAt`, buf)
+    }
+}
+
+
+
+
 public object FfiConverterTypeAddressInfo: FfiConverterRustBuffer<AddressInfo> {
     override fun read(buf: ByteBuffer): AddressInfo {
         return AddressInfo(
@@ -8743,6 +8827,56 @@ public object FfiConverterSequenceTypeAccountUtxo: FfiConverterRustBuffer<List<A
 
 
 
+public object FfiConverterSequenceTypeActivityTags: FfiConverterRustBuffer<List<ActivityTags>> {
+    override fun read(buf: ByteBuffer): List<ActivityTags> {
+        val len = buf.getInt()
+        return List<ActivityTags>(len) {
+            FfiConverterTypeActivityTags.read(buf)
+        }
+    }
+
+    override fun allocationSize(value: List<ActivityTags>): ULong {
+        val sizeForLength = 4UL
+        val sizeForItems = value.sumOf { FfiConverterTypeActivityTags.allocationSize(it) }
+        return sizeForLength + sizeForItems
+    }
+
+    override fun write(value: List<ActivityTags>, buf: ByteBuffer) {
+        buf.putInt(value.size)
+        value.iterator().forEach {
+            FfiConverterTypeActivityTags.write(it, buf)
+        }
+    }
+}
+
+
+
+
+public object FfiConverterSequenceTypeActivityTagsMetadata: FfiConverterRustBuffer<List<ActivityTagsMetadata>> {
+    override fun read(buf: ByteBuffer): List<ActivityTagsMetadata> {
+        val len = buf.getInt()
+        return List<ActivityTagsMetadata>(len) {
+            FfiConverterTypeActivityTagsMetadata.read(buf)
+        }
+    }
+
+    override fun allocationSize(value: List<ActivityTagsMetadata>): ULong {
+        val sizeForLength = 4UL
+        val sizeForItems = value.sumOf { FfiConverterTypeActivityTagsMetadata.allocationSize(it) }
+        return sizeForLength + sizeForItems
+    }
+
+    override fun write(value: List<ActivityTagsMetadata>, buf: ByteBuffer) {
+        buf.putInt(value.size)
+        value.iterator().forEach {
+            FfiConverterTypeActivityTagsMetadata.write(it, buf)
+        }
+    }
+}
+
+
+
+
 public object FfiConverterSequenceTypeAddressInfo: FfiConverterRustBuffer<List<AddressInfo>> {
     override fun read(buf: ByteBuffer): List<AddressInfo> {
         val len = buf.getInt()
@@ -9725,6 +9859,15 @@ public fun `getAllClosedChannels`(`sortDirection`: SortDirection?): List<ClosedC
     })
 }
 
+@Throws(ActivityException::class)
+public fun `getAllTagMetadata`(): List<ActivityTagsMetadata> {
+    return FfiConverterSequenceTypeActivityTagsMetadata.lift(uniffiRustCallWithError(ActivityExceptionErrorHandler) { uniffiRustCallStatus ->
+        UniffiLib.uniffi_bitkitcore_fn_func_get_all_tag_metadata(
+            uniffiRustCallStatus,
+        )
+    })
+}
+
 @Throws(ActivityException::class)
 public fun `getAllUniqueTags`(): List<kotlin.String> {
     return FfiConverterSequenceString.lift(uniffiRustCallWithError(ActivityExceptionErrorHandler) { uniffiRustCallStatus ->
@@ -10515,6 +10658,16 @@ public suspend fun `upsertOrders`(`orders`: List<IBtOrder>) {
     )
 }
 
+@Throws(ActivityException::class)
+public fun `upsertTags`(`activityTags`: List<ActivityTags>) {
+    uniffiRustCallWithError(ActivityExceptionErrorHandler) { uniffiRustCallStatus ->
+        UniffiLib.uniffi_bitkitcore_fn_func_upsert_tags(
+            FfiConverterSequenceTypeActivityTags.lower(`activityTags`),
+            uniffiRustCallStatus,
+        )
+    }
+}
+
 @Throws(AddressException::class)
 public fun `validateBitcoinAddress`(`address`: kotlin.String): ValidationResult {
     return FfiConverterTypeValidationResult.lift(uniffiRustCallWithError(AddressExceptionErrorHandler) { uniffiRustCallStatus ->

bindings/android/lib/src/main/jniLibs/arm64-v8a/libbitkitcore.so

@@ -188,6 +188,31 @@ public data class AccountUtxo (
 
 
 
+@kotlinx.serialization.Serializable
+public data class ActivityTags (
+    val `activityId`: kotlin.String, 
+    val `tags`: List<kotlin.String>
+) {
+    public companion object
+}
+
+
+
+@kotlinx.serialization.Serializable
+public data class ActivityTagsMetadata (
+    val `id`: kotlin.String, 
+    val `paymentHash`: kotlin.String?, 
+    val `txId`: kotlin.String?, 
+    val `address`: kotlin.String, 
+    val `isReceive`: kotlin.Boolean, 
+    val `tags`: List<kotlin.String>, 
+    val `createdAt`: kotlin.ULong
+) {
+    public companion object
+}
+
+
+
 /**
  * Address information
  */
@@ -3100,6 +3125,10 @@ public enum class WordCount {
 
 
 
+
+
+
+