From a612135046cc8731d31f20cad63b3960b9bb8ee8 Mon Sep 17 00:00:00 2001 From: Omar Date: Mon, 27 Jul 2026 13:20:52 +0200 Subject: [PATCH] update build numbers fix cw_zcash import --- ios/Podfile.lock | 8 +------- lib/view_model/dashboard/receive_option_view_model.dart | 3 +-- lib/zcash/cw_zcash.dart | 5 +++++ scripts/android/app_env.sh | 8 ++++---- scripts/ios/app_env.sh | 8 ++++---- tool/configure.dart | 2 ++ 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index be45d608d..b7e67acbf 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -54,8 +54,6 @@ PODS: - DKImagePickerController/PhotoGallery - Flutter - Flutter (1.0.0) - - flutter_contacts (0.0.1): - - Flutter - flutter_inappwebview_ios (0.0.1): - Flutter - flutter_inappwebview_ios/Core (= 0.0.1) @@ -167,7 +165,6 @@ DEPENDENCIES: - fast_scanner (from `.symlinks/plugins/fast_scanner/ios`) - file_picker (from `.symlinks/plugins/file_picker/ios`) - Flutter (from `Flutter`) - - flutter_contacts (from `.symlinks/plugins/flutter_contacts/ios`) - flutter_inappwebview_ios (from `.symlinks/plugins/flutter_inappwebview_ios/ios`) - flutter_local_authentication (from `.symlinks/plugins/flutter_local_authentication/ios`) - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`) @@ -234,8 +231,6 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/file_picker/ios" Flutter: :path: Flutter - flutter_contacts: - :path: ".symlinks/plugins/flutter_contacts/ios" flutter_inappwebview_ios: :path: ".symlinks/plugins/flutter_inappwebview_ios/ios" flutter_local_authentication: @@ -311,7 +306,6 @@ SPEC CHECKSUMS: fast_scanner: 2cb1ad3e69e645e9980fb4961396ce5804caa3e3 file_picker: 9b3292d7c8bc68c8a7bf8eb78f730e49c8efc517 Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467 - flutter_contacts: 2ec1d6b62ca2869c3bbb3871bd74d4e3ef157135 flutter_inappwebview_ios: b89ba3482b96fb25e00c967aae065701b66e9b99 flutter_local_authentication: 989278c681612f1ee0e36019e149137f114b9d7f flutter_local_notifications: a5a732f069baa862e728d839dd2ebb904737effb @@ -349,4 +343,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: b08d7f4c8d9c64f5648599a30caea878b0f7616a -COCOAPODS: 1.17.0 +COCOAPODS: 1.16.2 diff --git a/lib/view_model/dashboard/receive_option_view_model.dart b/lib/view_model/dashboard/receive_option_view_model.dart index 9ddbe4342..0f3afeff9 100644 --- a/lib/view_model/dashboard/receive_option_view_model.dart +++ b/lib/view_model/dashboard/receive_option_view_model.dart @@ -3,7 +3,6 @@ import 'package:cake_wallet/zcash/zcash.dart'; import 'package:cw_core/receive_page_option.dart'; import 'package:cw_core/wallet_base.dart'; import 'package:cw_core/wallet_type.dart'; -import 'package:cw_zcash/cw_zcash.dart'; import 'package:mobx/mobx.dart'; part 'receive_option_view_model.g.dart'; @@ -22,7 +21,7 @@ abstract class ReceiveOptionViewModelBase with Store { : ReceivePageOption.mainnet) { if (_wallet.type == WalletType.zcash) { reaction( - (_) => (_wallet.walletAddresses as ZcashWalletAddresses).ironwoodActive, + (_) => zcash!.ironwoodActive(_wallet.walletAddresses), (_) => _syncZcashShieldedLabel(), ); } diff --git a/lib/zcash/cw_zcash.dart b/lib/zcash/cw_zcash.dart index 9dff31bb0..76ecb5ca6 100644 --- a/lib/zcash/cw_zcash.dart +++ b/lib/zcash/cw_zcash.dart @@ -208,6 +208,11 @@ class CWZcash extends Zcash { @override Future rescanInternalChange(WalletBase wallet) async {} + + @override + bool ironwoodActive(WalletAddresses walletAddresses) { + return (walletAddresses as ZcashWalletAddresses).ironwoodActive; + } } const wordList = [ diff --git a/scripts/android/app_env.sh b/scripts/android/app_env.sh index e3a035a38..3e7784b97 100644 --- a/scripts/android/app_env.sh +++ b/scripts/android/app_env.sh @@ -14,15 +14,15 @@ TYPES=($MONERO_COM $CAKEWALLET) APP_ANDROID_TYPE=$1 MONERO_COM_NAME="Monero.com" -MONERO_COM_VERSION="6.3.2" -MONERO_COM_BUILD_NUMBER=4163 +MONERO_COM_VERSION="6.4.0" +MONERO_COM_BUILD_NUMBER=4164 MONERO_COM_BUNDLE_ID="com.monero.app" MONERO_COM_PACKAGE="com.monero.app" MONERO_COM_SCHEME="monero.com" CAKEWALLET_NAME="Cake Wallet" -CAKEWALLET_VERSION="6.3.2" -CAKEWALLET_BUILD_NUMBER=4418 +CAKEWALLET_VERSION="6.4.0" +CAKEWALLET_BUILD_NUMBER=4419 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 2771e5dcc..1c9dd1464 100644 --- a/scripts/ios/app_env.sh +++ b/scripts/ios/app_env.sh @@ -12,13 +12,13 @@ TYPES=($MONERO_COM $CAKEWALLET) APP_IOS_TYPE=$1 MONERO_COM_NAME="Monero.com" -MONERO_COM_VERSION="6.3.2" -MONERO_COM_BUILD_NUMBER=169 +MONERO_COM_VERSION="6.4.0" +MONERO_COM_BUILD_NUMBER=170 MONERO_COM_BUNDLE_ID="com.cakewallet.monero" CAKEWALLET_NAME="Cake Wallet" -CAKEWALLET_VERSION="6.3.2" -CAKEWALLET_BUILD_NUMBER=429 +CAKEWALLET_VERSION="6.4.0" +CAKEWALLET_BUILD_NUMBER=433 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet" diff --git a/tool/configure.dart b/tool/configure.dart index 348f1c970..6621fc21a 100644 --- a/tool/configure.dart +++ b/tool/configure.dart @@ -1704,6 +1704,7 @@ import 'package:cw_core/wallet_credentials.dart'; import 'package:cw_core/wallet_info.dart'; import 'package:cw_core/wallet_service.dart'; import 'package:cw_core/receive_page_option.dart'; +import 'package:cw_core/wallet_addresses.dart'; """; const zcashCWHeaders = """ @@ -1768,6 +1769,7 @@ abstract class Zcash { Future getHeightByDate(DateTime date); bool showMissingFundsCard(WalletBase wallet); Future rescanInternalChange(WalletBase wallet); + bool ironwoodActive(WalletAddresses walletAddresses); } """;