Merge pull request #52 from synonymdev/feat/add-pre-activity-tags

Pre-Activity Metadata Improvements

Author: ovitrif

Cargo.lock

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

Cargo.toml

@@ -3,8 +3,8 @@
 
 import PackageDescription
 
-let tag = "v0.1.25"
-let checksum = "aea295c6abb9d92eb5166004b1984cbc0f653a6a2eab1b6e524ab9b22bb37153"
+let tag = "v0.1.26"
+let checksum = "b3a6186f10aa34ba9681c14b9f1e23a0d0853fae4027716afc01b7e968199c7f"
 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.25
+version=0.1.26

bindings/android/gradle.properties

@@ -1119,6 +1119,10 @@ internal interface UniffiForeignFutureCompleteVoid: com.sun.jna.Callback {
 
 
 
+
+
+
+
 
 
 
@@ -1169,6 +1173,9 @@ internal object IntegrityCheckingUniffiLib : Library {
         if (uniffi_bitkitcore_checksum_func_add_pre_activity_metadata() != 17211.toShort()) {
             throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
         }
+        if (uniffi_bitkitcore_checksum_func_add_pre_activity_metadata_tags() != 28081.toShort()) {
+            throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
+        }
         if (uniffi_bitkitcore_checksum_func_add_tags() != 63739.toShort()) {
             throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
         }
@@ -1274,6 +1281,9 @@ internal object IntegrityCheckingUniffiLib : Library {
         if (uniffi_bitkitcore_checksum_func_get_payment() != 29170.toShort()) {
             throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
         }
+        if (uniffi_bitkitcore_checksum_func_get_pre_activity_metadata() != 53126.toShort()) {
+            throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
+        }
         if (uniffi_bitkitcore_checksum_func_get_tags() != 11308.toShort()) {
             throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
         }
@@ -1428,6 +1438,9 @@ internal object IntegrityCheckingUniffiLib : Library {
     external fun uniffi_bitkitcore_checksum_func_add_pre_activity_metadata(
     ): Short
     @JvmStatic
+    external fun uniffi_bitkitcore_checksum_func_add_pre_activity_metadata_tags(
+    ): Short
+    @JvmStatic
     external fun uniffi_bitkitcore_checksum_func_add_tags(
     ): Short
     @JvmStatic
@@ -1533,6 +1546,9 @@ internal object IntegrityCheckingUniffiLib : Library {
     external fun uniffi_bitkitcore_checksum_func_get_payment(
     ): Short
     @JvmStatic
+    external fun uniffi_bitkitcore_checksum_func_get_pre_activity_metadata(
+    ): Short
+    @JvmStatic
     external fun uniffi_bitkitcore_checksum_func_get_tags(
     ): Short
     @JvmStatic
@@ -1701,6 +1717,12 @@ internal object UniffiLib : Library {
         uniffiCallStatus: UniffiRustCallStatus,
     ): Unit
     @JvmStatic
+    external fun uniffi_bitkitcore_fn_func_add_pre_activity_metadata_tags(
+        `paymentId`: RustBufferByValue,
+        `tags`: RustBufferByValue,
+        uniffiCallStatus: UniffiRustCallStatus,
+    ): Unit
+    @JvmStatic
     external fun uniffi_bitkitcore_fn_func_add_tags(
         `activityId`: RustBufferByValue,
         `tags`: RustBufferByValue,
@@ -1899,6 +1921,12 @@ internal object UniffiLib : Library {
         `paymentId`: RustBufferByValue,
     ): Long
     @JvmStatic
+    external fun uniffi_bitkitcore_fn_func_get_pre_activity_metadata(
+        `searchKey`: RustBufferByValue,
+        `searchByAddress`: Byte,
+        uniffiCallStatus: UniffiRustCallStatus,
+    ): RustBufferByValue
+    @JvmStatic
     external fun uniffi_bitkitcore_fn_func_get_tags(
         `activityId`: RustBufferByValue,
         uniffiCallStatus: UniffiRustCallStatus,
@@ -4758,7 +4786,6 @@ public object FfiConverterTypePreActivityMetadata: FfiConverterRustBuffer<PreAct
     override fun read(buf: ByteBuffer): PreActivityMetadata {
         return PreActivityMetadata(
             FfiConverterString.read(buf),
-            FfiConverterTypeActivityType.read(buf),
             FfiConverterSequenceString.read(buf),
             FfiConverterOptionalString.read(buf),
             FfiConverterOptionalString.read(buf),
@@ -4770,7 +4797,6 @@ public object FfiConverterTypePreActivityMetadata: FfiConverterRustBuffer<PreAct
 
     override fun allocationSize(value: PreActivityMetadata): ULong = (
             FfiConverterString.allocationSize(value.`paymentId`) +
-            FfiConverterTypeActivityType.allocationSize(value.`paymentType`) +
             FfiConverterSequenceString.allocationSize(value.`tags`) +
             FfiConverterOptionalString.allocationSize(value.`paymentHash`) +
             FfiConverterOptionalString.allocationSize(value.`txId`) +
@@ -4781,7 +4807,6 @@ public object FfiConverterTypePreActivityMetadata: FfiConverterRustBuffer<PreAct
 
     override fun write(value: PreActivityMetadata, buf: ByteBuffer) {
         FfiConverterString.write(value.`paymentId`, buf)
-        FfiConverterTypeActivityType.write(value.`paymentType`, buf)
         FfiConverterSequenceString.write(value.`tags`, buf)
         FfiConverterOptionalString.write(value.`paymentHash`, buf)
         FfiConverterOptionalString.write(value.`txId`, buf)
@@ -7963,6 +7988,35 @@ public object FfiConverterOptionalTypeMultisigRedeemScriptType: FfiConverterRust
 
 
 
+public object FfiConverterOptionalTypePreActivityMetadata: FfiConverterRustBuffer<PreActivityMetadata?> {
+    override fun read(buf: ByteBuffer): PreActivityMetadata? {
+        if (buf.get().toInt() == 0) {
+            return null
+        }
+        return FfiConverterTypePreActivityMetadata.read(buf)
+    }
+
+    override fun allocationSize(value: PreActivityMetadata?): ULong {
+        if (value == null) {
+            return 1UL
+        } else {
+            return 1UL + FfiConverterTypePreActivityMetadata.allocationSize(value)
+        }
+    }
+
+    override fun write(value: PreActivityMetadata?, buf: ByteBuffer) {
+        if (value == null) {
+            buf.put(0)
+        } else {
+            buf.put(1)
+            FfiConverterTypePreActivityMetadata.write(value, buf)
+        }
+    }
+}
+
+
+
+
 public object FfiConverterOptionalTypeRefundMemo: FfiConverterRustBuffer<RefundMemo?> {
     override fun read(buf: ByteBuffer): RefundMemo? {
         if (buf.get().toInt() == 0) {
@@ -9645,6 +9699,17 @@ public fun `addPreActivityMetadata`(`preActivityMetadata`: PreActivityMetadata)
     }
 }
 
+@Throws(ActivityException::class)
+public fun `addPreActivityMetadataTags`(`paymentId`: kotlin.String, `tags`: List<kotlin.String>) {
+    uniffiRustCallWithError(ActivityExceptionErrorHandler) { uniffiRustCallStatus ->
+        UniffiLib.uniffi_bitkitcore_fn_func_add_pre_activity_metadata_tags(
+            FfiConverterString.lower(`paymentId`),
+            FfiConverterSequenceString.lower(`tags`),
+            uniffiRustCallStatus,
+        )
+    }
+}
+
 @Throws(ActivityException::class)
 public fun `addTags`(`activityId`: kotlin.String, `tags`: List<kotlin.String>) {
     uniffiRustCallWithError(ActivityExceptionErrorHandler) { uniffiRustCallStatus ->
@@ -10139,6 +10204,17 @@ public suspend fun `getPayment`(`paymentId`: kotlin.String): IBtBolt11Invoice {
     )
 }
 
+@Throws(ActivityException::class)
+public fun `getPreActivityMetadata`(`searchKey`: kotlin.String, `searchByAddress`: kotlin.Boolean): PreActivityMetadata? {
+    return FfiConverterOptionalTypePreActivityMetadata.lift(uniffiRustCallWithError(ActivityExceptionErrorHandler) { uniffiRustCallStatus ->
+        UniffiLib.uniffi_bitkitcore_fn_func_get_pre_activity_metadata(
+            FfiConverterString.lower(`searchKey`),
+            FfiConverterBoolean.lower(`searchByAddress`),
+            uniffiRustCallStatus,
+        )
+    })
+}
+
 @Throws(ActivityException::class)
 public fun `getTags`(`activityId`: kotlin.String): List<kotlin.String> {
     return FfiConverterSequenceString.lift(uniffiRustCallWithError(ActivityExceptionErrorHandler) { uniffiRustCallStatus ->

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

@@ -1242,7 +1242,6 @@ public data class PaymentRequestMemo (
 @kotlinx.serialization.Serializable
 public data class PreActivityMetadata (
     val `paymentId`: kotlin.String, 
-    val `paymentType`: ActivityType, 
     val `tags`: List<kotlin.String>, 
     val `paymentHash`: kotlin.String?, 
     val `txId`: kotlin.String?, 
@@ -3132,6 +3131,8 @@ public enum class WordCount {
 
 
 
+
+