Merge pull request #107 from xmtp/np/bump-bindings-again

Fix Key Package Errors

LibXMTP.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'LibXMTP'
-  s.version          = '3.0.26'
+  s.version          = '3.0.27'
   s.summary          = 'XMTP shared Rust code that powers cross-platform SDKs'
 
   s.homepage         = 'https://github.com/xmtp/libxmtp-swift'
@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.platform         = :ios, '14.0', :macos, '11.0'
   s.swift_version    = '5.3'
 
-  s.source           = { :http => "https://github.com/xmtp/libxmtp/releases/download/swift-bindings-c57c5fa/LibXMTPSwiftFFI.zip", :type => :zip }
+  s.source           = { :http => "https://github.com/xmtp/libxmtp/releases/download/swift-bindings-51ed806/LibXMTPSwiftFFI.zip", :type => :zip }
   s.vendored_frameworks = 'LibXMTPSwiftFFI.xcframework'
   s.source_files = 'Sources/LibXMTP/**/*'
 end

Package.swift

@@ -27,8 +27,8 @@ let package = Package(
         ),
         .binaryTarget(
             name: "LibXMTPSwiftFFI",
-            url: "https://github.com/xmtp/libxmtp/releases/download/swift-bindings-c57c5fa/LibXMTPSwiftFFI.zip",
-            checksum: "2c4eaaca827f92b59214f329ea97a620ceddc0a8b9b98103f8aa25b3e07a378a"
+            url: "https://github.com/xmtp/libxmtp/releases/download/swift-bindings-51ed806/LibXMTPSwiftFFI.zip",
+            checksum: "10930da0c55a9dcecc72baa2d1e3a0e455074abefef0cc02e25ebfdafc82ede7"
         ),
         .testTarget(name: "LibXMTPTests", dependencies: ["LibXMTP"]),
     ]

Sources/LibXMTP/libxmtp-version.txt

@@ -1,3 +1,3 @@
-Version: c57c5faf
+Version: 51ed806a
 Branch: main
-Date: 2025-02-13 17:43:45 +0000
+Date: 2025-02-14 15:54:16 +0000

Sources/LibXMTP/xmtpv3.swift

@@ -753,9 +753,9 @@ public func FfiConverterTypeFfiConsentCallback_lower(_ value: FfiConsentCallback
 public protocol FfiConversationProtocol: AnyObject {
     func addAdmin(inboxId: String) async throws
 
-    func addMembers(accountAddresses: [String]) async throws
+    func addMembers(accountAddresses: [String]) async throws -> FfiUpdateGroupMembershipResult
 
-    func addMembersByInboxId(inboxIds: [String]) async throws
+    func addMembersByInboxId(inboxIds: [String]) async throws -> FfiUpdateGroupMembershipResult
 
     func addSuperAdmin(inboxId: String) async throws
 
@@ -910,7 +910,7 @@ open class FfiConversation:
             )
     }
 
-    open func addMembers(accountAddresses: [String]) async throws {
+    open func addMembers(accountAddresses: [String]) async throws -> FfiUpdateGroupMembershipResult {
         return
             try await uniffiRustCallAsync(
                 rustFutureFunc: {
@@ -919,15 +919,15 @@ open class FfiConversation:
                         FfiConverterSequenceString.lower(accountAddresses)
                     )
                 },
-                pollFunc: ffi_xmtpv3_rust_future_poll_void,
-                completeFunc: ffi_xmtpv3_rust_future_complete_void,
-                freeFunc: ffi_xmtpv3_rust_future_free_void,
-                liftFunc: { $0 },
+                pollFunc: ffi_xmtpv3_rust_future_poll_rust_buffer,
+                completeFunc: ffi_xmtpv3_rust_future_complete_rust_buffer,
+                freeFunc: ffi_xmtpv3_rust_future_free_rust_buffer,
+                liftFunc: FfiConverterTypeFfiUpdateGroupMembershipResult.lift,
                 errorHandler: FfiConverterTypeGenericError.lift
             )
     }
 
-    open func addMembersByInboxId(inboxIds: [String]) async throws {
+    open func addMembersByInboxId(inboxIds: [String]) async throws -> FfiUpdateGroupMembershipResult {
         return
             try await uniffiRustCallAsync(
                 rustFutureFunc: {
@@ -936,10 +936,10 @@ open class FfiConversation:
                         FfiConverterSequenceString.lower(inboxIds)
                     )
                 },
-                pollFunc: ffi_xmtpv3_rust_future_poll_void,
-                completeFunc: ffi_xmtpv3_rust_future_complete_void,
-                freeFunc: ffi_xmtpv3_rust_future_free_void,
-                liftFunc: { $0 },
+                pollFunc: ffi_xmtpv3_rust_future_poll_rust_buffer,
+                completeFunc: ffi_xmtpv3_rust_future_complete_rust_buffer,
+                freeFunc: ffi_xmtpv3_rust_future_free_rust_buffer,
+                liftFunc: FfiConverterTypeFfiUpdateGroupMembershipResult.lift,
                 errorHandler: FfiConverterTypeGenericError.lift
             )
     }
@@ -6130,6 +6130,75 @@ public func FfiConverterTypeFfiRemoteAttachmentInfo_lower(_ value: FfiRemoteAtta
     return FfiConverterTypeFfiRemoteAttachmentInfo.lower(value)
 }
 
+public struct FfiUpdateGroupMembershipResult {
+    public var addedMembers: [String: UInt64]
+    public var removedMembers: [String]
+    public var failedInstallations: [Data]
+
+    // Default memberwise initializers are never public by default, so we
+    // declare one manually.
+    public init(addedMembers: [String: UInt64], removedMembers: [String], failedInstallations: [Data]) {
+        self.addedMembers = addedMembers
+        self.removedMembers = removedMembers
+        self.failedInstallations = failedInstallations
+    }
+}
+
+extension FfiUpdateGroupMembershipResult: Equatable, Hashable {
+    public static func == (lhs: FfiUpdateGroupMembershipResult, rhs: FfiUpdateGroupMembershipResult) -> Bool {
+        if lhs.addedMembers != rhs.addedMembers {
+            return false
+        }
+        if lhs.removedMembers != rhs.removedMembers {
+            return false
+        }
+        if lhs.failedInstallations != rhs.failedInstallations {
+            return false
+        }
+        return true
+    }
+
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(addedMembers)
+        hasher.combine(removedMembers)
+        hasher.combine(failedInstallations)
+    }
+}
+
+#if swift(>=5.8)
+    @_documentation(visibility: private)
+#endif
+public struct FfiConverterTypeFfiUpdateGroupMembershipResult: FfiConverterRustBuffer {
+    public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> FfiUpdateGroupMembershipResult {
+        return
+            try FfiUpdateGroupMembershipResult(
+                addedMembers: FfiConverterDictionaryStringUInt64.read(from: &buf),
+                removedMembers: FfiConverterSequenceString.read(from: &buf),
+                failedInstallations: FfiConverterSequenceData.read(from: &buf)
+            )
+    }
+
+    public static func write(_ value: FfiUpdateGroupMembershipResult, into buf: inout [UInt8]) {
+        FfiConverterDictionaryStringUInt64.write(value.addedMembers, into: &buf)
+        FfiConverterSequenceString.write(value.removedMembers, into: &buf)
+        FfiConverterSequenceData.write(value.failedInstallations, into: &buf)
+    }
+}
+
+#if swift(>=5.8)
+    @_documentation(visibility: private)
+#endif
+public func FfiConverterTypeFfiUpdateGroupMembershipResult_lift(_ buf: RustBuffer) throws -> FfiUpdateGroupMembershipResult {
+    return try FfiConverterTypeFfiUpdateGroupMembershipResult.lift(buf)
+}
+
+#if swift(>=5.8)
+    @_documentation(visibility: private)
+#endif
+public func FfiConverterTypeFfiUpdateGroupMembershipResult_lower(_ value: FfiUpdateGroupMembershipResult) -> RustBuffer {
+    return FfiConverterTypeFfiUpdateGroupMembershipResult.lower(value)
+}
+
 public struct FfiV2BatchQueryRequest {
     public var requests: [FfiV2QueryRequest]
 
@@ -8783,6 +8852,32 @@ private struct FfiConverterSequenceTypeFfiPreferenceUpdate: FfiConverterRustBuff
     }
 }
 
+#if swift(>=5.8)
+    @_documentation(visibility: private)
+#endif
+private struct FfiConverterDictionaryStringUInt64: FfiConverterRustBuffer {
+    public static func write(_ value: [String: UInt64], into buf: inout [UInt8]) {
+        let len = Int32(value.count)
+        writeInt(&buf, len)
+        for (key, value) in value {
+            FfiConverterString.write(key, into: &buf)
+            FfiConverterUInt64.write(value, into: &buf)
+        }
+    }
+
+    public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> [String: UInt64] {
+        let len: Int32 = try readInt(&buf)
+        var dict = [String: UInt64]()
+        dict.reserveCapacity(Int(len))
+        for _ in 0 ..< len {
+            let key = try FfiConverterString.read(from: &buf)
+            let value = try FfiConverterUInt64.read(from: &buf)
+            dict[key] = value
+        }
+        return dict
+    }
+}
+
 #if swift(>=5.8)
     @_documentation(visibility: private)
 #endif
@@ -9194,10 +9289,10 @@ private var initializationResult: InitializationResult = {
     if uniffi_xmtpv3_checksum_method_fficonversation_add_admin() != 52417 {
         return InitializationResult.apiChecksumMismatch
     }
-    if uniffi_xmtpv3_checksum_method_fficonversation_add_members() != 3260 {
+    if uniffi_xmtpv3_checksum_method_fficonversation_add_members() != 51549 {
         return InitializationResult.apiChecksumMismatch
     }
-    if uniffi_xmtpv3_checksum_method_fficonversation_add_members_by_inbox_id() != 28069 {
+    if uniffi_xmtpv3_checksum_method_fficonversation_add_members_by_inbox_id() != 30553 {
         return InitializationResult.apiChecksumMismatch
     }
     if uniffi_xmtpv3_checksum_method_fficonversation_add_super_admin() != 62984 {