XMTP Legacy Branch

android/build.gradle

@@ -98,7 +98,7 @@ repositories {
 dependencies {
   implementation project(':expo-modules-core')
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}"
-  implementation "org.xmtp:android:0.15.12"
+  implementation "org.xmtp:android:0.16.2"
   implementation 'com.google.code.gson:gson:2.10.1'
   implementation 'com.facebook.react:react-native:0.71.3'
   implementation "com.daveanthonythomas.moshipack:moshipack:1.0.1"

android/src/main/java/expo/modules/xmtpreactnativesdk/wrappers/AuthParamsWrapper.kt

@@ -1,13 +1,17 @@
 package expo.modules.xmtpreactnativesdk.wrappers
 
 import com.google.gson.JsonParser
+import org.xmtp.android.library.WalletType
 
 class AuthParamsWrapper(
     val environment: String,
     val appVersion: String?,
     val enableV3: Boolean = false,
     val dbDirectory: String?,
     val historySyncUrl: String?,
+    val walletType: WalletType = WalletType.EOA,
+    val chainId: Long?,
+    val blockNumber: Long?,
 ) {
     companion object {
         fun authParamsFromJson(authParams: String): AuthParamsWrapper {
@@ -17,8 +21,18 @@ class AuthParamsWrapper(
                 if (jsonOptions.has("appVersion")) jsonOptions.get("appVersion").asString else null,
                 if (jsonOptions.has("enableV3")) jsonOptions.get("enableV3").asBoolean else false,
                 if (jsonOptions.has("dbDirectory")) jsonOptions.get("dbDirectory").asString else null,
-                if (jsonOptions.has("historySyncUrl")) jsonOptions.get("historySyncUrl").asString else null
-            )
+                if (jsonOptions.has("historySyncUrl")) jsonOptions.get("historySyncUrl").asString else null,
+                if (jsonOptions.has("walletType")) {
+                    when (jsonOptions.get("walletType").asString) {
+                        "SCW" -> WalletType.SCW
+                        else -> WalletType.EOA
+                    }
+                } else {
+                    WalletType.EOA
+                },
+                if (jsonOptions.has("chainId")) jsonOptions.get("chainId").asLong else null,
+                if (jsonOptions.has("blockNumber")) jsonOptions.get("blockNumber").asLong else null,
+                )
         }
     }
 }

android/src/main/java/expo/modules/xmtpreactnativesdk/wrappers/ConversationContainerWrapper.kt

@@ -1,28 +1,42 @@
 package expo.modules.xmtpreactnativesdk.wrappers
 
-import android.util.Base64
 import com.google.gson.GsonBuilder
 import org.xmtp.android.library.Client
 import org.xmtp.android.library.Conversation
 
 class ConversationContainerWrapper {
 
     companion object {
-        suspend fun encodeToObj(client: Client, conversation: Conversation): Map<String, Any?> {
-            when (conversation.version) {
+        suspend fun encodeToObj(
+            client: Client,
+            conversation: Conversation,
+            conversationParams: ConversationParamsWrapper = ConversationParamsWrapper(),
+        ): Map<String, Any?> {
+            return when (conversation.version) {
                 Conversation.Version.GROUP -> {
                     val group = (conversation as Conversation.Group).group
-                    return GroupWrapper.encodeToObj(client, group)
+                    GroupWrapper.encodeToObj(client, group, conversationParams)
                 }
+
+                Conversation.Version.DM -> {
+                    val dm = (conversation as Conversation.Dm).dm
+                    DmWrapper.encodeToObj(client, dm, conversationParams)
+                }
+
                 else -> {
-                    return ConversationWrapper.encodeToObj(client, conversation)
+                    ConversationWrapper.encodeToObj(client, conversation)
                 }
             }
         }
 
-        suspend fun encode(client: Client, conversation: Conversation): String {
+        suspend fun encode(
+            client: Client,
+            conversation: Conversation,
+            conversationParams: ConversationParamsWrapper = ConversationParamsWrapper(),
+        ): String {
             val gson = GsonBuilder().create()
-            val obj = ConversationContainerWrapper.encodeToObj(client, conversation)
+            val obj =
+                ConversationContainerWrapper.encodeToObj(client, conversation, conversationParams)
             return gson.toJson(obj)
         }
     }

android/src/main/java/expo/modules/xmtpreactnativesdk/wrappers/DmWrapper.kt

@@ -0,0 +1,46 @@
+package expo.modules.xmtpreactnativesdk.wrappers
+
+import com.google.gson.GsonBuilder
+import com.google.gson.JsonParser
+import expo.modules.xmtpreactnativesdk.wrappers.ConsentWrapper.Companion.consentStateToString
+import org.xmtp.android.library.Client
+import org.xmtp.android.library.Dm
+import org.xmtp.android.library.Group
+
+class DmWrapper {
+    companion object {
+        suspend fun encodeToObj(
+            client: Client,
+            dm: Dm,
+            dmParams: ConversationParamsWrapper = ConversationParamsWrapper(),
+        ): Map<String, Any> {
+            return buildMap {
+                put("clientAddress", client.address)
+                put("id", dm.id)
+                put("createdAt", dm.createdAt.time)
+                put("version", "DM")
+                put("topic", dm.topic)
+                put("peerInboxId", dm.peerInboxId)
+                if (dmParams.consentState) {
+                    put("consentState", consentStateToString(dm.consentState()))
+                }
+                if (dmParams.lastMessage) {
+                    val lastMessage = dm.decryptedMessages(limit = 1).firstOrNull()
+                    if (lastMessage != null) {
+                        put("lastMessage", DecodedMessageWrapper.encode(lastMessage))
+                    }
+                }
+            }
+        }
+
+        suspend fun encode(
+            client: Client,
+            dm: Dm,
+            dmParams: ConversationParamsWrapper = ConversationParamsWrapper(),
+        ): String {
+            val gson = GsonBuilder().create()
+            val obj = encodeToObj(client, dm, dmParams)
+            return gson.toJson(obj)
+        }
+    }
+}

android/src/main/java/expo/modules/xmtpreactnativesdk/wrappers/GroupWrapper.kt

@@ -1,36 +1,77 @@
 package expo.modules.xmtpreactnativesdk.wrappers
 
 import com.google.gson.GsonBuilder
+import com.google.gson.JsonParser
 import expo.modules.xmtpreactnativesdk.wrappers.ConsentWrapper.Companion.consentStateToString
 import org.xmtp.android.library.Client
 import org.xmtp.android.library.Group
 
 class GroupWrapper {
 
     companion object {
-        suspend fun encodeToObj(client: Client, group: Group): Map<String, Any> {
-            return mapOf(
-                "clientAddress" to client.address,
-                "id" to group.id,
-                "createdAt" to group.createdAt.time,
-                "members" to group.members().map { MemberWrapper.encode(it) },
-                "version" to "GROUP",
-                "topic" to group.topic,
-                "creatorInboxId" to group.creatorInboxId(),
-                "isActive" to group.isActive(),
-                "addedByInboxId" to group.addedByInboxId(),
-                "name" to group.name,
-                "imageUrlSquare" to group.imageUrlSquare,
-                "description" to group.description,
-                "consentState" to consentStateToString(group.consentState())
-                // "pinnedFrameUrl" to group.pinnedFrameUrl
-            )
+        suspend fun encodeToObj(
+            client: Client,
+            group: Group,
+            groupParams: ConversationParamsWrapper = ConversationParamsWrapper(),
+        ): Map<String, Any> {
+            return buildMap {
+                put("clientAddress", client.address)
+                put("id", group.id)
+                put("createdAt", group.createdAt.time)
+                put("version", "GROUP")
+                put("topic", group.topic)
+                if (groupParams.isActive) put("isActive", group.isActive())
+                if (groupParams.addedByInboxId) put("addedByInboxId", group.addedByInboxId())
+                if (groupParams.name) put("name", group.name)
+                if (groupParams.imageUrlSquare) put("imageUrlSquare", group.imageUrlSquare)
+                if (groupParams.description) put("description", group.description)
+                if (groupParams.consentState) {
+                    put("consentState", consentStateToString(group.consentState()))
+                }
+                if (groupParams.lastMessage) {
+                    val lastMessage = group.decryptedMessages(limit = 1).firstOrNull()
+                    if (lastMessage != null) {
+                        put("lastMessage", DecodedMessageWrapper.encode(lastMessage))
+                    }
+                }
+            }
         }
 
-        suspend fun encode(client: Client, group: Group): String {
+        suspend fun encode(
+            client: Client,
+            group: Group,
+            groupParams: ConversationParamsWrapper = ConversationParamsWrapper(),
+        ): String {
             val gson = GsonBuilder().create()
-            val obj = encodeToObj(client, group)
+            val obj = encodeToObj(client, group, groupParams)
             return gson.toJson(obj)
         }
     }
 }
+
+class ConversationParamsWrapper(
+    val isActive: Boolean = true,
+    val addedByInboxId: Boolean = true,
+    val name: Boolean = true,
+    val imageUrlSquare: Boolean = true,
+    val description: Boolean = true,
+    val consentState: Boolean = true,
+    val lastMessage: Boolean = false,
+) {
+    companion object {
+        fun conversationParamsFromJson(conversationParams: String): ConversationParamsWrapper {
+            if (conversationParams.isEmpty()) return ConversationParamsWrapper()
+            val jsonOptions = JsonParser.parseString(conversationParams).asJsonObject
+            return ConversationParamsWrapper(
+                if (jsonOptions.has("isActive")) jsonOptions.get("isActive").asBoolean else true,
+                if (jsonOptions.has("addedByInboxId")) jsonOptions.get("addedByInboxId").asBoolean else true,
+                if (jsonOptions.has("name")) jsonOptions.get("name").asBoolean else true,
+                if (jsonOptions.has("imageUrlSquare")) jsonOptions.get("imageUrlSquare").asBoolean else true,
+                if (jsonOptions.has("description")) jsonOptions.get("description").asBoolean else true,
+                if (jsonOptions.has("consentState")) jsonOptions.get("consentState").asBoolean else true,
+                if (jsonOptions.has("lastMessage")) jsonOptions.get("lastMessage").asBoolean else false,
+            )
+        }
+    }
+}
+

example/ios/Podfile.lock

@@ -56,12 +56,12 @@ PODS:
     - hermes-engine/Pre-built (= 0.71.14)
   - hermes-engine/Pre-built (0.71.14)
   - libevent (2.1.12)
-  - LibXMTP (0.5.9-beta0)
+  - LibXMTP (0.6.0)
   - Logging (1.0.0)
   - MessagePacker (0.4.7)
-  - MMKV (1.3.9):
-    - MMKVCore (~> 1.3.9)
-  - MMKVCore (1.3.9)
+  - MMKV (2.0.0):
+    - MMKVCore (~> 2.0.0)
+  - MMKVCore (2.0.0)
   - OpenSSL-Universal (1.1.2200)
   - RCT-Folly (2021.07.22.00):
     - boost
@@ -449,16 +449,16 @@ PODS:
     - GenericJSON (~> 2.0)
     - Logging (~> 1.0.0)
     - secp256k1.swift (~> 0.1)
-  - XMTP (0.15.0):
+  - XMTP (0.16.2):
     - Connect-Swift (= 0.12.0)
     - GzipSwift
-    - LibXMTP (= 0.5.9-beta0)
+    - LibXMTP (= 0.6.0)
     - web3.swift
   - XMTPReactNative (0.1.0):
     - ExpoModulesCore
     - MessagePacker
     - secp256k1.swift
-    - XMTP (= 0.15.0)
+    - XMTP (= 0.16.2)
   - Yoga (1.14.0)
 
 DEPENDENCIES:
@@ -711,11 +711,11 @@ SPEC CHECKSUMS:
   GzipSwift: 893f3e48e597a1a4f62fafcb6514220fcf8287fa
   hermes-engine: d7cc127932c89c53374452d6f93473f1970d8e88
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
-  LibXMTP: 5a38722a68a9469be2e711857a5e7d9dd3aa8a61
+  LibXMTP: 059c6d51b2c59419941ecff600aa586bbe083673
   Logging: 9ef4ecb546ad3169398d5a723bc9bea1c46bef26
   MessagePacker: ab2fe250e86ea7aedd1a9ee47a37083edd41fd02
-  MMKV: 817ba1eea17421547e01e087285606eb270a8dcb
-  MMKVCore: af055b00e27d88cd92fad301c5fecd1ff9b26dd9
+  MMKV: f7d1d5945c8765f97f39c3d121f353d46735d801
+  MMKVCore: c04b296010fcb1d1638f2c69405096aac12f6390
   OpenSSL-Universal: 6e1ae0555546e604dbc632a2b9a24a9c46c41ef6
   RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1
   RCTRequired: e9df143e880d0e879e7a498dc06923d728809c79
@@ -763,8 +763,8 @@ SPEC CHECKSUMS:
   secp256k1.swift: a7e7a214f6db6ce5db32cc6b2b45e5c4dd633634
   SwiftProtobuf: 407a385e97fd206c4fbe880cc84123989167e0d1
   web3.swift: 2263d1e12e121b2c42ffb63a5a7beb1acaf33959
-  XMTP: 09faa347569b092005997364f7fe787ccc33f3d5
-  XMTPReactNative: 6404c11e6dd11820742d4af899daeea389fc442f
+  XMTP: 281c763321f3be82b3e5d91bfd79f107b1169e30
+  XMTPReactNative: 2428cbce29fca3ca3e7682b096765ccf3dca739f
   Yoga: e71803b4c1fff832ccf9b92541e00f9b873119b9
 
 PODFILE CHECKSUM: 0e6fe50018f34e575d38dc6a1fdf1f99c9596cdd