mirror of
https://github.com/cypherstack/stack_wallet.git
synced 2025-03-12 09:27:01 +00:00
Merge branch 'staging' into deskcam
This commit is contained in:
commit
66f29ab1f5
5 changed files with 16 additions and 18 deletions
|
@ -1 +1 @@
|
|||
Subproject commit 982f5ab19fe0dd3dd3f6be2c46f8dff13d49027c
|
||||
Subproject commit db7585d8cd493b143e0a0652c618904d1f636d1d
|
|
@ -52,6 +52,8 @@ import '../../../../../wallets/isar/models/frost_wallet_info.dart';
|
|||
import '../../../../../wallets/isar/models/wallet_info.dart';
|
||||
import '../../../../../wallets/wallet/impl/bitcoin_frost_wallet.dart';
|
||||
import '../../../../../wallets/wallet/impl/epiccash_wallet.dart';
|
||||
import '../../../../../wallets/wallet/impl/monero_wallet.dart';
|
||||
import '../../../../../wallets/wallet/impl/wownero_wallet.dart';
|
||||
import '../../../../../wallets/wallet/wallet.dart';
|
||||
import '../../../../../wallets/wallet/wallet_mixin_interfaces/cw_based_interface.dart';
|
||||
import '../../../../../wallets/wallet/wallet_mixin_interfaces/mnemonic_interface.dart';
|
||||
|
@ -486,7 +488,13 @@ abstract class SWB {
|
|||
privateKey: privateKey,
|
||||
);
|
||||
|
||||
await wallet.init();
|
||||
if (wallet is MoneroWallet /*|| wallet is WowneroWallet doesn't work.*/) {
|
||||
await wallet.init(isRestore: true);
|
||||
} else if (wallet is WowneroWallet) {
|
||||
await wallet.init(isRestore: true);
|
||||
} else {
|
||||
await wallet.init();
|
||||
}
|
||||
|
||||
int restoreHeight = walletbackup['restoreHeight'] as int? ?? 0;
|
||||
if (restoreHeight <= 0) {
|
||||
|
|
|
@ -150,7 +150,7 @@ Future<MoneroNodeConnectionResponse> testMoneroNodeConnection(
|
|||
|
||||
final response = await request.close();
|
||||
final result = await response.transform(utf8.decoder).join();
|
||||
print("HTTP Response: $result");
|
||||
// print("HTTP Response: $result");
|
||||
|
||||
final success =
|
||||
result.contains('"result":') && !result.contains('"error"');
|
||||
|
|
|
@ -114,7 +114,7 @@ Future<bool> testNodeConnection({
|
|||
final url = formData.host!;
|
||||
final uri = Uri.tryParse(url);
|
||||
if (uri != null) {
|
||||
if (!uri.hasScheme) {
|
||||
if (!uri.hasScheme && !uri.host.endsWith(".onion")) {
|
||||
// try https first
|
||||
testPassed = await _xmrHelper(
|
||||
formData
|
||||
|
@ -136,16 +136,6 @@ Future<bool> testNodeConnection({
|
|||
proxyInfo,
|
||||
);
|
||||
}
|
||||
} else if (!uri.hasScheme && uri.host.endsWith(".onion")) {
|
||||
// We can just test http for onion addresses.
|
||||
testPassed = await _xmrHelper(
|
||||
formData
|
||||
..host = url
|
||||
..useSSL = false,
|
||||
context,
|
||||
onSuccess,
|
||||
proxyInfo,
|
||||
);
|
||||
} else {
|
||||
testPassed = await _xmrHelper(
|
||||
formData
|
||||
|
|
|
@ -92,8 +92,8 @@ install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/flutter_libmonero/s
|
|||
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/flutter_libmonero/scripts/monero_c/release/wownero/x86_64-w64-mingw32_libwallet2_api_c.dll" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" RENAME "wownero_libwallet2_api_c.dll"
|
||||
COMPONENT Runtime)
|
||||
|
||||
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/flutter_libmonero/scripts/monero_c/release/wownero/x86_64-w64-mingw32_libgcc_s_seh-1.dll" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" RENAME "libgcc_s_seh-1.dll"
|
||||
COMPONENT Runtime)
|
||||
#install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/flutter_libmonero/scripts/monero_c/release/wownero/x86_64-w64-mingw32_libgcc_s_seh-1.dll" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" RENAME "libgcc_s_seh-1.dll"
|
||||
# COMPONENT Runtime)
|
||||
|
||||
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/flutter_libmonero/scripts/monero_c/release/wownero/x86_64-w64-mingw32_libpolyseed.dll" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" RENAME "libpolyseed.dll"
|
||||
COMPONENT Runtime)
|
||||
|
@ -101,8 +101,8 @@ install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/flutter_libmonero/s
|
|||
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/flutter_libmonero/scripts/monero_c/release/wownero/x86_64-w64-mingw32_libssp-0.dll" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" RENAME "libssp-0.dll"
|
||||
COMPONENT Runtime)
|
||||
|
||||
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/flutter_libmonero/scripts/monero_c/release/wownero/x86_64-w64-mingw32_libstdc++-6.dll" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" RENAME "libstdc++-6.dll"
|
||||
COMPONENT Runtime)
|
||||
#install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/flutter_libmonero/scripts/monero_c/release/wownero/x86_64-w64-mingw32_libstdc++-6.dll" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" RENAME "libstdc++-6.dll"
|
||||
# COMPONENT Runtime)
|
||||
|
||||
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/flutter_libmonero/scripts/monero_c/release/wownero/x86_64-w64-mingw32_libwinpthread-1.dll" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" RENAME "libwinpthread-1.dll"
|
||||
COMPONENT Runtime)
|
||||
|
|
Loading…
Reference in a new issue