Ecosystem/stack_wallet
1
0
Fork 0
mirror of https://github.com/cypherstack/stack_wallet.git synced 2025-01-08 19:59:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

WIP

Browse source
This commit is contained in:
sneurlax 2023-08-09 11:39:48 -05:00
parent 5552fff3b3
commit 7c8796abfe
2 changed files with 21 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/electrumx_rpc/electrumx.dart
View file

@ -169,7 +169,7 @@ class ElectrumX {
proxyInfo: proxyInfo,
);
} else {
_rpcClient = JsonRPC(
_rpcClient ??= JsonRPC(
host: failovers![currentFailoverIndex].address,
port: failovers![currentFailoverIndex].port,
useSSL: failovers![currentFailoverIndex].useSSL,
@ -187,7 +187,7 @@ class ElectrumX {
proxyInfo: null,
);
} else {
_rpcClient = JsonRPC(
_rpcClient ??= JsonRPC(
host: failovers![currentFailoverIndex].address,
port: failovers![currentFailoverIndex].port,
useSSL: failovers![currentFailoverIndex].useSSL,

46
lib/electrumx_rpc/rpc.dart
View file

@ -103,7 +103,7 @@ class JsonRPC {
Duration requestTimeout,
) async {
await _requestMutex.protect(() async {
if (_socket == null) {
if (_socket == null && _socksSocket == null) {
Logging.instance.log(
"JsonRPC request: opening socket $host:$port",
level: LogLevel.Info,
@ -157,13 +157,16 @@ class JsonRPC {
}
Future<void> connect() async {
if (_socket != null) {
throw Exception(
"JsonRPC attempted to connect to an already existing socket!",
);
}
if (Prefs.instance.useTor) {
if (_socksSocket != null) {
Logging.instance.log(
"JsonRPC.connect(): JsonRPC attempted to connect to an already existing tor socket!",
level: LogLevel.Error);
throw Exception(
"JsonRPC attempted to connect to an already existing tor socket!",
);
}
if (proxyInfo == null) {
// TODO await tor / make sure it's running
proxyInfo = (
@ -174,27 +177,7 @@ class JsonRPC {
"ElectrumX.connect(): no tor proxy info, read $proxyInfo",
level: LogLevel.Warning);
}
// TODO connect to proxy socket...
// https://github.com/LacticWhale/socks_dart/blob/master/lib/src/client/socks_client.dart#L50C46-L50C56
// TODO implement ssl over tor
// if (useSSL) {
// _socket = await SecureSocket.connect(
// host,
// port,
// timeout: connectionTimeout,
// onBadCertificate: (_) => true,
// ); // TODO do not automatically trust bad certificates
// final _client = SocksSocket.protected(_socket, type);
// } else {
// _socket = await Socket.connect(
// proxyInfo!.host,
// proxyInfo!.port,
// timeout: connectionTimeout,
// );
// final _client = SocksSocket.protected(
// _socket!, SocksConnectionType.connect
// );
final InternetAddress _host =
await InternetAddress.lookup(host).then((value) => value.first);
_socksSocket = await SocksTCPClient.connect(
@ -225,6 +208,15 @@ class JsonRPC {
cancelOnError: true,
);
} else {
if (_socket != null) {
Logging.instance.log(
"JsonRPC.connect(): JsonRPC attempted to connect to an already existing socket!",
level: LogLevel.Error);
throw Exception(
"JsonRPC attempted to connect to an already existing socket!",
);
}
if (useSSL) {
_socket = await SecureSocket.connect(
host,