Skip to content

Commit 98ece4d

Browse files
committed
refactor(tor): replace legacy Tor integration
1 parent e4bea02 commit 98ece4d

34 files changed

Lines changed: 345 additions & 513 deletions

Containerfile.tools

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ RUN fvm dart --disable-analytics
267267
# Wrap rustup with a thin shim that does two things before delegating to the
268268
# real binary.
269269
#
270-
# (1) Version pin. cargokit (payjoin_flutter, tor, onion, bull_sdk's rust_builder)
270+
# (1) Version pin. cargokit (payjoin_flutter, onion, bull_sdk's rust_builder)
271271
# hard-codes `rustup run stable cargo build` and `rustup toolchain install
272272
# stable` — its toolchain option is a fixed stable/beta/nightly enum, so it
273273
# cannot name a version. An explicit `rustup run stable` outranks both

ios/Podfile.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
PODS:
2+
- bull_tor (0.0.1):
3+
- Flutter
24
- Flutter (1.0.0)
35
- flutter_secure_storage_legacy (6.0.0):
46
- Flutter
57
- rust_lib_bull_sdk (0.0.1):
68
- Flutter
79
- onion (0.0.1):
810
- Flutter
9-
- tor (0.0.1):
10-
- Flutter
1111
- universal_ble (0.0.1):
1212
- Flutter
1313
- FlutterMacOS
@@ -17,16 +17,18 @@ PODS:
1717
- Flutter
1818

1919
DEPENDENCIES:
20+
- bull_tor (from `.symlinks/plugins/bull_tor/ios`)
2021
- Flutter (from `Flutter`)
2122
- flutter_secure_storage_legacy (from `.symlinks/plugins/flutter_secure_storage_legacy/ios`)
2223
- rust_lib_bull_sdk (from `.symlinks/plugins/rust_lib_bull_sdk/ios`)
2324
- onion (from `.symlinks/plugins/onion/ios`)
24-
- tor (from `.symlinks/plugins/tor/ios`)
2525
- universal_ble (from `.symlinks/plugins/universal_ble/darwin`)
2626
- webview_cookie_manager (from `.symlinks/plugins/webview_cookie_manager/ios`)
2727
- workmanager_apple (from `.symlinks/plugins/workmanager_apple/ios`)
2828

2929
EXTERNAL SOURCES:
30+
bull_tor:
31+
:path: ".symlinks/plugins/bull_tor/ios"
3032
Flutter:
3133
:path: Flutter
3234
flutter_secure_storage_legacy:
@@ -35,8 +37,6 @@ EXTERNAL SOURCES:
3537
:path: ".symlinks/plugins/rust_lib_bull_sdk/ios"
3638
onion:
3739
:path: ".symlinks/plugins/onion/ios"
38-
tor:
39-
:path: ".symlinks/plugins/tor/ios"
4040
universal_ble:
4141
:path: ".symlinks/plugins/universal_ble/darwin"
4242
webview_cookie_manager:
@@ -45,11 +45,11 @@ EXTERNAL SOURCES:
4545
:path: ".symlinks/plugins/workmanager_apple/ios"
4646

4747
SPEC CHECKSUMS:
48+
bull_tor: effca429a77cc1dd71ee148fa65903a325d79d33
4849
Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
4950
flutter_secure_storage_legacy: 2b1517bd98433d760370884d3e2cc3ed8eeb2538
5051
rust_lib_bull_sdk: 160980033dfde220ad447a6dffa22d4269f8ea6c
5152
onion: 4876b9b0120d40a2817eac0903dfb9bd59832755
52-
tor: 767208930250ef7be241963b75568c55c0a81890
5353
universal_ble: 45519b2aeafe62761e2c6309f8927edb5288b914
5454
webview_cookie_manager: d63a76cabdf42a7ea3d92768ac67d4853a1367f8
5555
workmanager_apple: 904529ae31e97fc5be632cf628507652294a0778

lib/core/core_locator.dart

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import 'package:bb_mobile/core/settings/settings_locator.dart';
1313
import 'package:bb_mobile/core/storage/sqlite_database.dart';
1414
import 'package:bb_mobile/core/storage/storage_locator.dart';
1515
import 'package:bb_mobile/core/swaps/swaps_locator.dart';
16-
import 'package:bb_mobile/core/tor/tor_locator.dart';
1716
import 'package:bb_mobile/core/utils/logger.dart';
1817
import 'package:bb_mobile/core/wallet/wallet_locator.dart';
1918
import 'package:bull_tor/tor_adapter.dart' as bull_tor;
@@ -33,7 +32,6 @@ class CoreLocator {
3332
warningCallback: log.warning,
3433
),
3534
);
36-
await TorLocator.registerDatasources(locator);
3735
BlockchainLocator.registerDatasources(locator);
3836
await ElectrumLocator.registerDatasources(locator);
3937
ExchangeLocator.registerDatasources(locator);
@@ -59,7 +57,6 @@ class CoreLocator {
5957

6058
static Future<void> registerRepositories(GetIt locator) async {
6159
bull_tor.TorLocator.registerRepositories(locator);
62-
await TorLocator.registerRepositories(locator);
6360
BlockchainLocator.registerRepositories(locator);
6461
ElectrumLocator.registerRepositories(locator);
6562
ExchangeLocator.registerRepositories(locator);
@@ -95,7 +92,6 @@ class CoreLocator {
9592
StorageLocator.registerUsecases(locator);
9693
SettingsLocator.registerUsecases(locator);
9794
SwapsLocator.registerUsecases(locator);
98-
TorLocator.registerUsecases(locator);
9995
WalletLocator.registerUsecases(locator);
10096
Bip85DerivationsLocator.registerUsecases(locator);
10197
LedgerLocator.registerUsecases(locator);

lib/core/tor/data/datasources/tor_datasource.dart

Lines changed: 0 additions & 79 deletions
This file was deleted.

lib/core/tor/data/repository/tor_repository.dart

Lines changed: 0 additions & 16 deletions
This file was deleted.

lib/core/tor/data/usecases/init_tor_usecase.dart

Lines changed: 0 additions & 15 deletions
This file was deleted.

lib/core/tor/data/usecases/is_tor_required_usecase.dart

Lines changed: 0 additions & 30 deletions
This file was deleted.

lib/core/tor/data/usecases/tor_status_usecase.dart

Lines changed: 0 additions & 16 deletions
This file was deleted.

lib/core/tor/domain/ports/socket_port.dart

Lines changed: 0 additions & 17 deletions
This file was deleted.

lib/core/tor/domain/ports/tor_config_port.dart

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)