From fee523cd811199ccdd738c333ebcd9483f02ed78 Mon Sep 17 00:00:00 2001 From: Omar Hatem Date: Tue, 18 Mar 2025 17:33:38 +0200 Subject: [PATCH] update only zano on 4.23.3 (#2091) * update only zano on 4.23.3 * update versions [skip ci] --- assets/text/Release_Notes.txt | 4 +--- cw_haven/lib/haven_wallet.dart | 3 +++ cw_monero/pubspec.lock | 4 ++-- cw_monero/pubspec.yaml | 2 +- cw_wownero/pubspec.lock | 4 ++-- cw_wownero/pubspec.yaml | 2 +- cw_zano/pubspec.lock | 4 ++-- cw_zano/pubspec.yaml | 2 +- ios/Podfile.lock | 2 +- ios/Runner.xcodeproj/project.pbxproj | 4 ++++ macos/Podfile.lock | 2 +- scripts/android/app_env.sh | 4 ++-- scripts/ios/app_env.sh | 4 ++-- scripts/linux/app_env.sh | 4 ++-- scripts/macos/app_env.sh | 4 ++-- scripts/prepare_moneroc.sh | 2 +- scripts/windows/build_exe_installer.iss | 2 +- 17 files changed, 29 insertions(+), 24 deletions(-) diff --git a/assets/text/Release_Notes.txt b/assets/text/Release_Notes.txt index d1f91139b..0f8118b4e 100644 --- a/assets/text/Release_Notes.txt +++ b/assets/text/Release_Notes.txt @@ -1,3 +1 @@ -UI/UX enhancements -Stability improvements -Bug fixes \ No newline at end of file +Update for Zano's Hard fork \ No newline at end of file diff --git a/cw_haven/lib/haven_wallet.dart b/cw_haven/lib/haven_wallet.dart index 515fa624e..6316f5a62 100644 --- a/cw_haven/lib/haven_wallet.dart +++ b/cw_haven/lib/haven_wallet.dart @@ -72,6 +72,9 @@ abstract class HavenWalletBase @override String get seed => haven_wallet.getSeed(); + @override + bool get hasRescan => true; + @override MoneroWalletKeys get keys => MoneroWalletKeys( primaryAddress: haven_wallet.getAddress(accountIndex: 0, addressIndex: 0), diff --git a/cw_monero/pubspec.lock b/cw_monero/pubspec.lock index f1510b4bc..56451735a 100644 --- a/cw_monero/pubspec.lock +++ b/cw_monero/pubspec.lock @@ -511,8 +511,8 @@ packages: dependency: "direct main" description: path: "impls/monero.dart" - ref: "65608c09e9093f1cd42c6afd8e9131016c82574b" - resolved-ref: "65608c09e9093f1cd42c6afd8e9131016c82574b" + ref: "84e52393e395d75f449bcd81e23028889538118f" + resolved-ref: "84e52393e395d75f449bcd81e23028889538118f" url: "https://github.com/mrcyjanek/monero_c" source: git version: "0.0.0" diff --git a/cw_monero/pubspec.yaml b/cw_monero/pubspec.yaml index 6a96e41cc..58c5fc968 100644 --- a/cw_monero/pubspec.yaml +++ b/cw_monero/pubspec.yaml @@ -25,7 +25,7 @@ dependencies: monero: git: url: https://github.com/mrcyjanek/monero_c - ref: 65608c09e9093f1cd42c6afd8e9131016c82574b + ref: 84e52393e395d75f449bcd81e23028889538118f path: impls/monero.dart mutex: ^3.1.0 ledger_flutter_plus: ^1.4.1 diff --git a/cw_wownero/pubspec.lock b/cw_wownero/pubspec.lock index 44182ed9f..645beb141 100644 --- a/cw_wownero/pubspec.lock +++ b/cw_wownero/pubspec.lock @@ -471,8 +471,8 @@ packages: dependency: "direct main" description: path: "impls/monero.dart" - ref: "65608c09e9093f1cd42c6afd8e9131016c82574b" - resolved-ref: "65608c09e9093f1cd42c6afd8e9131016c82574b" + ref: "84e52393e395d75f449bcd81e23028889538118f" + resolved-ref: "84e52393e395d75f449bcd81e23028889538118f" url: "https://github.com/mrcyjanek/monero_c" source: git version: "0.0.0" diff --git a/cw_wownero/pubspec.yaml b/cw_wownero/pubspec.yaml index a57c2f25b..d81cda250 100644 --- a/cw_wownero/pubspec.yaml +++ b/cw_wownero/pubspec.yaml @@ -25,7 +25,7 @@ dependencies: monero: git: url: https://github.com/mrcyjanek/monero_c - ref: 65608c09e9093f1cd42c6afd8e9131016c82574b # monero_c hash + ref: 84e52393e395d75f449bcd81e23028889538118f # monero_c hash path: impls/monero.dart mutex: ^3.1.0 diff --git a/cw_zano/pubspec.lock b/cw_zano/pubspec.lock index 74a87487e..55246ad3a 100644 --- a/cw_zano/pubspec.lock +++ b/cw_zano/pubspec.lock @@ -476,8 +476,8 @@ packages: dependency: "direct main" description: path: "impls/monero.dart" - ref: "65608c09e9093f1cd42c6afd8e9131016c82574b" - resolved-ref: "65608c09e9093f1cd42c6afd8e9131016c82574b" + ref: "84e52393e395d75f449bcd81e23028889538118f" + resolved-ref: "84e52393e395d75f449bcd81e23028889538118f" url: "https://github.com/mrcyjanek/monero_c" source: git version: "0.0.0" diff --git a/cw_zano/pubspec.yaml b/cw_zano/pubspec.yaml index 111731f4f..b036a874f 100644 --- a/cw_zano/pubspec.yaml +++ b/cw_zano/pubspec.yaml @@ -26,7 +26,7 @@ dependencies: monero: git: url: https://github.com/mrcyjanek/monero_c - ref: 65608c09e9093f1cd42c6afd8e9131016c82574b # monero_c hash + ref: 84e52393e395d75f449bcd81e23028889538118f # monero_c hash path: impls/monero.dart dev_dependencies: flutter_test: diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 5f8a14daa..57d4589c9 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -239,4 +239,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: e448f662d4c41f0c0b1ccbb78afd57dbf895a597 -COCOAPODS: 1.15.2 +COCOAPODS: 1.16.2 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 864d6c420..d9ff6b66e 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -486,6 +486,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { + ARCHS = "$(ARCHS_STANDARD)"; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; @@ -633,6 +634,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; buildSettings = { + ARCHS = "$(ARCHS_STANDARD)"; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; @@ -657,6 +659,7 @@ "$(PROJECT_DIR)/Flutter", ); MARKETING_VERSION = 1.0.1; + ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = com.fotolockr.cakewallet; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -672,6 +675,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { + ARCHS = "$(ARCHS_STANDARD)"; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; diff --git a/macos/Podfile.lock b/macos/Podfile.lock index 4445e5976..689f0ea03 100644 --- a/macos/Podfile.lock +++ b/macos/Podfile.lock @@ -129,4 +129,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 65ec1541137fb5b35d00490dec1bb48d4d9586bb -COCOAPODS: 1.15.2 +COCOAPODS: 1.16.2 diff --git a/scripts/android/app_env.sh b/scripts/android/app_env.sh index 9419ae1c6..41095ef26 100644 --- a/scripts/android/app_env.sh +++ b/scripts/android/app_env.sh @@ -22,8 +22,8 @@ MONERO_COM_PACKAGE="com.monero.app" MONERO_COM_SCHEME="monero.com" CAKEWALLET_NAME="Cake Wallet" -CAKEWALLET_VERSION="4.23.3" -CAKEWALLET_BUILD_NUMBER=248 +CAKEWALLET_VERSION="4.23.4" +CAKEWALLET_BUILD_NUMBER=249 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 491b7d06a..7d5bfff38 100644 --- a/scripts/ios/app_env.sh +++ b/scripts/ios/app_env.sh @@ -18,8 +18,8 @@ MONERO_COM_BUILD_NUMBER=113 MONERO_COM_BUNDLE_ID="com.cakewallet.monero" CAKEWALLET_NAME="Cake Wallet" -CAKEWALLET_VERSION="4.23.3" -CAKEWALLET_BUILD_NUMBER=301 +CAKEWALLET_VERSION="4.23.4" +CAKEWALLET_BUILD_NUMBER=302 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet" HAVEN_NAME="Haven" diff --git a/scripts/linux/app_env.sh b/scripts/linux/app_env.sh index 91ab2cdeb..ef1747ba6 100755 --- a/scripts/linux/app_env.sh +++ b/scripts/linux/app_env.sh @@ -14,8 +14,8 @@ if [ -n "$1" ]; then fi CAKEWALLET_NAME="Cake Wallet" -CAKEWALLET_VERSION="1.13.3" -CAKEWALLET_BUILD_NUMBER=48 +CAKEWALLET_VERSION="1.13.4" +CAKEWALLET_BUILD_NUMBER=49 if ! [[ " ${TYPES[*]} " =~ " ${APP_LINUX_TYPE} " ]]; then echo "Wrong app type." diff --git a/scripts/macos/app_env.sh b/scripts/macos/app_env.sh index 234d07c66..7410ee3a3 100755 --- a/scripts/macos/app_env.sh +++ b/scripts/macos/app_env.sh @@ -21,8 +21,8 @@ MONERO_COM_BUILD_NUMBER=45 MONERO_COM_BUNDLE_ID="com.cakewallet.monero" CAKEWALLET_NAME="Cake Wallet" -CAKEWALLET_VERSION="1.16.3" -CAKEWALLET_BUILD_NUMBER=106 +CAKEWALLET_VERSION="1.16.4" +CAKEWALLET_BUILD_NUMBER=107 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet" if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then diff --git a/scripts/prepare_moneroc.sh b/scripts/prepare_moneroc.sh index ec2cb4908..133c0ab2f 100755 --- a/scripts/prepare_moneroc.sh +++ b/scripts/prepare_moneroc.sh @@ -8,7 +8,7 @@ if [[ ! -d "monero_c/.git" ]]; then git clone https://github.com/mrcyjanek/monero_c --branch master monero_c cd monero_c - git checkout 65608c09e9093f1cd42c6afd8e9131016c82574b + git checkout 84e52393e395d75f449bcd81e23028889538118f git reset --hard git submodule update --init --force --recursive ./apply_patches.sh monero diff --git a/scripts/windows/build_exe_installer.iss b/scripts/windows/build_exe_installer.iss index 3fb0cd1aa..211017eff 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.4.3" +#define MyAppVersion "0.4.4" #define MyAppPublisher "Cake Labs LLC" #define MyAppURL "https://cakewallet.com/" #define MyAppExeName "CakeWallet.exe"