Require only 1 signature to add a wallet (#337)

* bump to latest * support only one signature for add wallet
xmtp · Nov 22, 2024 · 0e831ca · 0e831ca
1 parent 3416280
commit 0e831ca
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 26 deletions.
diff --git a/library/src/androidTest/java/org/xmtp/android/library/ClientTest.kt b/library/src/androidTest/java/org/xmtp/android/library/ClientTest.kt
@@ -419,8 +419,8 @@ class ClientTest {
         val fixtures = fixtures()
         val alix2Wallet = PrivateKeyBuilder()
         val alix3Wallet = PrivateKeyBuilder()
-        runBlocking { fixtures.alixClient.addAccount(fixtures.alixAccount, alix2Wallet) }
-        runBlocking { fixtures.alixClient.addAccount(fixtures.alixAccount, alix3Wallet) }
+        runBlocking { fixtures.alixClient.addAccount(alix2Wallet) }
+        runBlocking { fixtures.alixClient.addAccount(alix3Wallet) }
 
         val state = runBlocking { fixtures.alixClient.inboxState(true) }
         assertEquals(state.installations.size, 1)
@@ -441,8 +441,8 @@ class ClientTest {
         val fixtures = fixtures()
         val alix2Wallet = PrivateKeyBuilder()
         val alix3Wallet = PrivateKeyBuilder()
-        runBlocking { fixtures.alixClient.addAccount(fixtures.alixAccount, alix2Wallet) }
-        runBlocking { fixtures.alixClient.addAccount(fixtures.alixAccount, alix3Wallet) }
+        runBlocking { fixtures.alixClient.addAccount(alix2Wallet) }
+        runBlocking { fixtures.alixClient.addAccount(alix3Wallet) }
 
         var state = runBlocking { fixtures.alixClient.inboxState(true) }
         assertEquals(state.addresses.size, 3)

diff --git a/library/src/androidTest/java/org/xmtp/android/library/SmartContractWalletTest.kt b/library/src/androidTest/java/org/xmtp/android/library/SmartContractWalletTest.kt
@@ -92,8 +92,8 @@ class SmartContractWalletTest {
         val davonEOA = PrivateKeyBuilder()
         val davonSCW2 = FakeSCWWallet.generate(ANVIL_TEST_PRIVATE_KEY_3)
 
-        runBlocking { davonSCWClient.addAccount(davonSCW, davonEOA) }
-        runBlocking { davonSCWClient.addAccount(davonSCW, davonSCW2) }
+        runBlocking { davonSCWClient.addAccount(davonEOA) }
+        runBlocking { davonSCWClient.addAccount(davonSCW2) }
 
         var state = runBlocking { davonSCWClient.inboxState(true) }
         assertEquals(state.installations.size, 1)

diff --git a/library/src/main/java/libxmtp-version.txt b/library/src/main/java/libxmtp-version.txt
@@ -1,3 +1,3 @@
-Version: cbff7296
+Version: d07fb2bf
 Branch: main
-Date: 2024-11-21 17:51:27 +0000
+Date: 2024-11-22 18:36:31 +0000
diff --git a/library/src/main/java/org/xmtp/android/library/Client.kt b/library/src/main/java/org/xmtp/android/library/Client.kt
@@ -198,10 +198,9 @@ class Client() {
         ffiClient.applySignatureRequest(signatureRequest)
     }
 
-    suspend fun addAccount(recoverAccount: SigningKey, newAccount: SigningKey) {
+    suspend fun addAccount(newAccount: SigningKey) {
         val signatureRequest =
-            ffiClient.addWallet(address.lowercase(), newAccount.address.lowercase())
-        handleSignature(signatureRequest, recoverAccount)
+            ffiClient.addWallet(newAccount.address.lowercase())
         handleSignature(signatureRequest, newAccount)
         ffiClient.applySignatureRequest(signatureRequest)
     }