mirror of
https://github.com/cypherstack/stack_wallet.git
synced 2025-01-10 12:44:31 +00:00
Merge remote-tracking branch 'origin/testing' into tezos
This commit is contained in:
commit
ef15a8e466
6 changed files with 17 additions and 21 deletions
|
@ -230,7 +230,7 @@ class ElectrumXClient {
|
||||||
// If the current ElectrumAdapterClient is closed, create a new one.
|
// If the current ElectrumAdapterClient is closed, create a new one.
|
||||||
if (getElectrumAdapter() != null && getElectrumAdapter()!.peer.isClosed) {
|
if (getElectrumAdapter() != null && getElectrumAdapter()!.peer.isClosed) {
|
||||||
_electrumAdapterChannel = null;
|
_electrumAdapterChannel = null;
|
||||||
ClientManager.sharedInstance.remove(cryptoCurrency: cryptoCurrency);
|
await ClientManager.sharedInstance.remove(cryptoCurrency: cryptoCurrency);
|
||||||
}
|
}
|
||||||
|
|
||||||
final String useHost;
|
final String useHost;
|
||||||
|
|
|
@ -215,7 +215,7 @@ class PriceAPI {
|
||||||
} catch (e, s) {
|
} catch (e, s) {
|
||||||
// only log the error as we don't want to interrupt the rest of the loop
|
// only log the error as we don't want to interrupt the rest of the loop
|
||||||
Logging.instance.log(
|
Logging.instance.log(
|
||||||
"getPricesAnd24hChangeForEthTokens($baseCurrency,$contractAddress): $e\n$s\nRESPONSE: $coinGeckoResponse.body",
|
"getPricesAnd24hChangeForEthTokens($baseCurrency,$contractAddress): $e\n$s\nRESPONSE: ${coinGeckoResponse.body}",
|
||||||
level: LogLevel.Warning,
|
level: LogLevel.Warning,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
18
pubspec.lock
18
pubspec.lock
|
@ -604,13 +604,13 @@ packages:
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "2.1.0"
|
version: "2.1.0"
|
||||||
file:
|
file:
|
||||||
dependency: "direct overridden"
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: file
|
name: file
|
||||||
sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d"
|
sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "6.1.4"
|
version: "7.0.0"
|
||||||
file_picker:
|
file_picker:
|
||||||
dependency: "direct main"
|
dependency: "direct main"
|
||||||
description:
|
description:
|
||||||
|
@ -1417,13 +1417,13 @@ packages:
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.2.0-beta-1"
|
version: "1.2.0-beta-1"
|
||||||
process:
|
process:
|
||||||
dependency: "direct overridden"
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: process
|
name: process
|
||||||
sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09"
|
sha256: "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "4.2.4"
|
version: "5.0.2"
|
||||||
protobuf:
|
protobuf:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
|
@ -2069,13 +2069,13 @@ packages:
|
||||||
source: git
|
source: git
|
||||||
version: "0.1.0"
|
version: "0.1.0"
|
||||||
xdg_directories:
|
xdg_directories:
|
||||||
dependency: "direct overridden"
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: xdg_directories
|
name: xdg_directories
|
||||||
sha256: bd512f03919aac5f1313eb8249f223bacf4927031bf60b02601f81f687689e86
|
sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d
|
||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "0.2.0+3"
|
version: "1.0.4"
|
||||||
xml:
|
xml:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
|
|
|
@ -11,7 +11,7 @@ description: Stack Wallet
|
||||||
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
|
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
|
||||||
# Read more about iOS versioning at
|
# Read more about iOS versioning at
|
||||||
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
|
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
|
||||||
version: 1.10.4+217
|
version: 2.0.0+219
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
sdk: ">=3.0.2 <4.0.0"
|
sdk: ">=3.0.2 <4.0.0"
|
||||||
|
@ -256,12 +256,8 @@ dependency_overrides:
|
||||||
crypto: 3.0.2
|
crypto: 3.0.2
|
||||||
analyzer: ^5.2.0
|
analyzer: ^5.2.0
|
||||||
pinenacl: ^0.3.3
|
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
|
http: ^0.13.0
|
||||||
|
|
||||||
# For information on the generic Dart part of this file, see the
|
# For information on the generic Dart part of this file, see the
|
||||||
# following page: https://dart.dev/tools/pub/pubspec
|
# following page: https://dart.dev/tools/pub/pubspec
|
||||||
|
|
||||||
|
|
|
@ -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_liblelantus/scripts/ios && ./build_all.sh ) &
|
||||||
(cd ../../crypto_plugins/flutter_libepiccash/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 ) &
|
(cd ../../crypto_plugins/flutter_libmonero/scripts/ios/ && ./build_all.sh ) &&
|
||||||
set_rust_to_1720 &
|
set_rust_to_1720 &&
|
||||||
(cd ../../crypto_plugins/frostdart/scripts/ios && ./build_all.sh ) &
|
(cd ../../crypto_plugins/frostdart/scripts/ios && ./build_all.sh ) &
|
||||||
|
|
||||||
wait
|
wait
|
||||||
|
|
|
@ -8,8 +8,8 @@ set_rust_to_1671
|
||||||
|
|
||||||
(cd ../../crypto_plugins/flutter_liblelantus/scripts/macos && ./build_all.sh ) &
|
(cd ../../crypto_plugins/flutter_liblelantus/scripts/macos && ./build_all.sh ) &
|
||||||
(cd ../../crypto_plugins/flutter_libepiccash/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 ) &
|
(cd ../../crypto_plugins/flutter_libmonero/scripts/macos/ && ./build_all.sh ) &&
|
||||||
set_rust_to_1720 &
|
set_rust_to_1720 &&
|
||||||
(cd ../../crypto_plugins/frostdart/scripts/macos && ./build_all.sh ) &
|
(cd ../../crypto_plugins/frostdart/scripts/macos && ./build_all.sh ) &
|
||||||
|
|
||||||
wait
|
wait
|
||||||
|
|
Loading…
Reference in a new issue