@samitouri / QOSAMI-cakewallet / commits / 9e9534a4e

V4.19.0 v1.16.0 (#1520)

* remove server entitlement * remove server entitlement * minor adjustment

Omar Hatem committed Jul 8, 2024 at 18:32 UTC 9e9534a4e5fc0fffb3a156eedb3c018a734aff3a
10 files changed +18 -41
.github/workflows/pr_test_build.yml
+1 -6
@@ -75,10 +75,6 @@ jobs:
75 with:
76 path: |
77 /opt/android/cake_wallet/cw_haven/android/.cxx
78 - /opt/android/cake_wallet/cw_haven/ios/External
79 - /opt/android/cake_wallet/cw_monero/android/.cxx
80 - /opt/android/cake_wallet/cw_monero/ios/External
81 - /opt/android/cake_wallet/cw_shared_external/ios/External
78 /opt/android/cake_wallet/scripts/monero_c/release
79 key: ${{ hashFiles('**/prepare_moneroc.sh' ,'**/build_monero_all.sh') }}
80
@@ -87,8 +83,7 @@ jobs:
83 run: |
84 cd /opt/android/cake_wallet/scripts/android/
85 source ./app_env.sh cakewallet
90 - ./build_all.sh
91 - ./copy_monero_deps.sh
86 + ./build_monero_all.sh
87
88 - name: Install Flutter dependencies
89 run: |
assets/text/Release_Notes.txt
+1
@@ -1,2 +1,3 @@
1 Monero enhancements
2 +Improvements for Tron and Nano wallets
3 Bug fixes
\ No newline at end of file
lib/view_model/wallet_keys_view_model.dart
+1 -22
@@ -10,7 +10,6 @@ import 'package:cw_core/transaction_info.dart';
10 import 'package:cw_core/wallet_base.dart';
11 import 'package:cw_core/wallet_type.dart';
12 import 'package:cw_monero/monero_wallet.dart';
13 -import 'package:cw_wownero/wownero_wallet.dart';
13 import 'package:mobx/mobx.dart';
14 import 'package:polyseed/polyseed.dart';
15
@@ -157,8 +156,7 @@ abstract class WalletKeysViewModelBase with Store {
156 final lang = PolyseedLang.getByPhrase(_appStore.wallet!.seed!);
157 items.add(StandartListItem(
158 title: S.current.wallet_seed_legacy,
160 - value: (_appStore.wallet as WowneroWalletBase)
161 - .seedLegacy(lang.nameEnglish)));
159 + value: wownero!.getLegacySeed(_appStore.wallet!, lang.nameEnglish)));
160 }
161 }
162
@@ -315,23 +313,4 @@ abstract class WalletKeysViewModelBase with Store {
313
314 String getRoundedRestoreHeight(int height) =>
315 ((height / 1000).floor() * 1000).toString();
318 -
319 - LegacySeedLang _getLegacySeedLang(PolyseedLang lang) {
320 - switch (lang.nameEnglish) {
321 - case "Spanish":
322 - return LegacySeedLang.getByEnglishName("Spanish");
323 - case "French":
324 - return LegacySeedLang.getByEnglishName("French");
325 - case "Italian":
326 - return LegacySeedLang.getByEnglishName("Italian");
327 - case "Japanese":
328 - return LegacySeedLang.getByEnglishName("Japanese");
329 - case "Portuguese":
330 - return LegacySeedLang.getByEnglishName("Portuguese");
331 - case "Chinese (Simplified)":
332 - return LegacySeedLang.getByEnglishName("Chinese (simplified)");
333 - default:
334 - return LegacySeedLang.getByEnglishName("English");
335 - }
336 - }
316 }
lib/wownero/cw_wownero.dart
+3
@@ -344,4 +344,7 @@ class CWWownero extends Wownero {
344 Future<int> getCurrentHeight() async {
345 return wownero_wallet_api.getCurrentHeight();
346 }
347 +
348 + String getLegacySeed(Object wallet, String langName) =>
349 + (wallet as WowneroWalletBase).seedLegacy(langName);
350 }
macos/Runner/RunnerBase.entitlements
-2
@@ -6,8 +6,6 @@
6 <true/>
7 <key>com.apple.security.network.client</key>
8 <true/>
9 - <key>com.apple.security.network.server</key>
10 - <true/>
9 <key>keychain-access-groups</key>
10 <array>
11 <string>$(AppIdentifierPrefix)${BUNDLE_ID}</string>
scripts/android/app_env.sh
+4 -4
@@ -15,15 +15,15 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN)
15 APP_ANDROID_TYPE=$1
16
17 MONERO_COM_NAME="Monero.com"
18 -MONERO_COM_VERSION="1.15.2"
19 -MONERO_COM_BUILD_NUMBER=92
18 +MONERO_COM_VERSION="1.16.0"
19 +MONERO_COM_BUILD_NUMBER=94
20 MONERO_COM_BUNDLE_ID="com.monero.app"
21 MONERO_COM_PACKAGE="com.monero.app"
22 MONERO_COM_SCHEME="monero.com"
23
24 CAKEWALLET_NAME="Cake Wallet"
25 -CAKEWALLET_VERSION="4.18.2"
26 -CAKEWALLET_BUILD_NUMBER=218
25 +CAKEWALLET_VERSION="4.19.0"
26 +CAKEWALLET_BUILD_NUMBER=220
27 CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
28 CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"
29 CAKEWALLET_SCHEME="cakewallet"
scripts/ios/app_env.sh
+2 -2
@@ -14,12 +14,12 @@ APP_IOS_TYPE=$1
14
15 MONERO_COM_NAME="Monero.com"
16 MONERO_COM_VERSION="1.16.0"
17 -MONERO_COM_BUILD_NUMBER=91
17 +MONERO_COM_BUILD_NUMBER=92
18 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
19
20 CAKEWALLET_NAME="Cake Wallet"
21 CAKEWALLET_VERSION="4.19.0"
22 -CAKEWALLET_BUILD_NUMBER=251
22 +CAKEWALLET_BUILD_NUMBER=254
23 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
24
25 HAVEN_NAME="Haven"
scripts/macos/app_env.sh
+4 -4
@@ -16,13 +16,13 @@ if [ -n "$1" ]; then
16 fi
17
18 MONERO_COM_NAME="Monero.com"
19 -MONERO_COM_VERSION="1.5.2"
20 -MONERO_COM_BUILD_NUMBER=23
19 +MONERO_COM_VERSION="1.6.0"
20 +MONERO_COM_BUILD_NUMBER=24
21 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
22
23 CAKEWALLET_NAME="Cake Wallet"
24 -CAKEWALLET_VERSION="1.11.2"
25 -CAKEWALLET_BUILD_NUMBER=80
24 +CAKEWALLET_VERSION="1.12.0"
25 +CAKEWALLET_BUILD_NUMBER=81
26 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
27
28 if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then
scripts/windows/build_exe_installer.iss
+1 -1
@@ -1,5 +1,5 @@
1 #define MyAppName "Cake Wallet"
2 -#define MyAppVersion "0.0.1"
2 +#define MyAppVersion "0.0.2"
3 #define MyAppPublisher "Cake Labs LLC"
4 #define MyAppURL "https://cakewallet.com/"
5 #define MyAppExeName "CakeWallet.exe"
tool/configure.dart
+1
@@ -563,6 +563,7 @@ abstract class Wownero {
563 int getTransactionInfoAccountId(TransactionInfo tx);
564 WalletService createWowneroWalletService(Box<WalletInfo> walletInfoSource, Box<UnspentCoinsInfo> unspentCoinSource);
565 Map<String, String> pendingTransactionInfo(Object transaction);
566 + String getLegacySeed(Object wallet, String langName);
567 }
568
569 abstract class WowneroSubaddressList {