remove legacy sign method

Author: nplasterer

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

@@ -26,34 +26,10 @@ data class WalletConnectV2Account(
         )
 
     override suspend fun sign(data: ByteArray): SignatureOuterClass.Signature? {
-        return signLegacy(String(data))
+        return sign(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 signLegacy(message: String): SignatureOuterClass.Signature? {
+    override suspend fun sign(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/src/androidTest/java/org/xmtp/android/library/TestHelpers.kt

@@ -47,12 +47,8 @@ class FakeWallet : SigningKey {
         return signature
     }
 
-    override fun sign(text: String): ByteArray {
-        return privateKeyBuilder.sign(text)
-    }
-
-    override suspend fun signLegacy(message: String): Signature {
-        val signature = privateKeyBuilder.signLegacy(message)
+    override suspend fun sign(message: String): Signature {
+        val signature = privateKeyBuilder.sign(message)
         return signature
     }
 

library/src/main/java/org/xmtp/android/library/Client.kt

@@ -33,6 +33,7 @@ import org.xmtp.android.library.messages.encrypted
 import org.xmtp.android.library.messages.ensureWalletSignature
 import org.xmtp.android.library.messages.generate
 import org.xmtp.android.library.messages.getPublicKeyBundle
+import org.xmtp.android.library.messages.rawData
 import org.xmtp.android.library.messages.recoverWalletSignerPublicKey
 import org.xmtp.android.library.messages.toPublicKeyBundle
 import org.xmtp.android.library.messages.toV2
@@ -339,7 +340,7 @@ class Client() {
             v3Client?.registerIdentity(null)
         } else if (account != null) {
             v3Client.textToSign()?.let {
-                v3Client.registerIdentity(account.sign(it))
+                v3Client.registerIdentity(account.sign(it)?.rawData)
             }
         } else {
             Log.i(TAG, "No signer passed but signer was required.")

library/src/main/java/org/xmtp/android/library/SigningKey.kt

@@ -21,9 +21,7 @@ interface SigningKey {
 
     suspend fun sign(data: ByteArray): SignatureOuterClass.Signature?
 
-    suspend fun signLegacy(message: String): SignatureOuterClass.Signature?
-
-    fun sign(text: String): ByteArray
+    suspend fun sign(message: String): SignatureOuterClass.Signature?
 }
 
 /**
@@ -52,7 +50,7 @@ fun SigningKey.createIdentity(
     val signatureClass = Signature.newBuilder().build()
     val signatureText = signatureClass.createIdentityText(key = slimKey.toByteArray())
     val digest = signatureClass.ethHash(message = signatureText)
-    val signature = runBlocking { signLegacy(signatureText) } ?: throw XMTPException("Illegal signature")
+    val signature = runBlocking { sign(signatureText) } ?: throw XMTPException("Illegal signature")
 
     val signatureData = KeyUtil.getSignatureData(signature.rawData.toByteString().toByteArray())
     val publicKey = Sign.recoverFromSignature(

library/src/main/java/org/xmtp/android/library/messages/EncryptedPrivateKeyBundle.kt

@@ -19,7 +19,7 @@ fun EncryptedPrivateKeyBundle.decrypted(
     }
 
     val signature = runBlocking {
-        key.signLegacy(
+        key.sign(
             message = Signature.newBuilder().build()
                 .enableIdentityText(key = v1.walletPreKey.toByteArray()),
         )

library/src/main/java/org/xmtp/android/library/messages/PrivateKey.kt

@@ -93,16 +93,7 @@ class PrivateKeyBuilder : SigningKey {
         }.build()
     }
 
-    override fun sign(text: String): ByteArray {
-        val messageBytes: ByteArray = text.toByteArray(StandardCharsets.UTF_8)
-        val signature = Sign.signPrefixedMessage(
-            messageBytes,
-            ECKeyPair.create(privateKey.secp256K1.bytes.toByteArray())
-        )
-        return signature.r + signature.s + signature.v
-    }
-
-    override suspend fun signLegacy(message: String): SignatureOuterClass.Signature {
+    override suspend fun sign(message: String): SignatureOuterClass.Signature {
         val digest = Signature.newBuilder().build().ethHash(message)
         return sign(digest)
     }

library/src/main/java/org/xmtp/android/library/messages/PrivateKeyBundle.kt

@@ -36,7 +36,7 @@ fun PrivateKeyBundle.encrypted(
 
     val signature =
         runBlocking {
-            key.signLegacy(
+            key.sign(
                 message = Signature.newBuilder().build().enableIdentityText(key = walletPreKey)
             )
         } ?: throw XMTPException("Illegal signature")

library/src/main/java/xmtpv3.kt

@@ -3253,7 +3253,7 @@ public object FfiConverterSequenceBoolean: FfiConverterRustBuffer<List<Boolean>>
 
     override fun write(value: List<Boolean>, buf: ByteBuffer) {
         buf.putInt(value.size)
-        value.iterator().forEach {
+        value.forEach {
             FfiConverterBoolean.write(it, buf)
         }
     }
@@ -3278,7 +3278,7 @@ public object FfiConverterSequenceString: FfiConverterRustBuffer<List<String>> {
 
     override fun write(value: List<String>, buf: ByteBuffer) {
         buf.putInt(value.size)
-        value.iterator().forEach {
+        value.forEach {
             FfiConverterString.write(it, buf)
         }
     }
@@ -3303,7 +3303,7 @@ public object FfiConverterSequenceByteArray: FfiConverterRustBuffer<List<ByteArr
 
     override fun write(value: List<ByteArray>, buf: ByteBuffer) {
         buf.putInt(value.size)
-        value.iterator().forEach {
+        value.forEach {
             FfiConverterByteArray.write(it, buf)
         }
     }
@@ -3328,7 +3328,7 @@ public object FfiConverterSequenceTypeFfiGroup: FfiConverterRustBuffer<List<FfiG
 
     override fun write(value: List<FfiGroup>, buf: ByteBuffer) {
         buf.putInt(value.size)
-        value.iterator().forEach {
+        value.forEach {
             FfiConverterTypeFfiGroup.write(it, buf)
         }
     }
@@ -3353,7 +3353,7 @@ public object FfiConverterSequenceTypeFfiEnvelope: FfiConverterRustBuffer<List<F
 
     override fun write(value: List<FfiEnvelope>, buf: ByteBuffer) {
         buf.putInt(value.size)
-        value.iterator().forEach {
+        value.forEach {
             FfiConverterTypeFfiEnvelope.write(it, buf)
         }
     }
@@ -3378,7 +3378,7 @@ public object FfiConverterSequenceTypeFfiGroupMember: FfiConverterRustBuffer<Lis
 
     override fun write(value: List<FfiGroupMember>, buf: ByteBuffer) {
         buf.putInt(value.size)
-        value.iterator().forEach {
+        value.forEach {
             FfiConverterTypeFfiGroupMember.write(it, buf)
         }
     }
@@ -3403,7 +3403,7 @@ public object FfiConverterSequenceTypeFfiMessage: FfiConverterRustBuffer<List<Ff
 
     override fun write(value: List<FfiMessage>, buf: ByteBuffer) {
         buf.putInt(value.size)
-        value.iterator().forEach {
+        value.forEach {
             FfiConverterTypeFfiMessage.write(it, buf)
         }
     }
@@ -3428,7 +3428,7 @@ public object FfiConverterSequenceTypeFfiV2QueryRequest: FfiConverterRustBuffer<
 
     override fun write(value: List<FfiV2QueryRequest>, buf: ByteBuffer) {
         buf.putInt(value.size)
-        value.iterator().forEach {
+        value.forEach {
             FfiConverterTypeFfiV2QueryRequest.write(it, buf)
         }
     }
@@ -3453,7 +3453,7 @@ public object FfiConverterSequenceTypeFfiV2QueryResponse: FfiConverterRustBuffer
 
     override fun write(value: List<FfiV2QueryResponse>, buf: ByteBuffer) {
         buf.putInt(value.size)
-        value.iterator().forEach {
+        value.forEach {
             FfiConverterTypeFfiV2QueryResponse.write(it, buf)
         }
     }

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

@@ -51,8 +51,8 @@ class FakeWallet : SigningKey {
         return privateKeyBuilder.sign(text)
     }
 
-    override suspend fun signLegacy(message: String): Signature {
-        val signature = privateKeyBuilder.signLegacy(message)
+    override suspend fun sign(message: String): Signature {
+        val signature = privateKeyBuilder.sign(message)
         return signature
     }