diff --git a/.github/workflows/pr_test_build.yml b/.github/workflows/pr_test_build.yml index b0177965e..f37919e9d 100644 --- a/.github/workflows/pr_test_build.yml +++ b/.github/workflows/pr_test_build.yml @@ -75,10 +75,6 @@ jobs: with: path: | /opt/android/cake_wallet/cw_haven/android/.cxx - /opt/android/cake_wallet/cw_haven/ios/External - /opt/android/cake_wallet/cw_monero/android/.cxx - /opt/android/cake_wallet/cw_monero/ios/External - /opt/android/cake_wallet/cw_shared_external/ios/External /opt/android/cake_wallet/scripts/monero_c/release key: ${{ hashFiles('**/prepare_moneroc.sh' ,'**/build_monero_all.sh') }} @@ -87,8 +83,7 @@ jobs: run: | cd /opt/android/cake_wallet/scripts/android/ source ./app_env.sh cakewallet - ./build_all.sh - ./copy_monero_deps.sh + ./build_monero_all.sh - name: Install Flutter dependencies run: | diff --git a/assets/text/Release_Notes.txt b/assets/text/Release_Notes.txt index 551d775ef..ae145cf94 100644 --- a/assets/text/Release_Notes.txt +++ b/assets/text/Release_Notes.txt @@ -1,2 +1,3 @@ Monero enhancements +Improvements for Tron and Nano wallets Bug fixes \ No newline at end of file diff --git a/lib/view_model/wallet_keys_view_model.dart b/lib/view_model/wallet_keys_view_model.dart index 5102ba8eb..511822601 100644 --- a/lib/view_model/wallet_keys_view_model.dart +++ b/lib/view_model/wallet_keys_view_model.dart @@ -10,7 +10,6 @@ import 'package:cw_core/transaction_info.dart'; import 'package:cw_core/wallet_base.dart'; import 'package:cw_core/wallet_type.dart'; import 'package:cw_monero/monero_wallet.dart'; -import 'package:cw_wownero/wownero_wallet.dart'; import 'package:mobx/mobx.dart'; import 'package:polyseed/polyseed.dart'; @@ -157,8 +156,7 @@ abstract class WalletKeysViewModelBase with Store { final lang = PolyseedLang.getByPhrase(_appStore.wallet!.seed!); items.add(StandartListItem( title: S.current.wallet_seed_legacy, - value: (_appStore.wallet as WowneroWalletBase) - .seedLegacy(lang.nameEnglish))); + value: wownero!.getLegacySeed(_appStore.wallet!, lang.nameEnglish))); } } @@ -315,23 +313,4 @@ abstract class WalletKeysViewModelBase with Store { String getRoundedRestoreHeight(int height) => ((height / 1000).floor() * 1000).toString(); - - LegacySeedLang _getLegacySeedLang(PolyseedLang lang) { - switch (lang.nameEnglish) { - case "Spanish": - return LegacySeedLang.getByEnglishName("Spanish"); - case "French": - return LegacySeedLang.getByEnglishName("French"); - case "Italian": - return LegacySeedLang.getByEnglishName("Italian"); - case "Japanese": - return LegacySeedLang.getByEnglishName("Japanese"); - case "Portuguese": - return LegacySeedLang.getByEnglishName("Portuguese"); - case "Chinese (Simplified)": - return LegacySeedLang.getByEnglishName("Chinese (simplified)"); - default: - return LegacySeedLang.getByEnglishName("English"); - } - } } diff --git a/lib/wownero/cw_wownero.dart b/lib/wownero/cw_wownero.dart index eccb0f126..03bebc463 100644 --- a/lib/wownero/cw_wownero.dart +++ b/lib/wownero/cw_wownero.dart @@ -344,4 +344,7 @@ class CWWownero extends Wownero { Future getCurrentHeight() async { return wownero_wallet_api.getCurrentHeight(); } + + String getLegacySeed(Object wallet, String langName) => + (wallet as WowneroWalletBase).seedLegacy(langName); } diff --git a/macos/Runner/RunnerBase.entitlements b/macos/Runner/RunnerBase.entitlements index 2003d2c2b..186b61b17 100644 --- a/macos/Runner/RunnerBase.entitlements +++ b/macos/Runner/RunnerBase.entitlements @@ -6,8 +6,6 @@ com.apple.security.network.client - com.apple.security.network.server - keychain-access-groups $(AppIdentifierPrefix)${BUNDLE_ID} diff --git a/scripts/android/app_env.sh b/scripts/android/app_env.sh index 99703a079..8e0bff866 100644 --- a/scripts/android/app_env.sh +++ b/scripts/android/app_env.sh @@ -15,15 +15,15 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN) APP_ANDROID_TYPE=$1 MONERO_COM_NAME="Monero.com" -MONERO_COM_VERSION="1.15.2" -MONERO_COM_BUILD_NUMBER=92 +MONERO_COM_VERSION="1.16.0" +MONERO_COM_BUILD_NUMBER=94 MONERO_COM_BUNDLE_ID="com.monero.app" MONERO_COM_PACKAGE="com.monero.app" MONERO_COM_SCHEME="monero.com" CAKEWALLET_NAME="Cake Wallet" -CAKEWALLET_VERSION="4.18.2" -CAKEWALLET_BUILD_NUMBER=218 +CAKEWALLET_VERSION="4.19.0" +CAKEWALLET_BUILD_NUMBER=220 CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet" CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet" CAKEWALLET_SCHEME="cakewallet" diff --git a/scripts/ios/app_env.sh b/scripts/ios/app_env.sh index 7d52d42bb..afab18521 100644 --- a/scripts/ios/app_env.sh +++ b/scripts/ios/app_env.sh @@ -14,12 +14,12 @@ APP_IOS_TYPE=$1 MONERO_COM_NAME="Monero.com" MONERO_COM_VERSION="1.16.0" -MONERO_COM_BUILD_NUMBER=91 +MONERO_COM_BUILD_NUMBER=92 MONERO_COM_BUNDLE_ID="com.cakewallet.monero" CAKEWALLET_NAME="Cake Wallet" CAKEWALLET_VERSION="4.19.0" -CAKEWALLET_BUILD_NUMBER=251 +CAKEWALLET_BUILD_NUMBER=254 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet" HAVEN_NAME="Haven" diff --git a/scripts/macos/app_env.sh b/scripts/macos/app_env.sh index eae2fe886..26c821c19 100755 --- a/scripts/macos/app_env.sh +++ b/scripts/macos/app_env.sh @@ -16,13 +16,13 @@ if [ -n "$1" ]; then fi MONERO_COM_NAME="Monero.com" -MONERO_COM_VERSION="1.5.2" -MONERO_COM_BUILD_NUMBER=23 +MONERO_COM_VERSION="1.6.0" +MONERO_COM_BUILD_NUMBER=24 MONERO_COM_BUNDLE_ID="com.cakewallet.monero" CAKEWALLET_NAME="Cake Wallet" -CAKEWALLET_VERSION="1.11.2" -CAKEWALLET_BUILD_NUMBER=80 +CAKEWALLET_VERSION="1.12.0" +CAKEWALLET_BUILD_NUMBER=81 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet" if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then diff --git a/scripts/windows/build_exe_installer.iss b/scripts/windows/build_exe_installer.iss index 4315f7d27..f36a59d0e 100644 --- a/scripts/windows/build_exe_installer.iss +++ b/scripts/windows/build_exe_installer.iss @@ -1,5 +1,5 @@ #define MyAppName "Cake Wallet" -#define MyAppVersion "0.0.1" +#define MyAppVersion "0.0.2" #define MyAppPublisher "Cake Labs LLC" #define MyAppURL "https://cakewallet.com/" #define MyAppExeName "CakeWallet.exe" diff --git a/tool/configure.dart b/tool/configure.dart index fcfd676dc..853d06448 100644 --- a/tool/configure.dart +++ b/tool/configure.dart @@ -563,6 +563,7 @@ abstract class Wownero { int getTransactionInfoAccountId(TransactionInfo tx); WalletService createWowneroWalletService(Box walletInfoSource, Box unspentCoinSource); Map pendingTransactionInfo(Object transaction); + String getLegacySeed(Object wallet, String langName); } abstract class WowneroSubaddressList {