Add Groups to Conversations

dev/local/docker-compose.yml

@@ -1,5 +1,5 @@
 services:
-  waku-node:
+  node:
     image: xmtp/node-go:latest
     platform: linux/amd64
     environment:
@@ -8,14 +8,30 @@ services:
       - --store.enable
       - --store.db-connection-string=postgres://postgres:xmtp@db:5432/postgres?sslmode=disable
       - --store.reader-db-connection-string=postgres://postgres:xmtp@db:5432/postgres?sslmode=disable
+      - --mls-store.db-connection-string=postgres://postgres:xmtp@mlsdb:5432/postgres?sslmode=disable
+      - --mls-validation.grpc-address=validation:50051
+      - --api.enable-mls
       - --wait-for-db=30s
       - --api.authn.enable
     ports:
-      - 9001:9001
       - 5555:5555
+      - 5556:5556
     depends_on:
       - db
+
+  validation:
+    image: xmtp/mls-validation-service:latest
+    platform: linux/amd64
+    build:
+      context: ../..
+      dockerfile: ./dev/validation_service/local.Dockerfile
+
   db:
     image: postgres:13
     environment:
-      POSTGRES_PASSWORD: xmtp
+      POSTGRES_PASSWORD: xmtp
+
+  mlsdb:
+    image: postgres:13
+    environment:
+      POSTGRES_PASSWORD: xmtp

example/src/main/java/org/xmtp/android/example/account/WalletConnectV2Account.kt

@@ -3,6 +3,7 @@ package org.xmtp.android.example.account
 import android.net.Uri
 import com.walletconnect.wcmodal.client.Modal
 import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.runBlocking
 import org.web3j.crypto.Keys
 import org.xmtp.android.example.connect.getPersonalSignBody
 import org.xmtp.android.example.extension.requestMethod
@@ -14,21 +15,39 @@ import org.xmtp.proto.message.contents.SignatureOuterClass
 data class WalletConnectV2Account(
     val session: Modal.Model.ApprovedSession,
     val chain: String,
-    private val sendSessionRequestDeepLink: (Uri) -> Unit
+    private val sendSessionRequestDeepLink: (Uri) -> Unit,
 ) :
     SigningKey {
-    override val address: String
-        get() = Keys.toChecksumAddress(
-            session.namespaces.getValue(chain).accounts[0].substringAfterLast(
-                ":"
-            )
-        )
 
     override suspend fun sign(data: ByteArray): SignatureOuterClass.Signature? {
-        return sign(String(data))
+        return signLegacy(String(data))
+    }
+
+    override fun sign(text: String): ByteArray {
+        val (parentChain, chainId, account) = session.namespaces.getValue(chain).accounts[0].split(":")
+        val requestParams = session.namespaces.getValue(chain).methods.find { method ->
+            method == "personal_sign"
+        }?.let { method ->
+            Modal.Params.Request(
+                sessionTopic = session.topic,
+                method = method,
+                params = getPersonalSignBody(text, account),
+                chainId = "$parentChain:$chainId"
+            )
+        }
+
+        runCatching {
+            runBlocking {
+                requestMethod(requestParams!!, sendSessionRequestDeepLink).first().getOrThrow()
+            }
+        }.onSuccess {
+            return it
+        }.onFailure {}
+
+        return byteArrayOf()
     }
 
-    override suspend fun sign(message: String): SignatureOuterClass.Signature? {
+    override suspend fun signLegacy(message: String): SignatureOuterClass.Signature? {
         val (parentChain, chainId, account) = session.namespaces.getValue(chain).accounts[0].split(":")
         val requestParams = session.namespaces.getValue(chain).methods.find { method ->
             method == "personal_sign"
@@ -50,4 +69,12 @@ data class WalletConnectV2Account(
 
         return null
     }
+
+    override fun getAddress(): String {
+        return Keys.toChecksumAddress(
+            session.namespaces.getValue(chain).accounts[0].substringAfterLast(
+                ":"
+            )
+        )
+    }
 }

example/src/main/java/org/xmtp/android/example/connect/ConnectWalletViewModel.kt

@@ -86,7 +86,7 @@ class ConnectWalletViewModel : ViewModel() {
                 val wallet = PrivateKeyBuilder()
                 val client = Client().create(wallet, ClientManager.CLIENT_OPTIONS)
                 _uiState.value = ConnectUiState.Success(
-                    wallet.address,
+                    wallet.getAddress(),
                     PrivateKeyBundleV1Builder.encodeData(client.privateKeyBundleV1)
                 )
             } catch (e: XMTPException) {
@@ -110,7 +110,7 @@ class ConnectWalletViewModel : ViewModel() {
                 }
                 val client = Client().create(wallet, ClientManager.CLIENT_OPTIONS)
                 _uiState.value = ConnectUiState.Success(
-                    wallet.address,
+                    wallet.getAddress(),
                     PrivateKeyBundleV1Builder.encodeData(client.privateKeyBundleV1)
                 )
             } catch (e: Exception) {

library/build.gradle

@@ -14,7 +14,7 @@ dokkaGfmPartial {
 
 ktlint {
     filter {
-        exclude { it.file.path.contains("xmtp_dh") }
+        exclude { it.file.path.contains("xmtp") }
     }
 }
 

library/src/androidTest/java/org/xmtp/android/library/ClientTest.kt

@@ -1,7 +1,9 @@
 package org.xmtp.android.library
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
 import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNull
 import org.junit.Assert.fail
 import org.junit.Ignore
 import org.junit.Test
@@ -39,7 +41,7 @@ class ClientTest {
         val v1Copy = PrivateKeyBundleV1Builder.fromEncodedData(encodedData)
         val client = Client().buildFrom(v1Copy)
         assertEquals(
-            wallet.address,
+            wallet.getAddress(),
             client.address,
         )
     }
@@ -78,12 +80,33 @@ class ClientTest {
         )
     }
 
+    @Test
+    fun testCreatesAV3Client() {
+        val context = InstrumentationRegistry.getInstrumentation().targetContext
+        val fakeWallet = PrivateKeyBuilder()
+        val client =
+            Client().create(
+                account = fakeWallet,
+                options = ClientOptions(enableLibXmtpV3 = true, appContext = context)
+            )
+        val v3Client = client.libXMTPClient
+        assertEquals(client.address.lowercase(), v3Client?.accountAddress()?.lowercase())
+    }
+
+    @Test
+    fun testDoesNotCreateAV3Client() {
+        val fakeWallet = PrivateKeyBuilder()
+        val client = Client().create(account = fakeWallet)
+        val v3Client = client.libXMTPClient
+        assertNull(v3Client)
+    }
+
     @Test
     fun testCanMessage() {
         val fixtures = fixtures()
         val notOnNetwork = PrivateKeyBuilder()
         val canMessage = fixtures.aliceClient.canMessage(fixtures.bobClient.address)
-        val cannotMessage = fixtures.aliceClient.canMessage(notOnNetwork.address)
+        val cannotMessage = fixtures.aliceClient.canMessage(notOnNetwork.getAddress())
         assert(canMessage)
         assert(!cannotMessage)
     }
@@ -97,8 +120,8 @@ class ClientTest {
         val aliceClient = Client().create(aliceWallet, opts)
         aliceClient.ensureUserContactPublished()
 
-        val canMessage = Client.canMessage(aliceWallet.address, opts)
-        val cannotMessage = Client.canMessage(notOnNetwork.address, opts)
+        val canMessage = Client.canMessage(aliceWallet.getAddress(), opts)
+        val cannotMessage = Client.canMessage(notOnNetwork.getAddress(), opts)
 
         assert(canMessage)
         assert(!cannotMessage)