chore: merge feature-dashdirect

exploredata.rb → .deploy/exploredata.rb

@@ -26,12 +26,13 @@
 bucket = storage.bucket bucket_name, skip_lookup: true
 file = bucket.file file_name
 timestamp = file.updated_at.strftime("%Q")
-target_file_path = "#{assets_path}#{file_name}"
+target_file_name = "explore/explore.db"
+target_file_path = "#{assets_path}#{target_file_name}"
 
 # create output file
 # out_file = File.new(target_file_path, "w")
 # out_file.close
 
 file.download target_file_path
 
-puts "Downloaded #{file.name} to #{target_file_path}"
+puts "Downloaded #{file.name} to #{target_file_path}"

.github/workflows/dashwallet.yml

@@ -39,7 +39,7 @@ jobs:
         ruby-version: '3.0.3'
 
     - name: Generate cache key
-      run: bash ./checksum.sh checksum.txt
+      run: bash .deploy/checksum.sh checksum.txt
 
     - name: Gem caching
       uses: actions/cache@v2
@@ -88,7 +88,7 @@ jobs:
       run: |
         gem install google-cloud-storage
         rm  -rf wallet/assets/explore/*
-        ruby ./exploredata.rb "${{ github.event.inputs.flavor }}"
+        ruby .deploy/exploredata.rb "${{ github.event.inputs.flavor }}"
 
     - name: Test
       run: bundle exec fastlane test flavor:"" type:"debug"

.github/workflows/ktlint.yml

@@ -0,0 +1,33 @@
+name: Code format check
+
+on:
+  pull_request:
+    branches: [ master, feature-*, bugfix-*, dashpay-* ]
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+
+    steps:
+
+    - uses: actions/checkout@v3
+    - name: set up JDK
+      uses: actions/setup-java@v3
+      with:
+        java-version: '11'
+        distribution: 'adopt'
+        cache: gradle
+
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+
+    - name: Extract Secrets
+      run: |
+        echo "$GOOGLE_SERVICES_JSON" > wallet/google-services.json
+        echo "$LOCAL_PROPERTIES" > local.properties
+      env:
+        GOOGLE_SERVICES_JSON : ${{secrets.GOOGLE_SERVICES_JSON}}
+        LOCAL_PROPERTIES: ${{secrets.LOCAL_PROPERTIES}}
+
+    - name: Ktlint
+      run: ./gradlew ktlintCheck

.github/workflows/manual_distribution.yml

@@ -74,7 +74,7 @@ jobs:
         ruby-version: '3.0.3'
 
     - name: Generate cache key
-      run: bash ./checksum.sh checksum.txt
+      run: bash .deploy/checksum.sh checksum.txt
 
     - name: Gem caching
       uses: actions/cache@v2
@@ -123,10 +123,10 @@ jobs:
       run: |
         gem install google-cloud-storage
         rm  -rf wallet/assets/explore/*
-        ruby ./exploredata.rb "${{ github.event.inputs.flavor }}"
+        ruby .deploy/exploredata.rb "${{ github.event.inputs.flavor }}"
 
     - name: Test
       run: bundle exec fastlane test flavor:"${{ github.event.inputs.flavor }}" type:"${{ github.event.inputs.type }}" version_code:"${{ env.build_number }}" store_pass:"${{ secrets.SIGNING_STORE_PASS }}"
 
     - name: Build and Firebase Distribution
-      run: bundle exec fastlane build_distribute flavor:"${{ github.event.inputs.flavor }}" type:"${{ github.event.inputs.type }}" version_code:"${{ env.build_number }}" store_pass:"${{ secrets.SIGNING_STORE_PASS }}" comment:"${{ github.event.inputs.taskID }}" app_id:"${{ env.firebase_app_id }}" test_group:"qa"
+      run: bundle exec fastlane build_distribute flavor:"${{ github.event.inputs.flavor }}" type:"${{ github.event.inputs.type }}" version_code:"${{ env.build_number }}" store_pass:"${{ secrets.SIGNING_STORE_PASS }}" comment:"${{ github.event.inputs.taskID }}" app_id:"${{ env.firebase_app_id }}" test_group:"qa"

build.gradle

@@ -1,7 +1,7 @@
 buildscript {
     ext {
         kotlin_version = '1.8.22'
-        coroutines_version = '1.6.1'
+        coroutinesVersion = '1.6.4'
         ok_http_version = '4.9.1'
         dashjVersion = '19.0.3'
         hiltVersion = '2.45'
@@ -13,9 +13,13 @@ buildscript {
         appCompatVersion = '1.4.2'
 
         // Architecture
-        lifecycleVersion = '2.3.1'
-        navigationVersion = '2.5.2'
+        lifecycleVersion = '2.5.1'
+        navigationVersion = '2.5.3'
         datastoreVersion = "1.0.0"
+        hiltVersion = '2.45'
+        hiltWorkVersion = '1.0.0'
+        serializationVersion = '1.0.1'
+        preferenceVersion = '1.2.0'
 
         // Utils
         slf4jVersion = '1.7.32'
@@ -27,9 +31,11 @@ buildscript {
         constrainLayoutVersion = '2.1.4'
         recyclerViewVersion = "1.2.1"
         glideVersion = '4.12.0'
+        zxingVersion = '3.3.3' // Don't update. 3.3.3 is the maximum to support Android 6.x
 
         // Tests
         junitVersion = '4.13.2'
+        testCoreVersion = '1.5.0'
         mockitoVersion = '4.0.0'
         espressoVersion = '3.4.0'
         coilVersion = '1.4.0'

common/build.gradle

@@ -52,7 +52,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation "org.dashj:dashj-core:$dashjVersion"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
 
     // Firebase
     implementation platform("com.google.firebase:firebase-bom:$firebaseVersion")
@@ -74,6 +74,7 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion"
     implementation "androidx.datastore:datastore-preferences:1.0.0"
     implementation "androidx.room:room-ktx:$roomVersion"
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:$serializationVersion"
 
     // UI
     implementation "com.github.bumptech.glide:glide:$glideVersion"
@@ -83,7 +84,7 @@ dependencies {
     implementation "androidx.browser:browser:$browserVersion"
     implementation "androidx.constraintlayout:constraintlayout:$constrainLayoutVersion"
     //noinspection GradleDependency
-    implementation 'com.google.zxing:core:3.3.3' // Don't update. 3.3.3 is the maximum to support Android 6.x
+    implementation "com.google.zxing:core:$zxingVersion"
 
     // DI
     implementation "com.google.dagger:hilt-android:$hiltVersion"

common/src/main/java/org/dash/wallet/common/Configuration.java

@@ -50,7 +50,6 @@ public class Configuration {
     private final SharedPreferences prefs;
     private final Resources res;
 
-    public static final String PREFS_KEY_SEND_COINS_AUTOCLOSE = "send_coins_autoclose";
     public static final String PREFS_KEY_CONNECTIVITY_NOTIFICATION = "connectivity_notification";
     public static final String PREFS_KEY_EXCHANGE_CURRENCY = "exchange_currency";
     public static final String PREFS_KEY_EXCHANGE_CURRENCY_DETECTED = "exchange_currency_detected";
@@ -59,7 +58,6 @@ public class Configuration {
     public static final String PREFS_KEY_BLOCK_EXPLORER = "block_explorer";
     public static final String PREFS_KEY_REMIND_BALANCE = "remind_balance";
     public static final String PREFS_KEY_REMIND_BALANCE_TIME = "remind_balance_time";
-    private static final String PREFS_KEY_LABS_QR_PAYMENT_REQUEST = "labs_qr_payment_request";
     private static final String PREFS_KEY_PREVIOUS_VERSION = "previous_version";
     public static final String PREFS_KEY_AUTO_LOGOUT_ENABLED = "auto_logout_enabled";
     public static final String PREFS_KEY_AUTO_LOGOUT_MINUTES = "auto_logout_minutes";
@@ -94,20 +92,13 @@ public class Configuration {
     public static final String PREFS_KEY_COINBASE_AUTH_INFO_SHOWN = "coinbase_auth_info_shown";
     public static final String PREFS_KEY_COINBASE_USER_WITHDRAWAL_LIMIT = "withdrawal_limit";
     public static final String PREFS_KEY_COINBASE_SEND_LIMIT_CURRENCY = "send_limit_currency";
-
-
-
     private static final int PREFS_DEFAULT_BTC_SHIFT = 0;
     public static final int PREFS_DEFAULT_BTC_PRECISION = 8;
     public static final String PREFS_KEY_IS_DASH_TO_FIAT_DIRECTION = "is_dash_to_fiat_direction";
     public static final String PREFS_KEY_SHOW_NOTIFICATIONS_EXPLAINER = "show_notifications_explainer";
     public static final String PREFS_KEY_SHOW_TAX_CATEGORY_EXPLAINER = "show_tax_catagory_explainer";
     public static final String PREFS_KEY_SHOW_TAX_CATEGORY_INSTALLTIME = "show_tax_catagory_install_time";
 
-    // Explore Dash
-    public static final String PREFS_KEY_HAS_INFO_SCREEN_BEEN_SHOWN_ALREADY = "has_info_screen_been_shown";
-    public static final String PREFS_KEY_HAS_LOCATION_DIALOG_BEEN_SHOWN = "has_location_dialog_been_shown";
-
     // CrowdNode
     public static final String PREFS_KEY_CROWDNODE_ACCOUNT_ADDRESS = "crowdnode_account_address";
     public static final String PREFS_KEY_CROWDNODE_PRIMARY_ADDRESS = "crowdnode_primary_address";
@@ -157,20 +148,6 @@ public MonetaryFormat getFormat() {
                 decimalRepetitions);
     }
 
-    public MonetaryFormat getMaxPrecisionFormat() {
-        final int shift = getBtcShift();
-        if (shift == 0)
-            return new MonetaryFormat().shift(0).minDecimals(2).optionalDecimals(2, 2, 2);
-        else if (shift == 3)
-            return new MonetaryFormat().shift(3).minDecimals(2).optionalDecimals(2, 1);
-        else
-            return new MonetaryFormat().shift(6).minDecimals(0).optionalDecimals(2);
-    }
-
-    public boolean getSendCoinsAutoclose() {
-        return prefs.getBoolean(PREFS_KEY_SEND_COINS_AUTOCLOSE, true);
-    }
-
     public boolean getConnectivityNotificationEnabled() {
         return prefs.getBoolean(PREFS_KEY_CONNECTIVITY_NOTIFICATION, false);
     }
@@ -261,10 +238,6 @@ public long getLastRestoreTime() {
         return prefs.getLong(PREFS_KEY_LAST_RESTORE, 0);
     }
 
-    public void updateLastRestoreTime() {
-        prefs.edit().putLong(PREFS_KEY_LAST_RESTORE, System.currentTimeMillis()).apply();
-    }
-
     public boolean lastBackupSeedReminderMoreThan24hAgo() {
         long lastReminder = prefs.getLong(PREFS_KEY_LAST_BACKUP_SEED_TIME, 0);
         if (lastReminder > 0) {
@@ -316,10 +289,6 @@ public boolean wasUpgraded() {
         return prefs.getInt(PREFS_KEY_PREVIOUS_VERSION, 0) != 0;
     }
 
-    public boolean getQrPaymentRequestEnabled() {
-        return prefs.getBoolean(PREFS_KEY_LABS_QR_PAYMENT_REQUEST, false);
-    }
-
     public boolean versionCodeCrossed(final int currentVersionCode, final int triggeringVersionCode) {
         final boolean wasBelow = lastVersionCode < triggeringVersionCode;
         final boolean wasUsedBefore = lastVersionCode > 0;
@@ -340,10 +309,6 @@ else if (currentVersionCode < lastVersionCode)
             log.warn("detected app downgrade: " + lastVersionCode + " -> " + currentVersionCode);
     }
 
-    public boolean hasBeenUsed() {
-        return prefs.contains(PREFS_KEY_LAST_USED);
-    }
-
     public long getLastUsedAgo() {
         final long now = System.currentTimeMillis();
 
@@ -504,27 +469,8 @@ public void setTaxCategoryInstallTime(long time) {
         prefs.edit().putLong(PREFS_KEY_SHOW_TAX_CATEGORY_INSTALLTIME, time).apply();
     }
 
-    // Explore Dash
-
-    public boolean hasExploreDashInfoScreenBeenShown() {
-        return prefs.getBoolean(PREFS_KEY_HAS_INFO_SCREEN_BEEN_SHOWN_ALREADY, false);
-    }
-
-    public void setHasExploreDashInfoScreenBeenShown(boolean isShown){
-        prefs.edit().putBoolean(PREFS_KEY_HAS_INFO_SCREEN_BEEN_SHOWN_ALREADY, isShown).apply();
-    }
-
-    public boolean hasExploreDashLocationDialogBeenShown() {
-        return prefs.getBoolean(PREFS_KEY_HAS_LOCATION_DIALOG_BEEN_SHOWN, false);
-    }
-
-    public void setHasExploreDashLocationDialogBeenShown(boolean isShown) {
-        prefs.edit().putBoolean(PREFS_KEY_HAS_LOCATION_DIALOG_BEEN_SHOWN, isShown).apply();
-    }
-
     // Coinbase
     // TODO: put new preferences in the CoinbaseConfig and migrate these.
-
     public void setLastCoinBaseAccessToken(String token) {
         prefs.edit().putString(PREFS_KEY_LAST_COINBASE_ACCESS_TOKEN, token).apply();
     }
@@ -571,7 +517,7 @@ public void setCoinbaseSendLimitCurrency(String currency){
     }
 
     public String getCoinbaseSendLimitCurrency() {
-        return prefs.getString(PREFS_KEY_COINBASE_SEND_LIMIT_CURRENCY, GenericUtils.getLocaleCurrencyCode());
+        return prefs.getString(PREFS_KEY_COINBASE_SEND_LIMIT_CURRENCY, GenericUtils.INSTANCE.getLocaleCurrencyCode());
     }
 
     // CrowdNode

common/src/main/java/org/dash/wallet/common/WalletDataProvider.kt

@@ -24,8 +24,8 @@ import org.bitcoinj.wallet.Wallet
 import org.bitcoinj.wallet.WalletExtension
 import org.bitcoinj.wallet.authentication.AuthenticationKeyUsage
 import org.dash.wallet.common.services.LeftoverBalanceException
-import org.dash.wallet.common.transactions.filters.TransactionFilter
 import org.dash.wallet.common.transactions.TransactionWrapper
+import org.dash.wallet.common.transactions.filters.TransactionFilter
 import kotlin.jvm.Throws
 
 interface WalletDataProvider {
@@ -52,6 +52,8 @@ interface WalletDataProvider {
 
     fun observeAuthenticationKeyUsage(): Flow<List<AuthenticationKeyUsage>>
 
+    fun getTransaction(hash: Sha256Hash): Transaction?
+
     fun getTransactions(vararg filters: TransactionFilter): Collection<Transaction>
 
     fun wrapAllTransactions(vararg wrappers: TransactionWrapper): Collection<TransactionWrapper>