Merge branch 'main' of https://github.com/cake-tech/cake_wallet into mweb_enhancements_4

assets/bitcoin_electrum_server_list.yml

@@ -3,6 +3,7 @@
   useSSL: true
 -
   uri: btc-electrum.cakewallet.com:50002
+  useSSL: true
   isDefault: true
 -
   uri: electrs.cakewallet.com:50001

assets/text/Release_Notes.txt

@@ -3,4 +3,5 @@ Added wallet groups
 Silent Payment enhancements for speed & reliability
 Monero enhancements
 Introducing StealthEx and LetxExchange
-Additional ERC20 tokens scam detection
+Additional ERC20 tokens scam detection
+Bug fixes

build-guide-linux.md

@@ -15,7 +15,7 @@ These steps will help you configure and execute a build of CakeWallet from its s
 
 ### 1. Installing Package Dependencies
 
-CakeWallet requires some packages to be install on your build system. You may easily install them on your build system with the following command:
+CakeWallet requires some packages to be installed on your build system. You may easily install them on your build system with the following command:
 
 `$ sudo apt install build-essential cmake pkg-config git curl autoconf libtool`
 
@@ -145,7 +145,7 @@ Path to executable file will be:
 
 # Flatpak
 
-For package the built application into flatpak you need fistly to install `flatpak` and `flatpak-builder`:
+For package the built application into flatpak you need firstly to install `flatpak` and `flatpak-builder`:
 
 `$ sudo apt install flatpak flatpak-builder`
 

cw_bitcoin/lib/electrum_wallet.dart

@@ -1064,7 +1064,7 @@ abstract class ElectrumWalletBase
 
       if (sendAll) {
         estimatedTx = await estimateSendAllTx(
-          outputs,
+          updatedOutputs,
           feeRateInt,
           memo: memo,
           credentialsAmount: credentialsAmount,
@@ -1143,7 +1143,7 @@ abstract class ElectrumWalletBase
       } else if (network is BitcoinCashNetwork) {
         txb = ForkedTransactionBuilder(
           utxos: estimatedTx.utxos,
-          outputs: outputs,
+          outputs: updatedOutputs,
           fee: BigInt.from(estimatedTx.fee),
           network: network,
           memo: estimatedTx.memo,

how_to_add_new_wallet_type.md

@@ -5,7 +5,7 @@
 **N:B** Throughout this guide, `walletx` refers to the specific wallet type you want to add. If you're adding `BNB` to CakeWallet, then `walletx` for you here is `bnb`.
 
 **Core Folder/Files Setup**
-- Idenitify your core component/package (major project component), which would power the integration e.g web3dart, solana, onchain etc
+- Identify your core component/package (major project component), which would power the integration e.g web3dart, solana, onchain etc
 - Add a new entry to `WalletType` class in `cw_core/wallet_type.dart`. 
 - Fill out the necessary information in the various functions in the files, concerning the wallet name, the native currency type, symbol etc.
 - Go to `cw_core/lib/currency_for_wallet_type.dart`, in the `currencyForWalletType` function, add a case for `walletx`, returning the native cryptocurrency for `walletx`. 
@@ -144,7 +144,7 @@ You can add as many node entries as desired.
 			}
 		}
 
-- Next, we’ll write the function to change walletX current node to default. An handy function we would make use of later on. Add a new preference key in `lib/entities/preference_key.dart` with the format `PreferencesKey.currentWalletXNodeIdKey`, we’ll use it to identify the current node id.
+- Next, we’ll write the function to change walletX current node to default. A handy function we would make use of later on. Add a new preference key in `lib/entities/preference_key.dart` with the format `PreferencesKey.currentWalletXNodeIdKey`, we’ll use it to identify the current node id.
 
 		Future<void> changeWalletXCurrentNodeToDefault(
 				{required SharedPreferences sharedPreferences, required Box<Node> nodes}) async {
@@ -228,7 +228,7 @@ Now you can run the codebase and successfully create a wallet for type walletX s
 
 **Balance Screen**
 - Go to `lib/view_model/dashboard/balance_view_model.dart`
-- Modify the function to adjust the way the balance is being display on the app: `isHomeScreenSettingsEnabled` 
+- Modify the function to adjust the way the balance is being displayed on the app: `isHomeScreenSettingsEnabled` 
 - Add a case to the `availableBalanceLabel` getter to modify the text being displayed (Available or confirmed)
 - Same for `additionalBalanceLabel` 
 - Next, go to `lib/reactions/fiat_rate_update.dart`

howto-build-ios.md

@@ -57,7 +57,7 @@ Proceed into the source code before proceeding with the next steps:
 
 ### 7. Execute Build & Setup Commands for Cake Wallet
 
-We need to generate project settings like app name, app icon, package name, etc. For this need to setup environment variables and configure project files. 
+We need to generate project settings like app name, app icon, package name, etc. For this, we need to setup environment variables and configure project files. 
 
 Please pick what app you want to build: cakewallet or monero.com.
 
@@ -92,7 +92,7 @@ Then we need to generate localization files and mobx models.
 
 `$ flutter build ios --release`
 
-Then you can open `ios/Runner.xcworkspace` with Xcode and you can to archive the application.
+Then you can open `ios/Runner.xcworkspace` with Xcode and you can archive the application.
 
 Or if you want to run to connected device:
 

howto-build-windows.md

@@ -22,7 +22,7 @@ Then install `Desktop development with C++` packages via Visual Studio 2022, or
 - `C++ 2022 Redistributable Update`
 - `C++ core desktop features`
 - `MVC v143 - VS 2022 C++ x64/x86 build tools`
-- `C++ CMake tools for Windwos`
+- `C++ CMake tools for Windows`
 - `Testing tools core features - Build Tools`
 - `C++ AddressSanitizer`.
 
@@ -38,7 +38,7 @@ For building monero dependencies, it is required to install Windows WSL (https:/
 
 ### 5. Pull Cake Wallet source code
 
-You can downlaod CakeWallet source code from our [GitHub repository](github.com/cake-tech/cake_wallet) via git:
+You can download CakeWallet source code from our [GitHub repository](github.com/cake-tech/cake_wallet) via git:
 `$ git clone https://github.com/cake-tech/cake_wallet.git --branch MrCyjaneK-cyjan-monerodart`
 OR you can download it as [Zip archive](https://github.com/cake-tech/cake_wallet/archive/refs/heads/MrCyjaneK-cyjan-monerodart.zip)
 
@@ -52,6 +52,6 @@ For that you need to run the shell (bash - typically same named utility should b
 
 To configure the application, open the directory where you have downloaded or unarchived Cake Wallet sources and run `cakewallet.bat`.
 Or if you used WSL and have active shell session you can run `$ ./cakewallet.sh` script in `scripts/windows` which will run `cakewallet.bat` in WSL.
-After execution of `cakewallet.bat` you should to get `Cake Wallet.zip` in project root directory which will contains `CakeWallet.exe` file and another needed files for run the application. Now you can extract files from `Cake Wallet.zip` archive and run the application.
+After execution of `cakewallet.bat` you should to get `Cake Wallet.zip` in project root directory which will contain `CakeWallet.exe` file and another needed files for run the application. Now you can extract files from `Cake Wallet.zip` archive and run the application.
 
 Copyright (c) 2024 Cake Labs LLC.

lib/entities/default_settings_migration.dart

@@ -256,6 +256,9 @@ Future<void> defaultSettingsMigration(
           await _addSethNode(nodes, sharedPreferences);
           await updateTronNodesWithNowNodes(sharedPreferences: sharedPreferences, nodes: nodes);
           break;
+        case 42:
+          updateBtcElectrumNodeToUseSSL(nodes, sharedPreferences);
+          break;
         default:
           break;
       }
@@ -270,6 +273,15 @@ Future<void> defaultSettingsMigration(
   await sharedPreferences.setInt(PreferencesKey.currentDefaultSettingsMigrationVersion, version);
 }
 
+void updateBtcElectrumNodeToUseSSL(Box<Node> nodes, SharedPreferences sharedPreferences) {
+  final btcElectrumNode = nodes.values.firstWhereOrNull((element) => element.uriRaw == newCakeWalletBitcoinUri);
+
+  if (btcElectrumNode != null) {
+    btcElectrumNode.useSSL = true;
+    btcElectrumNode.save();
+  }
+}
+
 void _deselectQuantex(SharedPreferences sharedPreferences) {
   final Map<String, dynamic> exchangeProvidersSelection =
       json.decode(sharedPreferences.getString(PreferencesKey.exchangeProvidersSelection) ?? "{}")

lib/main.dart

@@ -192,7 +192,7 @@ Future<void> initializeAppConfigs() async {
     transactionDescriptions: transactionDescriptions,
     secureStorage: secureStorage,
     anonpayInvoiceInfo: anonpayInvoiceInfo,
-    initialMigrationVersion: 41,
+    initialMigrationVersion: 42,
   );
 }
 

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.20.0"
-CAKEWALLET_BUILD_NUMBER=232
+CAKEWALLET_VERSION="4.20.1"
+CAKEWALLET_BUILD_NUMBER=233
 CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
 CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"
 CAKEWALLET_SCHEME="cakewallet"

scripts/ios/app_env.sh

@@ -18,8 +18,8 @@ MONERO_COM_BUILD_NUMBER=101
 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="4.20.0"
-CAKEWALLET_BUILD_NUMBER=276
+CAKEWALLET_VERSION="4.20.1"
+CAKEWALLET_BUILD_NUMBER=277
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
 
 HAVEN_NAME="Haven"

scripts/linux/app_env.sh

@@ -14,8 +14,8 @@ if [ -n "$1" ]; then
 fi
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="1.10.0"
-CAKEWALLET_BUILD_NUMBER=36
+CAKEWALLET_VERSION="1.10.1"
+CAKEWALLET_BUILD_NUMBER=37
 
 if ! [[ " ${TYPES[*]} " =~ " ${APP_LINUX_TYPE} " ]]; then
     echo "Wrong app type."

scripts/macos/app_env.sh

@@ -21,8 +21,8 @@ MONERO_COM_BUILD_NUMBER=34
 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="1.13.0"
-CAKEWALLET_BUILD_NUMBER=92
+CAKEWALLET_VERSION="1.13.1"
+CAKEWALLET_BUILD_NUMBER=93
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
 
 if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then

scripts/windows/build_exe_installer.iss

@@ -1,5 +1,5 @@
 #define MyAppName "Cake Wallet"
-#define MyAppVersion "0.1.0"
+#define MyAppVersion "0.1.1"
 #define MyAppPublisher "Cake Labs LLC"
 #define MyAppURL "https://cakewallet.com/"
 #define MyAppExeName "CakeWallet.exe"