Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove legacy sign method #171

Merged
merged 6 commits into from
Feb 5, 2024
Merged

Remove legacy sign method #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
113a7cc
remove legacy sign method
nplasterer Feb 5, 2024
205a9dc
bump to the latest xmtp
nplasterer Feb 5, 2024
19a747e
fix the 23
nplasterer Feb 5, 2024
0e0362b
fix the signing logic
nplasterer Feb 5, 2024
9543aeb
fix linter
nplasterer Feb 5, 2024
40afdac
fix tests
nplasterer Feb 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 2 additions & 26 deletions example/src/main/java/org/xmtp/android/example/account/WalletConnectV2Account.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 2 additions & 6 deletions library/src/androidTest/java/org/xmtp/android/library/TestHelpers.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
17 changes: 10 additions & 7 deletions library/src/main/java/org/xmtp/android/library/Client.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -335,14 +336,16 @@ class Client() {
null
}

if (v3Client?.textToSign() == null) {
v3Client?.registerIdentity(null)
} else if (account != null) {
v3Client.textToSign()?.let {
v3Client.registerIdentity(account.sign(it))
if (v3Client != null) {
if (v3Client.textToSign() == null) {
v3Client.registerIdentity(null)
} else if (account != null) {
v3Client.textToSign()?.let {
v3Client.registerIdentity(account.sign(it)?.rawData)
}
} else {
throw XMTPException("No signer passed but signer was required.")
}
} else {
Log.i(TAG, "No signer passed but signer was required.")
}

return v3Client
Expand Down
6 changes: 2 additions & 4 deletions library/src/main/java/org/xmtp/android/library/SigningKey.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?
}

/**
Expand Down Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion library/src/main/java/org/xmtp/android/library/messages/EncryptedPrivateKeyBundle.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ fun EncryptedPrivateKeyBundle.decrypted(
}

val signature = runBlocking {
key.signLegacy(
key.sign(
message = Signature.newBuilder().build()
.enableIdentityText(key = v1.walletPreKey.toByteArray()),
)
Expand Down
12 changes: 1 addition & 11 deletions library/src/main/java/org/xmtp/android/library/messages/PrivateKey.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import org.xmtp.android.library.KeyUtil
import org.xmtp.android.library.SigningKey
import org.xmtp.proto.message.contents.PublicKeyOuterClass
import org.xmtp.proto.message.contents.SignatureOuterClass
import java.nio.charset.StandardCharsets
import java.security.SecureRandom
import java.util.Date

Expand Down Expand Up @@ -93,16 +92,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)
}
Expand Down
2 changes: 1 addition & 1 deletion library/src/main/java/org/xmtp/android/library/messages/PrivateKeyBundle.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Binary file modified library/src/main/jniLibs/arm64-v8a/libuniffi_xmtpv3.so
View file
Open in desktop
Binary file not shown.
Binary file modified library/src/main/jniLibs/armeabi-v7a/libuniffi_xmtpv3.so
View file
Open in desktop
Binary file not shown.
Binary file modified library/src/main/jniLibs/x86/libuniffi_xmtpv3.so
View file
Open in desktop
Binary file not shown.
Binary file modified library/src/main/jniLibs/x86_64/libuniffi_xmtpv3.so
View file
Open in desktop
Binary file not shown.
8 changes: 2 additions & 6 deletions library/src/test/java/org/xmtp/android/library/TestHelpers.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
Loading