diff --git a/crypto_plugins/flutter_libtor b/crypto_plugins/flutter_libtor index 27699e12f..f076853b8 160000 --- a/crypto_plugins/flutter_libtor +++ b/crypto_plugins/flutter_libtor @@ -1 +1 @@ -Subproject commit 27699e12f509e8c06f1085dab08932126d61162b +Subproject commit f076853b8ad231d882b1b26d44e22ef9ff2cbcf4 diff --git a/lib/networking/tor_service.dart b/lib/networking/tor_service.dart index 5b1aa4616..9c27a35e0 100644 --- a/lib/networking/tor_service.dart +++ b/lib/networking/tor_service.dart @@ -1,6 +1,6 @@ +import 'package:flutter_libtor/flutter_libtor.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:stackwallet/utilities/stack_file_system.dart'; -import 'package:tor/tor.dart'; final pTorService = Provider((_) => TorService.sharedInstance); diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index 1fa44c9b7..18faa3a02 100644 --- a/linux/CMakeLists.txt +++ b/linux/CMakeLists.txt @@ -146,7 +146,7 @@ install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/flutter_libepiccash install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/flutter_liblelantus/scripts/linux/build/libmobileliblelantus.so" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" COMPONENT Runtime) -install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/tor/scripts/linux/build/native/target/x86_64-unknown-linux-gnu/release/libtor_ffi.so" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/flutter_libtor/scripts/linux/build/libtor_ffi.so" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" COMPONENT Runtime) install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../scripts/linux/build/jsoncpp/build/src/lib_json/libjsoncpp.so.1.7.4" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index 397cac07d..80415b7fc 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -15,7 +15,7 @@ list(APPEND FLUTTER_PLUGIN_LIST ) list(APPEND FLUTTER_FFI_PLUGIN_LIST - tor + flutter_libtor ) set(PLUGIN_BUNDLED_LIBRARIES) diff --git a/pubspec.lock b/pubspec.lock index 675c61c54..b50a60636 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -610,6 +610,13 @@ packages: relative: true source: path version: "0.0.1" + flutter_libtor: + dependency: "direct main" + description: + path: "crypto_plugins/flutter_libtor" + relative: true + source: path + version: "0.0.2" flutter_lints: dependency: "direct dev" description: @@ -1595,13 +1602,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.13.1" - tor: - dependency: "direct main" - description: - path: "crypto_plugins/tor" - relative: true - source: path - version: "0.0.1" tuple: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 6928a17e1..90f986fa7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -57,8 +57,8 @@ dependencies: url: https://github.com/cypherstack/bip47.git ref: 081ca1863c2feba00c35bb5b297902f12f499941 - tor: - path: ./crypto_plugins/tor + flutter_libtor: + path: ./crypto_plugins/flutter_libtor # Utility plugins http: ^0.13.0 diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index 934f038bc..05f6f6f03 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -16,7 +16,7 @@ list(APPEND FLUTTER_PLUGIN_LIST ) list(APPEND FLUTTER_FFI_PLUGIN_LIST - tor + flutter_libtor ) set(PLUGIN_BUNDLED_LIBRARIES)