Skip to content

feat(monero): enable local monero nodes while Tor is enabled via a "Bypass TOR" node option #1128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
julian-CStack merged 1 commit into from
Apr 30, 2025
Merged

feat(monero): enable local monero nodes while Tor is enabled via a "Bypass TOR" node option #1128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 47 additions & 1 deletion lib/pages/settings_views/global_settings_view/manage_nodes_views/add_edit_node_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,8 @@ class _AddEditNodeViewState extends ConsumerState<AddEditNodeView> {
final plainEnabled =
formData.netOption == TorPlainNetworkOption.clear ||
formData.netOption == TorPlainNetworkOption.both;

final forceNoTor = formData.forceNoTor ?? false;

switch (viewType) {
case AddEditNodeViewType.add:
Expand All @@ -258,6 +260,7 @@ class _AddEditNodeViewState extends ConsumerState<AddEditNodeView> {
isDown: false,
torEnabled: torEnabled,
clearnetEnabled: plainEnabled,
forceNoTor: forceNoTor,
);

await ref
Expand Down Expand Up @@ -285,6 +288,7 @@ class _AddEditNodeViewState extends ConsumerState<AddEditNodeView> {
isDown: false,
torEnabled: torEnabled,
clearnetEnabled: plainEnabled,
forceNoTor: forceNoTor,
);

await ref
Expand Down Expand Up @@ -744,7 +748,7 @@ class _AddEditNodeViewState extends ConsumerState<AddEditNodeView> {
class NodeFormData {
String? name, host, login, password;
int? port;
bool? useSSL, isFailover, trusted;
bool? useSSL, isFailover, trusted, forceNoTor;
TorPlainNetworkOption? netOption;

@override
Expand Down Expand Up @@ -793,6 +797,7 @@ class _NodeFormState extends ConsumerState<NodeForm> {
bool _useSSL = false;
bool _isFailover = false;
bool _trusted = false;
bool _forceNoTor = false;
int? port;
late bool enableSSLCheckbox;
late TorPlainNetworkOption netOption;
Expand Down Expand Up @@ -851,6 +856,7 @@ class _NodeFormState extends ConsumerState<NodeForm> {
ref.read(nodeFormDataProvider).isFailover = _isFailover;
ref.read(nodeFormDataProvider).trusted = _trusted;
ref.read(nodeFormDataProvider).netOption = netOption;
ref.read(nodeFormDataProvider).forceNoTor = _forceNoTor;
}

@override
Expand Down Expand Up @@ -885,6 +891,7 @@ class _NodeFormState extends ConsumerState<NodeForm> {
_useSSL = node.useSSL;
_isFailover = node.isFailover;
_trusted = node.trusted ?? false;
_forceNoTor = node.forceNoTor ?? false;

if (node.torEnabled && !node.clearnetEnabled) {
netOption = TorPlainNetworkOption.tor;
Expand Down Expand Up @@ -1445,9 +1452,48 @@ class _NodeFormState extends ConsumerState<NodeForm> {
),
],
),
if (widget.coin is CryptonoteCurrency && _isLocalNode())
const SizedBox(height: 8),
if (widget.coin is CryptonoteCurrency && _isLocalNode())
Row(
children: [
SizedBox(
width: 20,
height: 20,
child: Checkbox(
fillColor:
!widget.readOnly
? null
: MaterialStateProperty.all(
Theme.of(
context,
).extension<StackColors>()!.checkboxBGDisabled,
),
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
value: _forceNoTor,
onChanged:
!widget.readOnly
? (newValue) {
setState(() {
_forceNoTor = newValue!;
});
_updateState();
}
: null,
),
),
const SizedBox(width: 12),
Text("Bypass TOR", style: STextStyles.itemSubtitle12(context)),
],
),
],
);
}

bool _isLocalNode() {
final host = _hostController.text.toLowerCase();
return host.contains("127.0.0.1") || host.contains("localhost");
}
}

class RadioTextButton<T> extends StatelessWidget {
Expand Down
4 changes: 3 additions & 1 deletion lib/pages/settings_views/global_settings_view/manage_nodes_views/node_details_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,8 @@ class _NodeDetailsViewState extends ConsumerState<NodeDetailsView> {
..login = node.loginName
..port = node.port
..isFailover = node.isFailover
..netOption = netOption;
..netOption = netOption
..forceNoTor = node.forceNoTor;
nodeFormData.password = await node.getPassword(
ref.read(secureStoreProvider),
);
Expand Down Expand Up @@ -396,6 +397,7 @@ class _NodeDetailsViewState extends ConsumerState<NodeDetailsView> {
TorPlainNetworkOption.clear ||
ref.read(nodeFormDataProvider).netOption ==
TorPlainNetworkOption.both,
forceNoTor: ref.read(nodeFormDataProvider).forceNoTor,
);

await ref
Expand Down
4 changes: 2 additions & 2 deletions lib/wallets/wallet/intermediate/lib_monero_wallet.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@ abstract class LibMoneroWallet<T extends CryptonoteCurrency>
trusted: node.trusted ?? false,
useSSL: node.useSSL,
socksProxyAddress:
proxy == null ? null : "${proxy.host.address}:${proxy.port}",
node.forceNoTor ? null : proxy == null ? null : "${proxy.host.address}:${proxy.port}",
);
});
} else {
Expand All @@ -531,7 +531,7 @@ abstract class LibMoneroWallet<T extends CryptonoteCurrency>
trusted: node.trusted ?? false,
useSSL: node.useSSL,
socksProxyAddress:
proxy == null ? null : "${proxy.host.address}:${proxy.port}",
node.forceNoTor ? null : proxy == null ? null : "${proxy.host.address}:${proxy.port}",
);
}
libMoneroWallet?.startSyncing();
Expand Down
Loading