use updated cargokit, rename tor->tor_ffi_plugin

This commit is contained in:
sneurlax 2023-09-12 13:49:25 -05:00
parent 745a4d553b
commit 50466ff509
7 changed files with 7 additions and 8 deletions

@ -1 +1 @@
Subproject commit 22abf0036d8eda68efda5a31dc32c6f8932de4ec
Subproject commit db8b4873df443205c6f909039c0ea0ef90590093

View file

@ -4,7 +4,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:stackwallet/services/event_bus/events/global/tor_connection_status_changed_event.dart';
import 'package:stackwallet/services/event_bus/global_event_bus.dart';
import 'package:stackwallet/utilities/logger.dart';
import 'package:tor/tor.dart';
import 'package:tor_ffi_plugin/tor_ffi_plugin.dart';
final pTorService = Provider((_) => TorService.sharedInstance);
@ -36,7 +36,7 @@ class TorService {
/// Initialize the tor ffi lib instance if it hasn't already been set. Nothing
/// changes if _tor is already been set.
void init({Tor? mockableOverride}) {
_tor ??= mockableOverride ?? Tor();
_tor ??= mockableOverride ?? Tor.instance;
}
/// Start the Tor service.

View file

@ -146,9 +146,6 @@ 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/native/tor-ffi/target/x86_64-unknown-linux-gnu/release/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}"
COMPONENT Runtime)
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../scripts/linux/build/jsoncpp/build/src/lib_json/libjsoncpp.so.1" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"

View file

@ -15,6 +15,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
)
list(APPEND FLUTTER_FFI_PLUGIN_LIST
tor_ffi_plugin
)
set(PLUGIN_BUNDLED_LIBRARIES)

View file

@ -1644,7 +1644,7 @@ packages:
url: "https://pub.dev"
source: hosted
version: "0.13.1"
tor:
tor_ffi_plugin:
dependency: "direct main"
description:
path: "crypto_plugins/tor"

View file

@ -57,7 +57,7 @@ dependencies:
url: https://github.com/cypherstack/bip47.git
ref: 081ca1863c2feba00c35bb5b297902f12f499941
tor:
tor_ffi_plugin:
path: ./crypto_plugins/tor
# Utility plugins

View file

@ -16,6 +16,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
)
list(APPEND FLUTTER_FFI_PLUGIN_LIST
tor_ffi_plugin
)
set(PLUGIN_BUNDLED_LIBRARIES)