diff --git a/.gitmodules b/.gitmodules index 9eef219ef..eb71f2df5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,6 +7,6 @@ [submodule "crypto_plugins/flutter_liblelantus"] path = crypto_plugins/flutter_liblelantus url = https://github.com/cypherstack/flutter_liblelantus.git -[submodule "crypto_plugins/flutter_libarti"] - path = crypto_plugins/flutter_libarti - url = https://github.com/cypherstack/flutter_libarti.git \ No newline at end of file +[submodule "crypto_plugins/tor"] + path = crypto_plugins/tor + url = https://github.com/cypherstack/tor.git \ No newline at end of file diff --git a/crypto_plugins/flutter_libarti b/crypto_plugins/flutter_libarti deleted file mode 160000 index 4c9ad3036..000000000 --- a/crypto_plugins/flutter_libarti +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4c9ad30368ce48faad9e40c4d972df3f44877d4f diff --git a/crypto_plugins/tor b/crypto_plugins/tor new file mode 160000 index 000000000..76c2c70a4 --- /dev/null +++ b/crypto_plugins/tor @@ -0,0 +1 @@ +Subproject commit 76c2c70a4c3601cab5fad4faaa1705374df0dd59 diff --git a/lib/networking/tor_service.dart b/lib/networking/tor_service.dart index 0412440d2..3eb6e4961 100644 --- a/lib/networking/tor_service.dart +++ b/lib/networking/tor_service.dart @@ -1,4 +1,4 @@ -import 'package:flutter_libarti/flutter_libarti.dart'; +import 'package:tor/tor.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:stackwallet/utilities/stack_file_system.dart'; diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index 6143e5daf..397cac07d 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 - flutter_libarti + tor ) set(PLUGIN_BUNDLED_LIBRARIES) diff --git a/pubspec.yaml b/pubspec.yaml index 0298b014e..eabf29e50 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -57,8 +57,8 @@ dependencies: url: https://github.com/cypherstack/bip47.git ref: 081ca1863c2feba00c35bb5b297902f12f499941 - flutter_libarti: - path: ./crypto_plugins/flutter_libarti + tor: + path: ./crypto_plugins/tor # Utility plugins http: ^0.13.0 diff --git a/scripts/linux/build_all.sh b/scripts/linux/build_all.sh index bd6efaa65..9a119d0d6 100755 --- a/scripts/linux/build_all.sh +++ b/scripts/linux/build_all.sh @@ -9,7 +9,7 @@ mkdir -p build (cd ../../crypto_plugins/flutter_liblelantus/scripts/linux && ./build_all.sh ) & (cd ../../crypto_plugins/flutter_libepiccash/scripts/linux && ./build_all.sh ) & (cd ../../crypto_plugins/flutter_libmonero/scripts/linux && ./build_monero_all.sh && ./build_sharedfile.sh ) & -(cd ../../crypto_plugins/flutter_libarti/scripts/linux && ./build_all.sh ) & +(cd ../../crypto_plugins/tor/scripts/linux && ./build_all.sh ) & wait echo "Done building" diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index a73555e77..934f038bc 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 - flutter_libarti + tor ) set(PLUGIN_BUNDLED_LIBRARIES)