diff --git a/library/src/androidTest/java/org/xmtp/android/library/ClientTest.kt b/library/src/androidTest/java/org/xmtp/android/library/ClientTest.kt index 154a7272d..53b4cfcb0 100644 --- 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 index 2db2485ca..648d0d31c 100644 --- 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 index ceb459d88..06b6501cb 100644 --- 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 index 087b76d95..f426a5b5f 100644 --- 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) } diff --git a/library/src/main/java/xmtpv3.kt b/library/src/main/java/xmtpv3.kt index c023acb1a..9e783a4f3 100644 --- a/library/src/main/java/xmtpv3.kt +++ b/library/src/main/java/xmtpv3.kt @@ -1430,9 +1430,7 @@ internal interface UniffiLib : Library { ): Unit fun uniffi_xmtpv3_fn_method_ffixmtpclient_add_wallet( - `ptr`: Pointer, - `existingWalletAddress`: RustBuffer.ByValue, - `newWalletAddress`: RustBuffer.ByValue, + `ptr`: Pointer, `newWalletAddress`: RustBuffer.ByValue, ): Long fun uniffi_xmtpv3_fn_method_ffixmtpclient_addresses_from_inbox_id( @@ -2572,7 +2570,7 @@ private fun uniffiCheckApiChecksums(lib: UniffiLib) { if (lib.uniffi_xmtpv3_checksum_method_ffiv2subscriptioncallback_on_error() != 24930.toShort()) { throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project") } - if (lib.uniffi_xmtpv3_checksum_method_ffixmtpclient_add_wallet() != 23786.toShort()) { + if (lib.uniffi_xmtpv3_checksum_method_ffixmtpclient_add_wallet() != 24482.toShort()) { throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project") } if (lib.uniffi_xmtpv3_checksum_method_ffixmtpclient_addresses_from_inbox_id() != 29264.toShort()) { @@ -8240,12 +8238,9 @@ public object FfiConverterTypeFfiV2SubscriptionCallback : public interface FfiXmtpClientInterface { /** - * Adds an identity - really a wallet address - to the existing client + * Adds a wallet address to the existing client */ - suspend fun `addWallet`( - `existingWalletAddress`: kotlin.String, - `newWalletAddress`: kotlin.String, - ): FfiSignatureRequest + suspend fun `addWallet`(`newWalletAddress`: kotlin.String): FfiSignatureRequest /** * * Get the inbox state for each `inbox_id`. @@ -8417,19 +8412,15 @@ open class FfiXmtpClient : Disposable, AutoCloseable, FfiXmtpClientInterface { /** - * Adds an identity - really a wallet address - to the existing client + * Adds a wallet address to the existing client */ @Throws(GenericException::class) @Suppress("ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE") - override suspend fun `addWallet`( - `existingWalletAddress`: kotlin.String, - `newWalletAddress`: kotlin.String, - ): FfiSignatureRequest { + override suspend fun `addWallet`(`newWalletAddress`: kotlin.String): FfiSignatureRequest { return uniffiRustCallAsync( callWithPointer { thisPtr -> UniffiLib.INSTANCE.uniffi_xmtpv3_fn_method_ffixmtpclient_add_wallet( thisPtr, - FfiConverterString.lower(`existingWalletAddress`), FfiConverterString.lower(`newWalletAddress`), ) }, diff --git a/library/src/main/jniLibs/arm64-v8a/libuniffi_xmtpv3.so b/library/src/main/jniLibs/arm64-v8a/libuniffi_xmtpv3.so index 6297ead10..1573171d2 100644 Binary files a/library/src/main/jniLibs/arm64-v8a/libuniffi_xmtpv3.so and b/library/src/main/jniLibs/arm64-v8a/libuniffi_xmtpv3.so differ diff --git a/library/src/main/jniLibs/armeabi-v7a/libuniffi_xmtpv3.so b/library/src/main/jniLibs/armeabi-v7a/libuniffi_xmtpv3.so index d69fd01f4..9429f2fea 100644 Binary files a/library/src/main/jniLibs/armeabi-v7a/libuniffi_xmtpv3.so and b/library/src/main/jniLibs/armeabi-v7a/libuniffi_xmtpv3.so differ diff --git a/library/src/main/jniLibs/x86/libuniffi_xmtpv3.so b/library/src/main/jniLibs/x86/libuniffi_xmtpv3.so index 363585581..d1fbd70e8 100644 Binary files a/library/src/main/jniLibs/x86/libuniffi_xmtpv3.so and b/library/src/main/jniLibs/x86/libuniffi_xmtpv3.so differ diff --git a/library/src/main/jniLibs/x86_64/libuniffi_xmtpv3.so b/library/src/main/jniLibs/x86_64/libuniffi_xmtpv3.so index 8ac54101c..47a729266 100644 Binary files a/library/src/main/jniLibs/x86_64/libuniffi_xmtpv3.so and b/library/src/main/jniLibs/x86_64/libuniffi_xmtpv3.so differ