Merge pull request #83 from synonymdev/feat/pubky-approve-auth

feat: add approver-side Pubky Auth FFI

Author: ben-kaufman

Cargo.lock

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

Cargo.toml

@@ -3,8 +3,8 @@
 
 import PackageDescription
 
-let tag = "v0.1.51"
-let checksum = "fc2a9b3884dcd1b08d7112458621c589413339e84e52955e0ece4ff1c7596dda"
+let tag = "v0.1.54"
+let checksum = "8ca81d51d6d9f66ef3c33f81969d07221c21744d131f907be2006d87a807ed05"
 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.51
+version=0.1.54

bindings/android/gradle.properties

@@ -1420,6 +1420,10 @@ internal typealias UniffiVTableCallbackInterfaceTrezorUiCallbackUniffiByValue =
 
 
 
+
+
+
+
 
 
 
@@ -1476,6 +1480,9 @@ internal object IntegrityCheckingUniffiLib : Library {
         if (uniffi_bitkitcore_checksum_func_add_tags() != 63739.toShort()) {
             throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
         }
+        if (uniffi_bitkitcore_checksum_func_approve_pubky_auth() != 22222.toShort()) {
+            throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
+        }
         if (uniffi_bitkitcore_checksum_func_blocktank_remove_all_cjit_entries() != 40127.toShort()) {
             throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
         }
@@ -1680,6 +1687,9 @@ internal object IntegrityCheckingUniffiLib : Library {
         if (uniffi_bitkitcore_checksum_func_open_channel() != 21402.toShort()) {
             throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
         }
+        if (uniffi_bitkitcore_checksum_func_parse_pubky_auth_url() != 56972.toShort()) {
+            throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
+        }
         if (uniffi_bitkitcore_checksum_func_prepare_sweep_transaction() != 18273.toShort()) {
             throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
         }
@@ -1924,6 +1934,9 @@ internal object IntegrityCheckingUniffiLib : Library {
     external fun uniffi_bitkitcore_checksum_func_add_tags(
     ): Short
     @JvmStatic
+    external fun uniffi_bitkitcore_checksum_func_approve_pubky_auth(
+    ): Short
+    @JvmStatic
     external fun uniffi_bitkitcore_checksum_func_blocktank_remove_all_cjit_entries(
     ): Short
     @JvmStatic
@@ -2128,6 +2141,9 @@ internal object IntegrityCheckingUniffiLib : Library {
     external fun uniffi_bitkitcore_checksum_func_open_channel(
     ): Short
     @JvmStatic
+    external fun uniffi_bitkitcore_checksum_func_parse_pubky_auth_url(
+    ): Short
+    @JvmStatic
     external fun uniffi_bitkitcore_checksum_func_prepare_sweep_transaction(
     ): Short
     @JvmStatic
@@ -2506,6 +2522,11 @@ internal object UniffiLib : Library {
         uniffiCallStatus: UniffiRustCallStatus,
     ): Unit
     @JvmStatic
+    external fun uniffi_bitkitcore_fn_func_approve_pubky_auth(
+        `authUrl`: RustBufferByValue,
+        `secretKeyHex`: RustBufferByValue,
+    ): Long
+    @JvmStatic
     external fun uniffi_bitkitcore_fn_func_blocktank_remove_all_cjit_entries(
     ): Long
     @JvmStatic
@@ -2878,6 +2899,11 @@ internal object UniffiLib : Library {
         `connectionString`: RustBufferByValue,
     ): Long
     @JvmStatic
+    external fun uniffi_bitkitcore_fn_func_parse_pubky_auth_url(
+        `authUrl`: RustBufferByValue,
+        uniffiCallStatus: UniffiRustCallStatus,
+    ): RustBufferByValue
+    @JvmStatic
     external fun uniffi_bitkitcore_fn_func_prepare_sweep_transaction(
         `mnemonicPhrase`: RustBufferByValue,
         `network`: RustBufferByValue,
@@ -6635,6 +6661,37 @@ public object FfiConverterTypePubkyAuth: FfiConverterRustBuffer<PubkyAuth> {
 
 
 
+public object FfiConverterTypePubkyAuthDetails: FfiConverterRustBuffer<PubkyAuthDetails> {
+    override fun read(buf: ByteBuffer): PubkyAuthDetails {
+        return PubkyAuthDetails(
+            FfiConverterTypePubkyAuthKind.read(buf),
+            FfiConverterString.read(buf),
+            FfiConverterString.read(buf),
+            FfiConverterOptionalString.read(buf),
+            FfiConverterOptionalString.read(buf),
+        )
+    }
+
+    override fun allocationSize(value: PubkyAuthDetails): ULong = (
+            FfiConverterTypePubkyAuthKind.allocationSize(value.`kind`) +
+            FfiConverterString.allocationSize(value.`capabilities`) +
+            FfiConverterString.allocationSize(value.`relay`) +
+            FfiConverterOptionalString.allocationSize(value.`homeserver`) +
+            FfiConverterOptionalString.allocationSize(value.`signupToken`)
+    )
+
+    override fun write(value: PubkyAuthDetails, buf: ByteBuffer) {
+        FfiConverterTypePubkyAuthKind.write(value.`kind`, buf)
+        FfiConverterString.write(value.`capabilities`, buf)
+        FfiConverterString.write(value.`relay`, buf)
+        FfiConverterOptionalString.write(value.`homeserver`, buf)
+        FfiConverterOptionalString.write(value.`signupToken`, buf)
+    }
+}
+
+
+
+
 public object FfiConverterTypePubkyProfile: FfiConverterRustBuffer<PubkyProfile> {
     override fun read(buf: ByteBuffer): PubkyProfile {
         return PubkyProfile(
@@ -9166,6 +9223,24 @@ public object FfiConverterTypePaymentType: FfiConverterRustBuffer<PaymentType> {
 
 
 
+
+public object FfiConverterTypePubkyAuthKind: FfiConverterRustBuffer<PubkyAuthKind> {
+    override fun read(buf: ByteBuffer): PubkyAuthKind = try {
+        PubkyAuthKind.entries[buf.getInt() - 1]
+    } catch (e: IndexOutOfBoundsException) {
+        throw RuntimeException("invalid enum value, something is very wrong!!", e)
+    }
+
+    override fun allocationSize(value: PubkyAuthKind): ULong = 4UL
+
+    override fun write(value: PubkyAuthKind, buf: ByteBuffer) {
+        buf.putInt(value.ordinal + 1)
+    }
+}
+
+
+
+
 public object PubkyExceptionErrorHandler : UniffiRustCallStatusErrorHandler<PubkyException> {
     override fun lift(errorBuf: RustBufferByValue): PubkyException = FfiConverterTypePubkyError.lift(errorBuf)
 }
@@ -12115,6 +12190,25 @@ public fun `addTags`(`activityId`: kotlin.String, `tags`: List<kotlin.String>) {
     }
 }
 
+@Throws(PubkyException::class, kotlin.coroutines.cancellation.CancellationException::class)
+public suspend fun `approvePubkyAuth`(`authUrl`: kotlin.String, `secretKeyHex`: kotlin.String) {
+    return uniffiRustCallAsync(
+        UniffiLib.uniffi_bitkitcore_fn_func_approve_pubky_auth(
+            FfiConverterString.lower(`authUrl`),
+            FfiConverterString.lower(`secretKeyHex`),
+        ),
+        { future, callback, continuation -> UniffiLib.ffi_bitkitcore_rust_future_poll_void(future, callback, continuation) },
+        { future, continuation -> UniffiLib.ffi_bitkitcore_rust_future_complete_void(future, continuation) },
+        { future -> UniffiLib.ffi_bitkitcore_rust_future_free_void(future) },
+        { future -> UniffiLib.ffi_bitkitcore_rust_future_cancel_void(future) },
+        // lift function
+        { Unit },
+        
+        // Error FFI converter
+        PubkyExceptionErrorHandler,
+    )
+}
+
 @Throws(BlocktankException::class, kotlin.coroutines.cancellation.CancellationException::class)
 public suspend fun `blocktankRemoveAllCjitEntries`() {
     return uniffiRustCallAsync(
@@ -13115,6 +13209,16 @@ public suspend fun `openChannel`(`orderId`: kotlin.String, `connectionString`: k
     )
 }
 
+@Throws(PubkyException::class)
+public fun `parsePubkyAuthUrl`(`authUrl`: kotlin.String): PubkyAuthDetails {
+    return FfiConverterTypePubkyAuthDetails.lift(uniffiRustCallWithError(PubkyExceptionErrorHandler) { uniffiRustCallStatus ->
+        UniffiLib.uniffi_bitkitcore_fn_func_parse_pubky_auth_url(
+            FfiConverterString.lower(`authUrl`),
+            uniffiRustCallStatus,
+        )
+    })
+}
+
 @Throws(SweepException::class, kotlin.coroutines.cancellation.CancellationException::class)
 public suspend fun `prepareSweepTransaction`(`mnemonicPhrase`: kotlin.String, `network`: Network?, `bip39Passphrase`: kotlin.String?, `electrumUrl`: kotlin.String, `destinationAddress`: kotlin.String, `feeRateSatsPerVbyte`: kotlin.UInt?): SweepTransactionPreview {
     return uniffiRustCallAsync(

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

@@ -1338,6 +1338,37 @@ public data class PubkyAuth (
 
 
 
+/**
+ * Details extracted from a `pubkyauth://` deep-link URL.
+ */
+@kotlinx.serialization.Serializable
+public data class PubkyAuthDetails (
+    /**
+     * Whether this is a signin or signup flow.
+     */
+    val `kind`: PubkyAuthKind, 
+    /**
+     * Requested capabilities (e.g. `"/pub/pubky.app/:rw"`).
+     */
+    val `capabilities`: kotlin.String, 
+    /**
+     * Relay URL used for the auth exchange.
+     */
+    val `relay`: kotlin.String, 
+    /**
+     * Homeserver public key (z32-encoded). Present only for signup flows.
+     */
+    val `homeserver`: kotlin.String?, 
+    /**
+     * Signup token. Present only for signup flows.
+     */
+    val `signupToken`: kotlin.String?
+) {
+    public companion object
+}
+
+
+
 @kotlinx.serialization.Serializable
 public data class PubkyProfile (
     val `name`: kotlin.String, 
@@ -3376,6 +3407,23 @@ public enum class PaymentType {
 
 
 
+/**
+ * The type of a `pubkyauth://` deep-link flow.
+ */
+
+@kotlinx.serialization.Serializable
+public enum class PubkyAuthKind {
+    
+    SIGNIN,
+    SIGNUP;
+    public companion object
+}
+
+
+
+
+
+
 
 public sealed class PubkyException: kotlin.Exception() {