Merge branch 'main' into gg/enhancement/add_sender_hmac_to_message_v2

Author: giovasdistillery

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,7 +15,7 @@ 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
@@ -25,10 +26,34 @@ data class WalletConnectV2Account(
         )
 
     override suspend fun sign(data: ByteArray): SignatureOuterClass.Signature? {
-        return sign(String(data))
+        return signLegacy(String(data))
     }
 
-    override suspend fun sign(message: String): SignatureOuterClass.Signature? {
+    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 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"

library/build.gradle

@@ -14,7 +14,7 @@ dokkaGfmPartial {
 
 ktlint {
     filter {
-        exclude { it.file.path.contains("xmtp_dh") }
+        exclude { it.file.path.contains("xmtpv3") }
     }
 }
 
@@ -23,7 +23,7 @@ android {
     compileSdk 33
 
     defaultConfig {
-        minSdk 22
+        minSdk 23
         targetSdk 33
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

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
@@ -78,6 +80,60 @@ class ClientTest {
         )
     }
 
+    @Test
+    fun testV3CanBeCreatedWithBundle() {
+        val context = InstrumentationRegistry.getInstrumentation().targetContext
+        val fakeWallet = PrivateKeyBuilder()
+        val options = ClientOptions(
+            ClientOptions.Api(XMTPEnvironment.LOCAL, false),
+            enableAlphaMls = true,
+            appContext = context
+        )
+        val client =
+            Client().create(account = fakeWallet, options = options)
+        assertEquals(
+            client.address.lowercase(),
+            client.libXMTPClient?.accountAddress()?.lowercase()
+        )
+
+        val bundle = client.privateKeyBundle
+        val clientFromV1Bundle = Client().buildFromBundle(bundle, account = fakeWallet, options = options)
+        assertEquals(client.address, clientFromV1Bundle.address)
+        assertEquals(
+            client.privateKeyBundleV1.identityKey,
+            clientFromV1Bundle.privateKeyBundleV1.identityKey,
+        )
+        assertEquals(
+            client.libXMTPClient?.accountAddress(),
+            clientFromV1Bundle.libXMTPClient?.accountAddress()
+        )
+    }
+
+    @Test
+    fun testCreatesAV3Client() {
+        val context = InstrumentationRegistry.getInstrumentation().targetContext
+        val fakeWallet = PrivateKeyBuilder()
+        val client =
+            Client().create(
+                account = fakeWallet,
+                options = ClientOptions(
+                    ClientOptions.Api(XMTPEnvironment.LOCAL, false),
+                    enableAlphaMls = 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()

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

@@ -135,6 +135,7 @@ class MessageTest {
     }
 
     @Test
+    @Ignore("Dev network flaky should be moved to local")
     fun testCanReadGzipCompressedMessages() {
         val ints = arrayOf(
             225, 2, 36, 98, 37, 243, 68, 234,
@@ -163,7 +164,7 @@ class MessageTest {
         assertEquals(client.apiClient.environment, XMTPEnvironment.DEV)
         val convo = client.conversations.list()[0]
         val message = convo.messages()[0]
-        assertEquals("hello gzip", message.content())
+        assertEquals("Test message", message.content())
     }
 
     @Test

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

@@ -42,18 +42,22 @@ class FakeWallet : SigningKey {
         }
     }
 
-    override val address: String
-        get() = privateKey.walletAddress
-
     override suspend fun sign(data: ByteArray): Signature {
         val signature = privateKeyBuilder.sign(data)
         return signature
     }
 
-    override suspend fun sign(message: String): Signature {
-        val signature = privateKeyBuilder.sign(message)
+    override fun sign(text: String): ByteArray {
+        return privateKeyBuilder.sign(text)
+    }
+
+    override suspend fun signLegacy(message: String): Signature {
+        val signature = privateKeyBuilder.signLegacy(message)
         return signature
     }
+
+    override val address: String
+        get() = privateKey.walletAddress
 }
 
 class FakeStreamHolder {