Update Nostr SDK Swift bindings to version 0.7.1

rust-nostr · Jan 9, 2024 · 2891dac · 2891dac
1 parent 2855eee
commit 2891dac
Show file tree

Hide file tree

Showing 3 changed files with 99 additions and 81 deletions.
diff --git a/Package.swift b/Package.swift
@@ -14,7 +14,7 @@ let package = Package(
     ],
     dependencies: [],
     targets: [
-        .binaryTarget(name: "nostr_sdkFFI", url: "https://github.com/rust-nostr/nostr-sdk-swift/releases/download/0.7.0/nostr_sdkFFI.xcframework.zip", checksum: "215488cf8f18dcfa17f15e77fffb9e921e72afab896e84c4cb1f58a26f8dea5e"),
+        .binaryTarget(name: "nostr_sdkFFI", url: "https://github.com/rust-nostr/nostr-sdk-swift/releases/download/0.7.1/nostr_sdkFFI.xcframework.zip", checksum: "437351558b9d301e41aaaede2eabc65318b35c8dfa9334faa61d4727bd8e022e"),
         .target(name: "NostrSDK", dependencies: ["nostr_sdkFFI"]),
     ]
 )
diff --git a/Sources/NostrSDK/Nostr.swift b/Sources/NostrSDK/Nostr.swift
@@ -2053,8 +2053,6 @@ public protocol FilterProtocol : AnyObject {
 
     func limit(limit: UInt64)  -> Filter
 
-    func matchEvent(event: Event)  -> Bool
-
     /**
      * Add Public Key (`p` tag)
      */
@@ -2319,17 +2317,6 @@ public class Filter:
     uniffi_nostr_ffi_fn_method_filter_limit(self.uniffiClonePointer(), 
         FfiConverterUInt64.lower(limit),$0
     )
-}
-        )
-    }
-    public func matchEvent(event: Event)  -> Bool {
-        return try!  FfiConverterBool.lift(
-            try! 
-    rustCall() {
-
-    uniffi_nostr_ffi_fn_method_filter_match_event(self.uniffiClonePointer(), 
-        FfiConverterTypeEvent.lower(event),$0
-    )
 }
         )
     }
@@ -13205,9 +13192,6 @@ private var initializationResult: InitializationResult {
     if (uniffi_nostr_ffi_checksum_method_filter_limit() != 4466) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_nostr_ffi_checksum_method_filter_match_event() != 57404) {
-        return InitializationResult.apiChecksumMismatch
-    }
     if (uniffi_nostr_ffi_checksum_method_filter_pubkey() != 31814) {
         return InitializationResult.apiChecksumMismatch
     }

diff --git a/Sources/NostrSDK/NostrSDK.swift b/Sources/NostrSDK/NostrSDK.swift
@@ -1115,6 +1115,94 @@ public func FfiConverterTypeClientBuilder_lower(_ value: ClientBuilder) -> Unsaf
 
 
 
+public protocol ClientSignerProtocol : AnyObject {
+
+}
+public class ClientSigner:
+    ClientSignerProtocol {
+    fileprivate let pointer: UnsafeMutableRawPointer
+
+    // TODO: We'd like this to be `private` but for Swifty reasons,
+    // we can't implement `FfiConverter` without making this `required` and we can't
+    // make it `required` without making it `public`.
+    required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) {
+        self.pointer = pointer
+    }
+
+    public func uniffiClonePointer() -> UnsafeMutableRawPointer {
+        return try! rustCall { uniffi_nostr_sdk_ffi_fn_clone_clientsigner(self.pointer, $0) }
+    }
+
+    deinit {
+        try! rustCall { uniffi_nostr_sdk_ffi_fn_free_clientsigner(pointer, $0) }
+    }
+
+
+    public static func keys(keys: Keys)  -> ClientSigner {
+        return ClientSigner(unsafeFromRawPointer: try! rustCall() {
+    uniffi_nostr_sdk_ffi_fn_constructor_clientsigner_keys(
+        FfiConverterTypeKeys_lower(keys),$0)
+})
+    }
+
+
+    public static func nip46(nip46: Nip46Signer)  -> ClientSigner {
+        return ClientSigner(unsafeFromRawPointer: try! rustCall() {
+    uniffi_nostr_sdk_ffi_fn_constructor_clientsigner_nip46(
+        FfiConverterTypeNip46Signer.lower(nip46),$0)
+})
+    }
+
+
+
+
+
+
+}
+
+public struct FfiConverterTypeClientSigner: FfiConverter {
+
+    typealias FfiType = UnsafeMutableRawPointer
+    typealias SwiftType = ClientSigner
+
+    public static func lift(_ pointer: UnsafeMutableRawPointer) throws -> ClientSigner {
+        return ClientSigner(unsafeFromRawPointer: pointer)
+    }
+
+    public static func lower(_ value: ClientSigner) -> UnsafeMutableRawPointer {
+        return value.uniffiClonePointer()
+    }
+
+    public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> ClientSigner {
+        let v: UInt64 = try readInt(&buf)
+        // The Rust code won't compile if a pointer won't fit in a UInt64.
+        // We have to go via `UInt` because that's the thing that's the size of a pointer.
+        let ptr = UnsafeMutableRawPointer(bitPattern: UInt(truncatingIfNeeded: v))
+        if (ptr == nil) {
+            throw UniffiInternalError.unexpectedNullPointer
+        }
+        return try lift(ptr!)
+    }
+
+    public static func write(_ value: ClientSigner, into buf: inout [UInt8]) {
+        // This fiddling is because `Int` is the thing that's the same size as a pointer.
+        // The Rust code won't compile if a pointer won't fit in a `UInt64`.
+        writeInt(&buf, UInt64(bitPattern: Int64(Int(bitPattern: lower(value)))))
+    }
+}
+
+
+public func FfiConverterTypeClientSigner_lift(_ pointer: UnsafeMutableRawPointer) throws -> ClientSigner {
+    return try FfiConverterTypeClientSigner.lift(pointer)
+}
+
+public func FfiConverterTypeClientSigner_lower(_ value: ClientSigner) -> UnsafeMutableRawPointer {
+    return FfiConverterTypeClientSigner.lower(value)
+}
+
+
+
+
 public protocol Nip46SignerProtocol : AnyObject {
 
     /**
@@ -2170,66 +2258,6 @@ public func FfiConverterTypeRelayConnectionStats_lower(_ value: RelayConnectionS
     return FfiConverterTypeRelayConnectionStats.lower(value)
 }
 
-// Note that we don't yet support `indirect` for enums.
-// See https://github.com/mozilla/uniffi-rs/issues/396 for further discussion.
-public enum ClientSigner {
-
-    case keys(
-        signer: Keys
-    )
-    case nip46(
-        signer: Nip46Signer
-    )
-}
-
-public struct FfiConverterTypeClientSigner: FfiConverterRustBuffer {
-    typealias SwiftType = ClientSigner
-
-    public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> ClientSigner {
-        let variant: Int32 = try readInt(&buf)
-        switch variant {
-
-        case 1: return .keys(
-            signer: try FfiConverterTypeKeys.read(from: &buf)
-        )
-
-        case 2: return .nip46(
-            signer: try FfiConverterTypeNip46Signer.read(from: &buf)
-        )
-
-        default: throw UniffiInternalError.unexpectedEnumCase
-        }
-    }
-
-    public static func write(_ value: ClientSigner, into buf: inout [UInt8]) {
-        switch value {
-
-
-        case let .keys(signer):
-            writeInt(&buf, Int32(1))
-            FfiConverterTypeKeys.write(signer, into: &buf)
-
-
-        case let .nip46(signer):
-            writeInt(&buf, Int32(2))
-            FfiConverterTypeNip46Signer.write(signer, into: &buf)
-
-        }
-    }
-}
-
-
-public func FfiConverterTypeClientSigner_lift(_ buf: RustBuffer) throws -> ClientSigner {
-    return try FfiConverterTypeClientSigner.lift(buf)
-}
-
-public func FfiConverterTypeClientSigner_lower(_ value: ClientSigner) -> RustBuffer {
-    return FfiConverterTypeClientSigner.lower(value)
-}
-
-
-
-
 // Note that we don't yet support `indirect` for enums.
 // See https://github.com/mozilla/uniffi-rs/issues/396 for further discussion.
 public enum LogLevel {
@@ -3013,7 +3041,7 @@ private var initializationResult: InitializationResult {
     if (uniffi_nostr_sdk_ffi_checksum_method_client_shutdown() != 18928) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_nostr_sdk_ffi_checksum_method_client_signer() != 8016) {
+    if (uniffi_nostr_sdk_ffi_checksum_method_client_signer() != 57777) {
         return InitializationResult.apiChecksumMismatch
     }
     if (uniffi_nostr_sdk_ffi_checksum_method_client_start() != 10767) {
@@ -3040,7 +3068,7 @@ private var initializationResult: InitializationResult {
     if (uniffi_nostr_sdk_ffi_checksum_method_clientbuilder_opts() != 13520) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_nostr_sdk_ffi_checksum_method_clientbuilder_signer() != 47855) {
+    if (uniffi_nostr_sdk_ffi_checksum_method_clientbuilder_signer() != 39026) {
         return InitializationResult.apiChecksumMismatch
     }
     if (uniffi_nostr_sdk_ffi_checksum_method_nip46signer_relay_url() != 34734) {
@@ -3175,15 +3203,21 @@ private var initializationResult: InitializationResult {
     if (uniffi_nostr_sdk_ffi_checksum_method_relayconnectionstats_uptime() != 18216) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_nostr_sdk_ffi_checksum_constructor_client_new() != 37668) {
+    if (uniffi_nostr_sdk_ffi_checksum_constructor_client_new() != 28400) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_nostr_sdk_ffi_checksum_constructor_client_with_opts() != 53855) {
+    if (uniffi_nostr_sdk_ffi_checksum_constructor_client_with_opts() != 54987) {
         return InitializationResult.apiChecksumMismatch
     }
     if (uniffi_nostr_sdk_ffi_checksum_constructor_clientbuilder_new() != 53242) {
         return InitializationResult.apiChecksumMismatch
     }
+    if (uniffi_nostr_sdk_ffi_checksum_constructor_clientsigner_keys() != 57808) {
+        return InitializationResult.apiChecksumMismatch
+    }
+    if (uniffi_nostr_sdk_ffi_checksum_constructor_clientsigner_nip46() != 46208) {
+        return InitializationResult.apiChecksumMismatch
+    }
     if (uniffi_nostr_sdk_ffi_checksum_constructor_nip46signer_new() != 14708) {
         return InitializationResult.apiChecksumMismatch
     }