Update the FFI version to v1.11.0-rc.0

tari-project · Jan 30, 2025 · dd9175e · dd9175e
1 parent 2ec090a
commit dd9175e
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 21 deletions.
diff --git a/app/src/main/cpp/jniCompletedTransaction.cpp b/app/src/main/cpp/jniCompletedTransaction.cpp
@@ -131,7 +131,7 @@ Java_com_tari_android_wallet_ffi_FFICompletedTx_jniGetMessage(
         jobject error) {
     return ExecuteWithError<jstring>(jEnv, error, [&](int *errorPointer) {
         auto pCompletedTx = GetPointerField<TariCompletedTransaction *>(jEnv, jThis);
-        const char *pMessage = completed_transaction_get_message(pCompletedTx, errorPointer);
+        const char *pMessage = completed_transaction_get_payment_id(pCompletedTx, errorPointer);
         jstring result = jEnv->NewStringUTF(pMessage);
         string_destroy(const_cast<char *>(pMessage));
         return result;

diff --git a/app/src/main/cpp/jniPendingInboundTransaction.cpp b/app/src/main/cpp/jniPendingInboundTransaction.cpp
@@ -83,7 +83,7 @@ Java_com_tari_android_wallet_ffi_FFIPendingInboundTx_jniGetMessage(
         jobject error) {
     return ExecuteWithError<jstring>(jEnv, error, [&](int *errorPointer) {
         auto pInboundTx = GetPointerField<TariPendingInboundTransaction *>(jEnv, jThis);
-        const char *pMessage = pending_inbound_transaction_get_message(pInboundTx, errorPointer);
+        const char *pMessage = pending_inbound_transaction_get_payment_id(pInboundTx, errorPointer);
         jstring result = jEnv->NewStringUTF(pMessage);
         string_destroy(const_cast<char *>(pMessage));
         return result;

diff --git a/app/src/main/cpp/jniPendingOutboundTransaction.cpp b/app/src/main/cpp/jniPendingOutboundTransaction.cpp
@@ -96,7 +96,7 @@ Java_com_tari_android_wallet_ffi_FFIPendingOutboundTx_jniGetMessage(
         jobject error) {
     return ExecuteWithError<jstring>(jEnv, error, [&](int *errorPointer) {
         auto pOutboundTx = GetPointerField<TariPendingOutboundTransaction *>(jEnv, jThis);
-        const char *pMessage = pending_outbound_transaction_get_message(pOutboundTx, errorPointer);
+        const char *pMessage = pending_outbound_transaction_get_payment_id(pOutboundTx, errorPointer);
         jstring result = jEnv->NewStringUTF(pMessage);
         string_destroy(const_cast<char *>(pMessage));
         return result;

diff --git a/app/src/main/cpp/jniWallet.cpp b/app/src/main/cpp/jniWallet.cpp
@@ -1126,16 +1126,14 @@ Java_com_tari_android_wallet_ffi_FFIWallet_jniSendTx(
         jobject jDestination,
         jstring jAmount,
         jstring jFeePerGram,
-        jstring jMessage,
-        jboolean jOneSided,
         jstring jPaymentId,
+        jboolean jOneSided,
         jobject error) {
     return ExecuteWithError<jbyteArray>(jEnv, error, [&](int *errorPointer) {
         auto pWallet = GetPointerField<TariWallet *>(jEnv, jThis);
         auto pDestination = GetPointerField<TariWalletAddress *>(jEnv, jDestination);
         const char *nativeAmount = jEnv->GetStringUTFChars(jAmount, JNI_FALSE);
         const char *nativeFeePerGram = jEnv->GetStringUTFChars(jFeePerGram, JNI_FALSE);
-        const char *pMessage = jEnv->GetStringUTFChars(jMessage, JNI_FALSE);
         const char *pPaymentId = jEnv->GetStringUTFChars(jPaymentId, JNI_FALSE);
         char *pAmountEnd;
         char *pFeeEnd;
@@ -1144,11 +1142,11 @@ Java_com_tari_android_wallet_ffi_FFIWallet_jniSendTx(
 
         jbyteArray result = getBytesFromUnsignedLongLong(
                 jEnv,
-                wallet_send_transaction(pWallet, pDestination, amount, nullptr, feePerGram, pMessage,
+                wallet_send_transaction(pWallet, pDestination, amount, nullptr, feePerGram,
                                         jOneSided, pPaymentId, errorPointer));
         jEnv->ReleaseStringUTFChars(jAmount, nativeAmount);
         jEnv->ReleaseStringUTFChars(jFeePerGram, nativeFeePerGram);
-        jEnv->ReleaseStringUTFChars(jMessage, pMessage);
+        jEnv->ReleaseStringUTFChars(jPaymentId, pPaymentId);
         return result;
     });
 }

diff --git a/app/src/main/java/com/tari/android/wallet/application/walletManager/WalletManager.kt b/app/src/main/java/com/tari/android/wallet/application/walletManager/WalletManager.kt
@@ -407,11 +407,10 @@ class WalletManager @Inject constructor(
         feePerGram: MicroTari,
         message: String,
         isOneSidePayment: Boolean,
-        paymentId: String,
     ): TxId {
         val recipientAddress = FFITariWalletAddress(Base58String(tariContact.walletAddress.fullBase58))
 
-        val txId = requireWalletInstance.sendTx(recipientAddress, amount.value, feePerGram.value, message, isOneSidePayment, paymentId)
+        val txId = requireWalletInstance.sendTx(recipientAddress, amount.value, feePerGram.value, message, isOneSidePayment)
         walletNotificationManager.addOutboundTxNotification(txId, recipientAddress)
 
         recipientAddress.destroy()

diff --git a/app/src/main/java/com/tari/android/wallet/ffi/FFIWallet.kt b/app/src/main/java/com/tari/android/wallet/ffi/FFIWallet.kt
@@ -144,7 +144,6 @@ class FFIWallet(
         feePerGram: String,
         message: String,
         oneSided: Boolean,
-        paymentId: String,
         libError: FFIError
     ): ByteArray
 
@@ -328,15 +327,14 @@ class FFIWallet(
         feePerGram: BigInteger,
         message: String,
         isOneSided: Boolean,
-        paymentId: String,
     ): TxId {
         if (amount < BigInteger.valueOf(0L)) {
             throw FFIException(message = "Amount is less than 0.")
         }
         if (destination == getWalletAddress()) {
             throw FFIException(message = "Tx source and destination are the same.")
         }
-        val txIdBytes = runWithError { jniSendTx(destination, amount.toString(), feePerGram.toString(), message, isOneSided, paymentId, it) }
+        val txIdBytes = runWithError { jniSendTx(destination, amount.toString(), feePerGram.toString(), message, isOneSided, it) }
         return BigInteger(1, txIdBytes)
     }
 

diff --git a/app/src/main/java/com/tari/android/wallet/ui/screen/send/common/TransactionData.kt b/app/src/main/java/com/tari/android/wallet/ui/screen/send/common/TransactionData.kt
@@ -1,8 +1,8 @@
 package com.tari.android.wallet.ui.screen.send.common
 
 import android.os.Parcelable
-import com.tari.android.wallet.model.MicroTari
 import com.tari.android.wallet.data.contacts.model.ContactDto
+import com.tari.android.wallet.model.MicroTari
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
@@ -14,8 +14,5 @@ data class TransactionData(
     val isOneSidePayment: Boolean,
 ) : Parcelable {
     val message: String
-        get() = if (isOneSidePayment) "" else note.orEmpty()
-
-    val paymentId: String
-        get() = if (isOneSidePayment) note.orEmpty() else ""
+        get() = note.orEmpty()
 }
diff --git a/app/src/main/java/com/tari/android/wallet/ui/screen/send/finalize/FinalizeSendTxViewModel.kt b/app/src/main/java/com/tari/android/wallet/ui/screen/send/finalize/FinalizeSendTxViewModel.kt
@@ -225,7 +225,6 @@ class FinalizeSendTxViewModel(savedState: SavedStateHandle) : CommonViewModel()
                         feePerGram = transactionData.feePerGram ?: Constants.Wallet.DEFAULT_FEE_PER_GRAM,
                         message = transactionData.message,
                         isOneSidePayment = transactionData.isOneSidePayment,
-                        paymentId = transactionData.paymentId,
                     )
 
                     logger.i("Tx sent: $txId")

diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt
@@ -1,13 +1,13 @@
 object BuildConfig {
 
-    const val versionNumber = "0.31.1"
+    const val versionNumber = "0.31.2"
 
     const val minSdk = 26
     const val targetSdk = 34
     const val compileSdk = 35
 
     object LibWallet {
-        const val version = "v1.9.1-rc.0"
+        const val version = "v1.11.0-rc.0"
         const val minValidVersion = "v1.4.1-rc.0"
 
         const val hostURL = "https://github.com/tari-project/tari/releases/download/"