diff --git a/crypto_plugins/flutter_libarti b/crypto_plugins/flutter_libarti new file mode 160000 index 000000000..4c9ad3036 --- /dev/null +++ b/crypto_plugins/flutter_libarti @@ -0,0 +1 @@ +Subproject commit 4c9ad30368ce48faad9e40c4d972df3f44877d4f diff --git a/lib/networking/tor_service.dart b/lib/networking/tor_service.dart index 7085f5401..0412440d2 100644 --- a/lib/networking/tor_service.dart +++ b/lib/networking/tor_service.dart @@ -1,4 +1,4 @@ -import 'package:flutter_libtor/flutter_libtor.dart'; +import 'package:flutter_libarti/flutter_libarti.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:stackwallet/utilities/stack_file_system.dart'; diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index 18faa3a02..026ef6c85 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/flutter_libtor/scripts/linux/build/libtor_ffi.so" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../crypto_plugins/flutter_libarti/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 80415b7fc..6143e5daf 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_libtor + flutter_libarti ) set(PLUGIN_BUNDLED_LIBRARIES) diff --git a/pubspec.lock b/pubspec.lock index b50a60636..7d2594778 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -534,10 +534,10 @@ packages: dependency: "direct main" description: name: ffi - sha256: ed5337a5660c506388a9f012be0288fb38b49020ce2b45fe1f8b8323fe429f99 + sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878" url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.1.0" file: dependency: transitive description: @@ -596,6 +596,13 @@ packages: url: "https://pub.dev" source: hosted version: "0.13.1" + flutter_libarti: + dependency: "direct main" + description: + path: "crypto_plugins/flutter_libarti" + relative: true + source: path + version: "0.0.2" flutter_libepiccash: dependency: "direct main" description: @@ -610,13 +617,6 @@ 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: @@ -1144,50 +1144,50 @@ packages: dependency: "direct main" description: name: path_provider - sha256: "3087813781ab814e4157b172f1a11c46be20179fcc9bea043e0fba36bc0acaa2" + sha256: a1aa8aaa2542a6bc57e381f132af822420216c80d4781f7aa085ca3229208aaa url: "https://pub.dev" source: hosted - version: "2.0.15" + version: "2.1.1" path_provider_android: dependency: transitive description: name: path_provider_android - sha256: "2cec049d282c7f13c594b4a73976b0b4f2d7a1838a6dd5aaf7bd9719196bee86" + sha256: "6b8b19bd80da4f11ce91b2d1fb931f3006911477cec227cce23d3253d80df3f1" url: "https://pub.dev" source: hosted - version: "2.0.27" + version: "2.2.0" path_provider_foundation: dependency: transitive description: name: path_provider_foundation - sha256: "916731ccbdce44d545414dd9961f26ba5fbaa74bcbb55237d8e65a623a8c7297" + sha256: "19314d595120f82aca0ba62787d58dde2cc6b5df7d2f0daf72489e38d1b57f2d" url: "https://pub.dev" source: hosted - version: "2.2.4" + version: "2.3.1" path_provider_linux: dependency: transitive description: name: path_provider_linux - sha256: ffbb8cc9ed2c9ec0e4b7a541e56fd79b138e8f47d2fb86815f15358a349b3b57 + sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279 url: "https://pub.dev" source: hosted - version: "2.1.11" + version: "2.2.1" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface - sha256: "57585299a729335f1298b43245842678cb9f43a6310351b18fb577d6e33165ec" + sha256: "94b1e0dd80970c1ce43d5d4e050a9918fce4f4a775e6142424c30a29a363265c" url: "https://pub.dev" source: hosted - version: "2.0.6" + version: "2.1.1" path_provider_windows: dependency: transitive description: name: path_provider_windows - sha256: "1cb68ba4cd3a795033de62ba1b7b4564dace301f952de6bfb3cd91b202b6ee96" + sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170" url: "https://pub.dev" source: hosted - version: "2.1.7" + version: "2.2.1" permission_handler: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 79b140414..0298b014e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -57,8 +57,8 @@ dependencies: url: https://github.com/cypherstack/bip47.git ref: 081ca1863c2feba00c35bb5b297902f12f499941 - flutter_libtor: - path: ./crypto_plugins/flutter_libtor + flutter_libarti: + path: ./crypto_plugins/flutter_libarti # Utility plugins http: ^0.13.0 diff --git a/scripts/linux/build_all.sh b/scripts/linux/build_all.sh index 1ba99c0bd..bd6efaa65 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_libtor/scripts/linux && ./build_all.sh ) & +(cd ../../crypto_plugins/flutter_libarti/scripts/linux && ./build_all.sh ) & wait echo "Done building" diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index 05f6f6f03..a73555e77 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_libtor + flutter_libarti ) set(PLUGIN_BUNDLED_LIBRARIES)