Wallet library v0.16.22 transaction confirmation and base node sync u…

…pdates.
tari-project · Feb 24, 2021 · 4c2f717 · 4c2f717
1 parent 74e76a9
commit 4c2f717
Show file tree

Hide file tree

Showing 47 changed files with 1,061 additions and 611 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,13 +11,13 @@ apply from: "../download-libwallet.gradle"
 apply plugin: 'io.sentry.android.gradle'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
     buildToolsVersion "29.0.3"
 
     defaultConfig {
         applicationId "com.tari.android.wallet"
         minSdkVersion 24
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode buildNumber
         versionName versionNumber + "-libwallet-" + libwalletVersion
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -156,9 +156,10 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     // coroutines
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.5"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1"
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.2.0"
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
     // kotlin extensions
     implementation 'androidx.core:core-ktx:1.3.2'
     // android
@@ -173,7 +174,7 @@ dependencies {
     // the new view pager
     implementation "androidx.viewpager2:viewpager2:1.0.0"
     // for tab layout
-    implementation 'com.google.android.material:material:1.2.1'
+    implementation 'com.google.android.material:material:1.3.0'
     // flex layout
     implementation 'com.google.android:flexbox:2.0.1'
     // overscroll
@@ -192,7 +193,7 @@ dependencies {
     implementation 'com.squareup:seismic:1.0.2'
 
     // biometric
-    implementation 'androidx.biometric:biometric:1.0.1'
+    implementation 'androidx.biometric:biometric:1.1.0'
 
     // joda
     implementation 'net.danlew:android.joda:2.10.9'
@@ -212,8 +213,6 @@ dependencies {
     // logger
     implementation 'com.orhanobut:logger:2.2.0'
 
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
-
     // QR scanner
     implementation 'com.budiyev.android:code-scanner:2.1.0'
     implementation 'com.journeyapps:zxing-android-embedded:4.1.0'

diff --git a/app/src/main/aidl/com/tari/android/wallet/model/Model.aidl b/app/src/main/aidl/com/tari/android/wallet/model/Model.aidl
@@ -47,3 +47,4 @@ parcelable CancelledTx;
 parcelable PendingInboundTx;
 parcelable PendingOutboundTx;
 parcelable PublicKey;
+parcelable ValidationResult;
diff --git a/app/src/main/aidl/com/tari/android/wallet/service/TariWalletService.aidl b/app/src/main/aidl/com/tari/android/wallet/service/TariWalletService.aidl
@@ -82,12 +82,12 @@ interface TariWalletService {
         out WalletError error
     );
 
-    RequestId syncWithBaseNode(out WalletError error);
+    boolean startBaseNodeSync(out WalletError error);
 
     TxId sendTari(
         in User contact,
         in MicroTari amount,
-        in MicroTari fee,
+        in MicroTari feePerGram,
         String message,
         out WalletError error
     );

diff --git a/app/src/main/aidl/com/tari/android/wallet/service/TariWalletServiceListener.aidl b/app/src/main/aidl/com/tari/android/wallet/service/TariWalletServiceListener.aidl
@@ -39,8 +39,6 @@ import com.tari.android.wallet.model.Model;
 
 oneway interface TariWalletServiceListener {
 
-    void onBaseNodeSyncComplete(in RequestId requestId, in boolean success);
-
     void onTxReceived(in PendingInboundTx pendingInboundTx);
 
     void onTxReplyReceived(in PendingOutboundTx pendingOutboundTx);
@@ -53,16 +51,18 @@ oneway interface TariWalletServiceListener {
 
     void onTxMined(in CompletedTx completed);
 
+    void onTxMinedUnconfirmed(in CompletedTx completed, in int confirmationCount);
+
     void onTxCancelled(in CancelledTx tx);
 
     void onDirectSendResult(in TxId txId, in boolean success);
 
     void onStoreAndForwardSendResult(in TxId txId, in boolean success);
 
+    void onBaseNodeSyncComplete(in boolean success);
+
     void onTestnetTariRequestSuccess();
 
     void onTestnetTariRequestError(in String error);
 
-    void onStoreAndForwardMessagesReceived();
-
 }