diff --git a/assets/solana_node_list.yml b/assets/solana_node_list.yml index e5641d3f8..c96b370a8 100644 --- a/assets/solana_node_list.yml +++ b/assets/solana_node_list.yml @@ -1,10 +1,10 @@ - uri: rpc.ankr.com - is_default: true useSSL: true - uri: api.mainnet-beta.solana.com:443 useSSL: true - uri: solana-rpc.publicnode.com:443 - useSSL: true \ No newline at end of file + useSSL: true + is_default: true \ No newline at end of file diff --git a/assets/text/Monerocom_Release_Notes.txt b/assets/text/Monerocom_Release_Notes.txt index 556010062..3a6706a26 100644 --- a/assets/text/Monerocom_Release_Notes.txt +++ b/assets/text/Monerocom_Release_Notes.txt @@ -1,2 +1,3 @@ -UI/UX enhancements -Bug fixes and app improvements \ No newline at end of file +Support Monero Ledger +Bug fixes +New designs and better user experience \ No newline at end of file diff --git a/assets/text/Release_Notes.txt b/assets/text/Release_Notes.txt index 556010062..f7d5e4d2c 100644 --- a/assets/text/Release_Notes.txt +++ b/assets/text/Release_Notes.txt @@ -1,2 +1,5 @@ -UI/UX enhancements -Bug fixes and app improvements \ No newline at end of file +Support Monero Ledger +Prepare for Haven removal +Improve Ethereum and Polygon sending process +Bug fixes +New designs and better user experience \ No newline at end of file diff --git a/assets/tron_node_list.yml b/assets/tron_node_list.yml index f9fd91179..1e34de712 100644 --- a/assets/tron_node_list.yml +++ b/assets/tron_node_list.yml @@ -4,9 +4,8 @@ useSSL: true - uri: api.trongrid.io - is_default: false + is_default: true useSSL: true - uri: trx.nownodes.io - is_default: true useSSL: true \ No newline at end of file diff --git a/cw_bitcoin/lib/electrum_wallet.dart b/cw_bitcoin/lib/electrum_wallet.dart index d9041cba4..64eafb021 100644 --- a/cw_bitcoin/lib/electrum_wallet.dart +++ b/cw_bitcoin/lib/electrum_wallet.dart @@ -1099,6 +1099,7 @@ abstract class ElectrumWalletBase )..addListener((transaction) async { transactionHistory.addOne(transaction); await updateBalance(); + await updateAllUnspents(); }); } @@ -1191,6 +1192,7 @@ abstract class ElectrumWalletBase .removeWhere((utxo) => estimatedTx.utxos.any((e) => e.utxo.txHash == utxo.hash)); await updateBalance(); + await updateAllUnspents(); }); } catch (e) { throw e; @@ -1796,6 +1798,7 @@ abstract class ElectrumWalletBase }); transactionHistory.addOne(transaction); await updateBalance(); + await updateAllUnspents(); }); } catch (e) { throw e; diff --git a/cw_haven/pubspec.lock b/cw_haven/pubspec.lock index cb5d3e2c3..b6cae9f39 100644 --- a/cw_haven/pubspec.lock +++ b/cw_haven/pubspec.lock @@ -716,10 +716,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" + sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc url: "https://pub.dev" source: hosted - version: "14.2.5" + version: "14.2.4" watcher: dependency: "direct overridden" description: diff --git a/cw_monero/pubspec.lock b/cw_monero/pubspec.lock index 9aa076a56..24be1c0dd 100644 --- a/cw_monero/pubspec.lock +++ b/cw_monero/pubspec.lock @@ -829,10 +829,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" + sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc url: "https://pub.dev" source: hosted - version: "14.2.5" + version: "14.2.4" watcher: dependency: "direct overridden" description: diff --git a/cw_nano/pubspec.lock b/cw_nano/pubspec.lock index f4d5c00f8..f426d96dc 100644 --- a/cw_nano/pubspec.lock +++ b/cw_nano/pubspec.lock @@ -874,10 +874,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" + sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc url: "https://pub.dev" source: hosted - version: "14.2.5" + version: "14.2.4" watcher: dependency: "direct overridden" description: diff --git a/cw_polygon/lib/polygon_client.dart b/cw_polygon/lib/polygon_client.dart index d9f96d1c9..cb8331977 100644 --- a/cw_polygon/lib/polygon_client.dart +++ b/cw_polygon/lib/polygon_client.dart @@ -22,11 +22,11 @@ class PolygonClient extends EVMChainClient { from: from, to: to, value: amount, - data: data, + // data: data, maxGas: maxGas, - gasPrice: gasPrice, - maxFeePerGas: maxFeePerGas, - maxPriorityFeePerGas: maxPriorityFeePerGas, + // gasPrice: gasPrice, + // maxFeePerGas: maxFeePerGas, + // maxPriorityFeePerGas: maxPriorityFeePerGas, ); } diff --git a/cw_wownero/pubspec.lock b/cw_wownero/pubspec.lock index 532bb236b..1e16fa089 100644 --- a/cw_wownero/pubspec.lock +++ b/cw_wownero/pubspec.lock @@ -757,10 +757,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" + sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc url: "https://pub.dev" source: hosted - version: "14.2.5" + version: "14.2.4" watcher: dependency: "direct overridden" description: diff --git a/lib/entities/default_settings_migration.dart b/lib/entities/default_settings_migration.dart index 92cb752cd..64370503f 100644 --- a/lib/entities/default_settings_migration.dart +++ b/lib/entities/default_settings_migration.dart @@ -1,13 +1,11 @@ import 'dart:convert'; import 'dart:io' show Directory, File, Platform; import 'package:cake_wallet/bitcoin/bitcoin.dart'; -import 'package:cake_wallet/core/key_service.dart'; import 'package:cake_wallet/core/secure_storage.dart'; import 'package:cake_wallet/entities/exchange_api_mode.dart'; import 'package:cake_wallet/entities/fiat_api_mode.dart'; import 'package:cake_wallet/entities/haven_seed_store.dart'; import 'package:cake_wallet/haven/haven.dart'; -import 'package:cw_core/cake_hive.dart'; import 'package:cw_core/pathForWallet.dart'; import 'package:cake_wallet/entities/secret_store_key.dart'; import 'package:cw_core/root_dir.dart'; @@ -42,8 +40,8 @@ const polygonDefaultNodeUri = 'polygon-bor.publicnode.com'; const cakeWalletBitcoinCashDefaultNodeUri = 'bitcoincash.stackwallet.com:50002'; const nanoDefaultNodeUri = 'nano.nownodes.io'; const nanoDefaultPowNodeUri = 'rpc.nano.to'; -const solanaDefaultNodeUri = 'rpc.ankr.com'; -const tronDefaultNodeUri = 'trx.nownodes.io'; +const solanaDefaultNodeUri = 'solana-rpc.publicnode.com:443'; +const tronDefaultNodeUri = 'api.trongrid.io'; const newCakeWalletBitcoinUri = 'btc-electrum.cakewallet.com:50002'; const wowneroDefaultNodeUri = 'node3.monerodevs.org:34568'; const moneroWorldNodeUri = '.moneroworld.com'; @@ -311,6 +309,27 @@ Future defaultSettingsMigration( type: WalletType.ethereum, useSSL: true, ); + _changeDefaultNode( + nodes: nodes, + sharedPreferences: sharedPreferences, + type: WalletType.tron, + newDefaultUri: tronDefaultNodeUri, + currentNodePreferenceKey: PreferencesKey.currentTronNodeIdKey, + useSSL: true, + oldUri: [ + 'tron-rpc.publicnode.com:443', + 'trx.nownodes.io', + ], + ); + _changeDefaultNode( + nodes: nodes, + sharedPreferences: sharedPreferences, + type: WalletType.solana, + newDefaultUri: solanaDefaultNodeUri, + currentNodePreferenceKey: PreferencesKey.currentSolanaNodeIdKey, + useSSL: true, + oldUri: ['rpc.ankr.com'], + ); default: break; } @@ -332,6 +351,7 @@ Future _backupHavenSeeds(Box havenSeedStore) async { } return; } + /// generic function for changing any wallet default node /// instead of making a new function for each change Future _changeDefaultNode({ diff --git a/lib/entities/parse_address_from_domain.dart b/lib/entities/parse_address_from_domain.dart index 54fa4e75a..5c5075737 100644 --- a/lib/entities/parse_address_from_domain.dart +++ b/lib/entities/parse_address_from_domain.dart @@ -134,6 +134,7 @@ class AddressResolver { Future resolve(BuildContext context, String text, CryptoCurrency currency) async { final ticker = currency.title; try { + // twitter handle example: @username if (text.startsWith('@') && !text.substring(1).contains('@')) { if (settingsStore.lookupsTwitter) { final formattedName = text.substring(1); @@ -165,6 +166,7 @@ class AddressResolver { } } + // Mastodon example: @username@hostname.xxx if (text.startsWith('@') && text.contains('@', 1) && text.contains('.', 1)) { if (settingsStore.lookupsMastodon) { final subText = text.substring(1); diff --git a/lib/view_model/send/send_view_model.dart b/lib/view_model/send/send_view_model.dart index f2e524847..1cdb20043 100644 --- a/lib/view_model/send/send_view_model.dart +++ b/lib/view_model/send/send_view_model.dart @@ -26,7 +26,6 @@ import 'package:cw_core/transaction_priority.dart'; import 'package:cw_core/unspent_coin_type.dart'; import 'package:cake_wallet/view_model/send/output.dart'; import 'package:cake_wallet/view_model/send/send_template_view_model.dart'; -import 'package:cw_core/utils/print_verbose.dart'; import 'package:cw_solana/solana_exceptions.dart'; import 'package:flutter/material.dart'; import 'package:hive/hive.dart'; @@ -100,6 +99,8 @@ abstract class SendViewModelBase extends WalletChangeListenerViewModel with Stor outputs .add(Output(wallet, _settingsStore, _fiatConversationStore, () => selectedCryptoCurrency)); + + unspentCoinsListViewModel.initialSetup(); } @observable @@ -717,9 +718,9 @@ abstract class SendViewModelBase extends WalletChangeListenerViewModel with Stor return '''${S.current.insufficient_funds_for_tx} \n\n''' - '''${S.current.balance}: ${parsedErrorMessageResult.balanceEth} ETH (${parsedErrorMessageResult.balanceUsd} USD)\n\n''' - '''${S.current.transaction_cost}: ${parsedErrorMessageResult.txCostEth} ETH (${parsedErrorMessageResult.txCostUsd} USD)\n\n''' - '''${S.current.overshot}: ${parsedErrorMessageResult.overshotEth} ETH (${parsedErrorMessageResult.overshotUsd} USD)'''; + '''${S.current.balance}: ${parsedErrorMessageResult.balanceEth} ${walletType == WalletType.polygon ? "POL" : "ETH"} (${parsedErrorMessageResult.balanceUsd} ${fiatFromSettings.name})\n\n''' + '''${S.current.transaction_cost}: ${parsedErrorMessageResult.txCostEth} ${walletType == WalletType.polygon ? "POL" : "ETH"} (${parsedErrorMessageResult.txCostUsd} ${fiatFromSettings.name})\n\n''' + '''${S.current.overshot}: ${parsedErrorMessageResult.overshotEth} ${walletType == WalletType.polygon ? "POL" : "ETH"} (${parsedErrorMessageResult.overshotUsd} ${fiatFromSettings.name})'''; } return errorMessage; diff --git a/scripts/android/app_env.sh b/scripts/android/app_env.sh index 24f1f5a51..385414f24 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.18.2" -MONERO_COM_BUILD_NUMBER=108 +MONERO_COM_VERSION="1.19.0" +MONERO_COM_BUILD_NUMBER=109 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.21.2" -CAKEWALLET_BUILD_NUMBER=239 +CAKEWALLET_VERSION="4.22.0" +CAKEWALLET_BUILD_NUMBER=240 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 816ddd29a..580adad8e 100644 --- a/scripts/ios/app_env.sh +++ b/scripts/ios/app_env.sh @@ -13,13 +13,13 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN) APP_IOS_TYPE=$1 MONERO_COM_NAME="Monero.com" -MONERO_COM_VERSION="1.18.2" -MONERO_COM_BUILD_NUMBER=105 +MONERO_COM_VERSION="1.19.0" +MONERO_COM_BUILD_NUMBER=106 MONERO_COM_BUNDLE_ID="com.cakewallet.monero" CAKEWALLET_NAME="Cake Wallet" -CAKEWALLET_VERSION="4.21.2" -CAKEWALLET_BUILD_NUMBER=284 +CAKEWALLET_VERSION="4.22.0" +CAKEWALLET_BUILD_NUMBER=287 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet" HAVEN_NAME="Haven" diff --git a/scripts/linux/app_env.sh b/scripts/linux/app_env.sh index 12f4cf8be..6d8557d6c 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.11.2" -CAKEWALLET_BUILD_NUMBER=40 +CAKEWALLET_VERSION="1.12.0" +CAKEWALLET_BUILD_NUMBER=41 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 bed3eb326..37e7890c4 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.8.1" -MONERO_COM_BUILD_NUMBER=37 +MONERO_COM_VERSION="1.9.0" +MONERO_COM_BUILD_NUMBER=39 MONERO_COM_BUNDLE_ID="com.cakewallet.monero" CAKEWALLET_NAME="Cake Wallet" -CAKEWALLET_VERSION="1.14.2" -CAKEWALLET_BUILD_NUMBER=98 +CAKEWALLET_VERSION="1.15.0" +CAKEWALLET_BUILD_NUMBER=99 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 2cdd8c47c..155e65005 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.2.1" +#define MyAppVersion "0.3.0" #define MyAppPublisher "Cake Labs LLC" #define MyAppURL "https://cakewallet.com/" #define MyAppExeName "CakeWallet.exe"