diff --git a/lib/electrumx_rpc/electrumx_client.dart b/lib/electrumx_rpc/electrumx_client.dart index dd64d64ef..768b90fc5 100644 --- a/lib/electrumx_rpc/electrumx_client.dart +++ b/lib/electrumx_rpc/electrumx_client.dart @@ -230,7 +230,7 @@ class ElectrumXClient { // If the current ElectrumAdapterClient is closed, create a new one. if (getElectrumAdapter() != null && getElectrumAdapter()!.peer.isClosed) { _electrumAdapterChannel = null; - ClientManager.sharedInstance.remove(cryptoCurrency: cryptoCurrency); + await ClientManager.sharedInstance.remove(cryptoCurrency: cryptoCurrency); } final String useHost; diff --git a/lib/services/price.dart b/lib/services/price.dart index 296537cb4..40c19f16e 100644 --- a/lib/services/price.dart +++ b/lib/services/price.dart @@ -215,7 +215,7 @@ class PriceAPI { } catch (e, s) { // only log the error as we don't want to interrupt the rest of the loop Logging.instance.log( - "getPricesAnd24hChangeForEthTokens($baseCurrency,$contractAddress): $e\n$s\nRESPONSE: $coinGeckoResponse.body", + "getPricesAnd24hChangeForEthTokens($baseCurrency,$contractAddress): $e\n$s\nRESPONSE: ${coinGeckoResponse.body}", level: LogLevel.Warning, ); } diff --git a/pubspec.lock b/pubspec.lock index 372869a27..0ff73a46f 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -604,13 +604,13 @@ packages: source: hosted version: "2.1.0" file: - dependency: "direct overridden" + dependency: transitive description: name: file - sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" + sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c" url: "https://pub.dev" source: hosted - version: "6.1.4" + version: "7.0.0" file_picker: dependency: "direct main" description: @@ -1417,13 +1417,13 @@ packages: source: hosted version: "1.2.0-beta-1" process: - dependency: "direct overridden" + dependency: transitive description: name: process - sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09" + sha256: "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32" url: "https://pub.dev" source: hosted - version: "4.2.4" + version: "5.0.2" protobuf: dependency: transitive description: @@ -2069,13 +2069,13 @@ packages: source: git version: "0.1.0" xdg_directories: - dependency: "direct overridden" + dependency: transitive description: name: xdg_directories - sha256: bd512f03919aac5f1313eb8249f223bacf4927031bf60b02601f81f687689e86 + sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d url: "https://pub.dev" source: hosted - version: "0.2.0+3" + version: "1.0.4" xml: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index f77a92b5a..245dd0b44 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -11,7 +11,7 @@ description: Stack Wallet # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.10.4+217 +version: 2.0.0+219 environment: sdk: ">=3.0.2 <4.0.0" @@ -256,12 +256,8 @@ dependency_overrides: crypto: 3.0.2 analyzer: ^5.2.0 pinenacl: ^0.3.3 - xdg_directories: ^0.2.0 - # flutter_local_notifications_linux: ^0.5.0+1 # Overridden by Solana's package (from espresso_cash - # _public). Disabled for compatibility reasons, may affect Linux desktop notifications. - process: ^4.0.0 - file: ^6.0.0 http: ^0.13.0 + # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/scripts/ios/build_all.sh b/scripts/ios/build_all.sh index db806c3bb..8b03d1b6f 100755 --- a/scripts/ios/build_all.sh +++ b/scripts/ios/build_all.sh @@ -16,8 +16,8 @@ rustup target add x86_64-apple-ios (cd ../../crypto_plugins/flutter_liblelantus/scripts/ios && ./build_all.sh ) & (cd ../../crypto_plugins/flutter_libepiccash/scripts/ios && ./build_all.sh ) & -(cd ../../crypto_plugins/flutter_libmonero/scripts/ios/ && ./build_all.sh ) & -set_rust_to_1720 & +(cd ../../crypto_plugins/flutter_libmonero/scripts/ios/ && ./build_all.sh ) && +set_rust_to_1720 && (cd ../../crypto_plugins/frostdart/scripts/ios && ./build_all.sh ) & wait diff --git a/scripts/macos/build_all.sh b/scripts/macos/build_all.sh index 53d6f9bac..59d1425c9 100755 --- a/scripts/macos/build_all.sh +++ b/scripts/macos/build_all.sh @@ -8,8 +8,8 @@ set_rust_to_1671 (cd ../../crypto_plugins/flutter_liblelantus/scripts/macos && ./build_all.sh ) & (cd ../../crypto_plugins/flutter_libepiccash/scripts/macos && ./build_all.sh ) & -(cd ../../crypto_plugins/flutter_libmonero/scripts/macos/ && ./build_all.sh ) & -set_rust_to_1720 & +(cd ../../crypto_plugins/flutter_libmonero/scripts/macos/ && ./build_all.sh ) && +set_rust_to_1720 && (cd ../../crypto_plugins/frostdart/scripts/macos && ./build_all.sh ) & wait