Staging

.github/workflows/test.yaml

@@ -23,7 +23,7 @@ jobs:
         run: |
           cargo install cargo-ndk
           rustup target add x86_64-unknown-linux-gnu
-          sudo apt install -y unzip automake build-essential file pkg-config git python libtool libtinfo5 cmake openjdk-8-jre-headless libgit2-dev clang libncurses5-dev libncursesw5-dev zlib1g-dev llvm 
+          sudo apt install -y unzip automake build-essential file pkg-config git python libtool libtinfo5 cmake openjdk-8-jre-headless libgit2-dev clang libncurses5-dev libncursesw5-dev zlib1g-dev llvm
           sudo apt install -y debhelper libclang-dev cargo rustc opencl-headers libssl-dev ocl-icd-opencl-dev
           sudo apt install -y libc6-dev-i386
           sudo apt install -y build-essential cmake git libgit2-dev clang libncurses5-dev libncursesw5-dev zlib1g-dev pkg-config llvm
@@ -50,48 +50,36 @@ jobs:
           $encodedBytes = [System.Convert]::FromBase64String($env:CHANGE_NOW);
           Set-Content $secretFileExchange -Value $encodedBytes -AsByteStream;
           $secretFileExchangeHash = Get-FileHash $secretFileExchange;
-          Write-Output "::set-output name=SECRET_FILE_EXCHANGE::$secretFileExchange";
-          Write-Output "::set-output name=SECRET_FILE_EXCHANGE_HASH::$($secretFileExchangeHash.Hash)";
           Write-Output "Secret file $secretFileExchange has hash $($secretFileExchangeHash.Hash)";
 
           $secretFileBitcoin = Join-Path -Path $env:GITHUB_WORKSPACE -ChildPath "test/services/coins/bitcoin/bitcoin_wallet_test_parameters.dart";
           $encodedBytes = [System.Convert]::FromBase64String($env:BITCOIN_TEST);
           Set-Content $secretFileBitcoin -Value $encodedBytes -AsByteStream;
           $secretFileBitcoinHash = Get-FileHash $secretFileBitcoin;
-          Write-Output "::set-output name=SECRET_FILE_BITCOIN::$secretFileBitcoin";
-          Write-Output "::set-output name=SECRET_FILE_BITCOIN_HASH::$($secretFileBitcoinHash.Hash)";
           Write-Output "Secret file $secretFileBitcoin has hash $($secretFileBitcoinHash.Hash)";
 
           $secretFileDogecoin = Join-Path -Path $env:GITHUB_WORKSPACE -ChildPath "test/services/coins/dogecoin/dogecoin_wallet_test_parameters.dart";
           $encodedBytes = [System.Convert]::FromBase64String($env:DOGECOIN_TEST);
           Set-Content $secretFileDogecoin -Value $encodedBytes -AsByteStream;
           $secretFileDogecoinHash = Get-FileHash $secretFileDogecoin;
-          Write-Output "::set-output name=SECRET_FILE_DOGECOIN::$secretFileDogecoin";
-          Write-Output "::set-output name=SECRET_FILE_DOGECOIN_HASH::$($secretFileDogecoinHash.Hash)";
           Write-Output "Secret file $secretFileDogecoin has hash $($secretFileDogecoinHash.Hash)";
 
           $secretFileFiro = Join-Path -Path $env:GITHUB_WORKSPACE -ChildPath "test/services/coins/firo/firo_wallet_test_parameters.dart";
           $encodedBytes = [System.Convert]::FromBase64String($env:FIRO_TEST);
           Set-Content $secretFileFiro -Value $encodedBytes -AsByteStream;
           $secretFileFiroHash = Get-FileHash $secretFileFiro;
-          Write-Output "::set-output name=SECRET_FILE_FIRO::$secretFileFiro";
-          Write-Output "::set-output name=SECRET_FILE_FIRO_HASH::$($secretFileFiroHash.Hash)";
           Write-Output "Secret file $secretFileFiro has hash $($secretFileFiroHash.Hash)";
 
           $secretFileBitcoinCash = Join-Path -Path $env:GITHUB_WORKSPACE -ChildPath "test/services/coins/bitcoincash/bitcoincash_wallet_test_parameters.dart";
           $encodedBytes = [System.Convert]::FromBase64String($env:BITCOINCASH_TEST);
           Set-Content $secretFileBitcoinCash -Value $encodedBytes -AsByteStream;
           $secretFileBitcoinCashHash = Get-FileHash $secretFileBitcoinCash;
-          Write-Output "::set-output name=SECRET_FILE_BITCOINCASH::$secretFileBitcoinCash";
-          Write-Output "::set-output name=SECRET_FILE_BITCOINCASH_HASH::$($secretFileBitcoinCashHash.Hash)";
           Write-Output "Secret file $secretFileBitcoinCash has hash $($secretFileBitcoinCashHash.Hash)";
 
           $secretFileNamecoin = Join-Path -Path $env:GITHUB_WORKSPACE -ChildPath "test/services/coins/namecoin/namecoin_wallet_test_parameters.dart";
           $encodedBytes = [System.Convert]::FromBase64String($env:NAMECOIN_TEST);
           Set-Content $secretFileNamecoin -Value $encodedBytes -AsByteStream;
           $secretFileNamecoinHash = Get-FileHash $secretFileNamecoin;
-          Write-Output "::set-output name=SECRET_FILE_NAMECOIN::$secretFileNamecoin";
-          Write-Output "::set-output name=SECRET_FILE_NAMECOIN_HASH::$($secretFileNamecoinHash.Hash)";
           Write-Output "Secret file $secretFileNamecoin has hash $($secretFileNamecoinHash.Hash)";
 
         shell: pwsh
@@ -114,18 +102,18 @@ jobs:
           file: coverage/lcov.info
       - name: Delete temp files
         run: |
-          Remove-Item -Path $env:CHANGE_NOW;
-          Remove-Item -Path $env:BITCOIN_TEST;
-          Remove-Item -Path $env:DOGECOIN_TEST;
-          Remove-Item -Path $env:FIRO_TEST;
-          Remove-Item -Path $env:BITCOINCASH_TEST;
-          Remove-Item -Path $env:NAMECOIN_TEST;
+          $secretFileExchange = Join-Path -Path $env:GITHUB_WORKSPACE -ChildPath "lib/external_api_keys.dart";
+          $secretFileBitcoin = Join-Path -Path $env:GITHUB_WORKSPACE -ChildPath "test/services/coins/bitcoin/bitcoin_wallet_test_parameters.dart";
+          $secretFileDogecoin = Join-Path -Path $env:GITHUB_WORKSPACE -ChildPath "test/services/coins/dogecoin/dogecoin_wallet_test_parameters.dart";
+          $secretFileFiro = Join-Path -Path $env:GITHUB_WORKSPACE -ChildPath "test/services/coins/firo/firo_wallet_test_parameters.dart";
+          $secretFileBitcoinCash = Join-Path -Path $env:GITHUB_WORKSPACE -ChildPath "test/services/coins/bitcoincash/bitcoincash_wallet_test_parameters.dart";
+          $secretFileNamecoin = Join-Path -Path $env:GITHUB_WORKSPACE -ChildPath "test/services/coins/namecoin/namecoin_wallet_test_parameters.dart";
+
+          Remove-Item -Path $secretFileExchange;
+          Remove-Item -Path $secretFileBitcoin;
+          Remove-Item -Path $secretFileDogecoin;
+          Remove-Item -Path $secretFileFiro;
+          Remove-Item -Path $secretFileBitcoinCash;
+          Remove-Item -Path $secretFileNamecoin;
         shell: pwsh
         if: always()
-        env:
-          CHANGE_NOW: ${{ steps.secret-file1.outputs.SECRET_FILE_EXCHANGE }}
-          BITCOIN_TEST: ${{ steps.secret-file1.outputs.SECRET_FILE_BITCOIN }}
-          DOGECOIN_TEST: ${{ steps.secret-file1.outputs.SECRET_FILE_DOGECOIN }}
-          FIRO_TEST: ${{ steps.secret-file1.outputs.SECRET_FILE_FIRO }}
-          BITCOINCASH_TEST: ${{ steps.secret-file1.outputs.SECRET_FILE_BITCOINCASH }}
-          NAMECOIN_TEST: ${{ steps.secret-file1.outputs.SECRET_FILE_NAMECOIN }}

android/app/src/main/AndroidManifest.xml

@@ -20,6 +20,7 @@
     <application
         android:name="${applicationName}"
         android:label="Stack Wallet"
+        android:requestLegacyExternalStorage="true"
         android:icon="@mipmap/ic_launcher"
         android:allowBackup="false"
         android:fullBackupContent="false">

android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.7.20'
     repositories {
         google()
         jcenter()

android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip

ios/Runner.xcodeproj/project.pbxproj

@@ -454,7 +454,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 78;
+				CURRENT_PROJECT_VERSION = 79;
 				DEVELOPMENT_TEAM = 4DQKUWSG6C;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -508,7 +508,7 @@
 					"$(PROJECT_DIR)/../crypto_plugins/flutter_libmonero/cw_shared_external/ios/External/ios/**",
 					"$(PROJECT_DIR)/../crypto_plugins/flutter_libepiccash/ios/libs",
 				);
-				MARKETING_VERSION = 1.5.8;
+				MARKETING_VERSION = 1.5.9;
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = com.cypherstack.stackwallet;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -641,7 +641,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 78;
+				CURRENT_PROJECT_VERSION = 79;
 				DEVELOPMENT_TEAM = 4DQKUWSG6C;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -695,7 +695,7 @@
 					"$(PROJECT_DIR)/../crypto_plugins/flutter_libmonero/cw_shared_external/ios/External/ios/**",
 					"$(PROJECT_DIR)/../crypto_plugins/flutter_libepiccash/ios/libs",
 				);
-				MARKETING_VERSION = 1.5.8;
+				MARKETING_VERSION = 1.5.9;
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = com.cypherstack.stackwallet;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -720,7 +720,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 78;
+				CURRENT_PROJECT_VERSION = 79;
 				DEVELOPMENT_TEAM = 4DQKUWSG6C;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -774,7 +774,7 @@
 					"$(PROJECT_DIR)/../crypto_plugins/flutter_libmonero/cw_shared_external/ios/External/ios/**",
 					"$(PROJECT_DIR)/../crypto_plugins/flutter_libepiccash/ios/libs",
 				);
-				MARKETING_VERSION = 1.5.8;
+				MARKETING_VERSION = 1.5.9;
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = com.cypherstack.stackwallet;
 				PRODUCT_NAME = "$(TARGET_NAME)";

lib/electrumx_rpc/cached_electrumx.dart

@@ -1,9 +1,12 @@
+import 'dart:convert';
+
 import 'package:stackwallet/electrumx_rpc/electrumx.dart';
 import 'package:stackwallet/hive/db.dart';
 import 'package:stackwallet/services/coins/firo/firo_wallet.dart';
 import 'package:stackwallet/utilities/enums/coin_enum.dart';
 import 'package:stackwallet/utilities/logger.dart';
 import 'package:stackwallet/utilities/prefs.dart';
+import 'package:string_validator/string_validator.dart';
 
 class CachedElectrumX {
   final ElectrumX? electrumXClient;
@@ -94,10 +97,32 @@ class CachedElectrumX {
 
       // update set with new data
       if (newSet["setHash"] != "" && set["setHash"] != newSet["setHash"]) {
-        set["setHash"] = newSet["setHash"];
-        set["blockHash"] = newSet["blockHash"];
+        set["setHash"] = !isHexadecimal(newSet["setHash"] as String)
+            ? base64ToReverseHex(newSet["setHash"] as String)
+            : newSet["setHash"];
+        set["blockHash"] = !isHexadecimal(newSet["blockHash"] as String)
+            ? base64ToHex(newSet["blockHash"] as String)
+            : newSet["blockHash"];
         for (int i = (newSet["coins"] as List).length - 1; i >= 0; i--) {
-          set["coins"].insert(0, newSet["coins"][i]);
+          dynamic newCoin = newSet["coins"][i];
+          List translatedCoin = [];
+          translatedCoin.add(!isHexadecimal(newCoin[0] as String)
+              ? base64ToHex(newCoin[0] as String)
+              : newCoin[0]);
+          translatedCoin.add(!isHexadecimal(newCoin[1] as String)
+              ? base64ToReverseHex(newCoin[1] as String)
+              : newCoin[1]);
+          try {
+            translatedCoin.add(!isHexadecimal(newCoin[2] as String)
+                ? base64ToHex(newCoin[2] as String)
+                : newCoin[2]);
+          } catch (e, s) {
+            translatedCoin.add(newCoin[2]);
+          }
+          translatedCoin.add(!isHexadecimal(newCoin[3] as String)
+              ? base64ToReverseHex(newCoin[3] as String)
+              : newCoin[3]);
+          set["coins"].insert(0, translatedCoin);
         }
         // save set to db
         await DB.instance.put<dynamic>(
@@ -118,6 +143,17 @@ class CachedElectrumX {
     }
   }
 
+  String base64ToHex(String source) =>
+      base64Decode(LineSplitter.split(source).join())
+          .map((e) => e.toRadixString(16).padLeft(2, '0'))
+          .join();
+
+  String base64ToReverseHex(String source) =>
+      base64Decode(LineSplitter.split(source).join())
+          .reversed
+          .map((e) => e.toRadixString(16).padLeft(2, '0'))
+          .join();
+
   /// Call electrumx getTransaction on a per coin basis, storing the result in local db if not already there.
   ///
   /// ElectrumX api only called if the tx does not exist in local db
@@ -189,7 +225,15 @@ class CachedElectrumX {
           );
 
       final serials = await client.getUsedCoinSerials(startNumber: startNumber);
-      cachedSerials.addAll(serials["serials"] as List);
+      List newSerials = [];
+      for (var element in (serials["serials"] as List)) {
+        if (!isHexadecimal(element as String)) {
+          newSerials.add(base64ToHex(element));
+        } else {
+          newSerials.add(element);
+        }
+      }
+      cachedSerials.addAll(newSerials);
 
       await DB.instance.put<dynamic>(
           boxName: DB.instance.boxNameUsedSerialsCache(coin: coin),

lib/hive/db.dart

@@ -9,6 +9,7 @@ import 'package:stackwallet/models/node_model.dart';
 import 'package:stackwallet/models/notification_model.dart';
 import 'package:stackwallet/models/trade_wallet_lookup.dart';
 import 'package:stackwallet/services/wallets_service.dart';
+import 'package:stackwallet/utilities/constants.dart';
 import 'package:stackwallet/utilities/enums/coin_enum.dart';
 import 'package:stackwallet/utilities/logger.dart';
 
@@ -142,6 +143,17 @@ class DB {
         _loadSharedCoinCacheBoxes(),
       ]);
       _initialized = true;
+
+      try {
+        if (_boxPrefs.get("familiarity") == null) {
+          await _boxPrefs.put("familiarity", 0);
+        }
+        int count = _boxPrefs.get("familiarity") as int;
+        await _boxPrefs.put("familiarity", count + 1);
+        Constants.exchangeForExperiencedUsers(count + 1);
+      } catch (e, s) {
+        print("$e $s");
+      }
     }
   }
 

lib/main.dart

@@ -146,7 +146,12 @@ void main() async {
           boxName: DB.boxNameDBInfo, key: "hive_data_version") as int? ??
       0;
   if (dbVersion < Constants.currentHiveDbVersion) {
-    await DbVersionMigrator().migrate(dbVersion);
+    try {
+      await DbVersionMigrator().migrate(dbVersion);
+    } catch (e, s) {
+      Logging.instance.log("Cannot migrate database\n$e $s",
+          level: LogLevel.Error, printFullLength: true);
+    }
   }
 
   monero.onStartup();
@@ -234,7 +239,9 @@ class _MaterialAppWithThemeState extends ConsumerState<MaterialAppWithTheme>
     //  unawaited(_nodeService.updateCommunityNodes());
 
     // run without awaiting
-    if (Constants.enableExchange && _prefs.externalCalls) {
+    if (Constants.enableExchange &&
+        _prefs.externalCalls &&
+        await _prefs.isExternalCallsSet()) {
       unawaited(ExchangeDataLoadingService().loadAll(ref));
     }
 

lib/models/exchange/exchange_form_state.dart

@@ -276,6 +276,12 @@ class ExchangeFormState extends ChangeNotifier {
 
   void _onExchangeRateTypeChanged() {
     print("_onExchangeRateTypeChanged");
+    updateRanges(shouldNotifyListeners: true).then(
+      (_) => updateEstimate(
+        shouldNotifyListeners: true,
+        reversed: reversed,
+      ),
+    );
   }
 
   void _onExchangeTypeChanged() {

lib/pages/add_wallet_views/restore_wallet_view/restore_options_view/restore_options_view.dart

@@ -144,6 +144,8 @@ class _RestoreOptionsViewState extends ConsumerState<RestoreOptionsView> {
 
   Future<void> chooseDate() async {
     final height = MediaQuery.of(context).size.height;
+    final fetchedColor =
+        Theme.of(context).extension<StackColors>()!.accentColorDark;
     // check and hide keyboard
     if (FocusScope.of(context).hasFocus) {
       FocusScope.of(context).unfocus();
@@ -155,8 +157,7 @@ class _RestoreOptionsViewState extends ConsumerState<RestoreOptionsView> {
       initialDate: DateTime.now(),
       height: height * 0.5,
       theme: ThemeData(
-        primarySwatch: Util.createMaterialColor(
-            Theme.of(context).extension<StackColors>()!.accentColorDark),
+        primarySwatch: Util.createMaterialColor(fetchedColor),
       ),
       //TODO pick a better initial date
       // 2007 chosen as that is just before bitcoin launched
@@ -272,6 +273,7 @@ class _RestoreOptionsViewState extends ConsumerState<RestoreOptionsView> {
                 // if (!isDesktop)
                 RestoreFromDatePicker(
                   onTap: chooseDate,
+                  controller: _dateController,
                 ),
 
               // if (isDesktop)

lib/pages/add_wallet_views/restore_wallet_view/restore_options_view/sub_widgets/restore_from_date_picker.dart

@@ -7,10 +7,14 @@ import 'package:stackwallet/utilities/theme/stack_colors.dart';
 import 'package:stackwallet/utilities/util.dart';
 
 class RestoreFromDatePicker extends StatefulWidget {
-  const RestoreFromDatePicker({Key? key, required this.onTap})
-      : super(key: key);
+  const RestoreFromDatePicker({
+    Key? key,
+    required this.onTap,
+    required this.controller,
+  }) : super(key: key);
 
   final VoidCallback onTap;
+  final TextEditingController controller;
 
   @override
   State<RestoreFromDatePicker> createState() => _RestoreFromDatePickerState();
@@ -23,17 +27,11 @@ class _RestoreFromDatePickerState extends State<RestoreFromDatePicker> {
   @override
   void initState() {
     onTap = widget.onTap;
-    _dateController = TextEditingController();
+    _dateController = widget.controller;
 
     super.initState();
   }
 
-  @override
-  void dispose() {
-    _dateController.dispose();
-    super.dispose();
-  }
-
   @override
   Widget build(BuildContext context) {
     return Container(