Ecosystem/stack_wallet
1
0
Fork 0
mirror of https://github.com/cypherstack/stack_wallet.git synced 2025-01-18 16:44:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove old rpc client references

Browse source
This commit is contained in:
sneurlax 2024-02-16 17:05:13 -06:00
parent 9ac8a32821
commit 8e2ca6a6c9
1 changed files with 0 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
lib/electrumx_rpc/electrumx_client.dart
View file

@ -114,7 +114,6 @@ class ElectrumXClient {
required Prefs prefs, required Prefs prefs,
required List<ElectrumXNode> failovers, required List<ElectrumXNode> failovers,
Coin? coin, Coin? coin,
JsonRPC? client,
this.connectionTimeoutForSpecialCaseJsonRPCClients = this.connectionTimeoutForSpecialCaseJsonRPCClients =
const Duration(seconds: 60), const Duration(seconds: 60),
TorService? torService, TorService? torService,
@ -125,7 +124,6 @@ class ElectrumXClient {
_host = host; _host = host;
_port = port; _port = port;
_useSSL = useSSL; _useSSL = useSSL;
_rpcClient = client;
_coin = coin; _coin = coin;
final bus = globalEventBusForTesting ?? GlobalEventBus.instance; final bus = globalEventBusForTesting ?? GlobalEventBus.instance;
@ -155,23 +153,10 @@ class ElectrumXClient {
// case TorStatus.disabled: // case TorStatus.disabled:
// } // }
// might be ok to just reset/kill the current _jsonRpcClient
// since disconnecting is async and we want to ensure instant change over
// we will keep temp reference to current rpc client to call disconnect
// on before awaiting the disconnection future
final temp = _rpcClient;
// setting to null should force the creation of a new json rpc client // setting to null should force the creation of a new json rpc client
// on the next request sent through this electrumx instance // on the next request sent through this electrumx instance
_rpcClient = null;
_electrumAdapterChannel = null; _electrumAdapterChannel = null;
_electrumAdapterClient = null; _electrumAdapterClient = null;
await temp?.disconnect(
reason: "Tor status changed to \"${event.status}\"",
);
}, },
); );
} }
@ -204,58 +189,6 @@ class ElectrumXClient {
return true; return true;
} }
void _checkRpcClient() {
// If we're supposed to use Tor...
if (_prefs.useTor) {
// But Tor isn't running...
if (_torService.status != TorConnectionStatus.connected) {
// And the killswitch isn't set...
if (!_prefs.torKillSwitch) {
// Then we'll just proceed and connect to ElectrumX through clearnet at the bottom of this function.
Logging.instance.log(
"Tor preference set but Tor is not enabled, killswitch not set, connecting to ElectrumX through clearnet",
level: LogLevel.Warning,
);
} else {
// ... But if the killswitch is set, then we throw an exception.
throw Exception(
"Tor preference and killswitch set but Tor is not enabled, not connecting to ElectrumX");
// TODO [prio=low]: Try to start Tor.
}
} else {
// Get the proxy info from the TorService.
final proxyInfo = _torService.getProxyInfo();
if (currentFailoverIndex == -1) {
_rpcClient ??= JsonRPC(
host: host,
port: port,
useSSL: useSSL,
connectionTimeout: connectionTimeoutForSpecialCaseJsonRPCClients,
proxyInfo: proxyInfo,
);
} else {
_rpcClient ??= JsonRPC(
host: failovers![currentFailoverIndex].address,
port: failovers![currentFailoverIndex].port,
useSSL: failovers![currentFailoverIndex].useSSL,
connectionTimeout: connectionTimeoutForSpecialCaseJsonRPCClients,
proxyInfo: proxyInfo,
);
}
if (_rpcClient!.proxyInfo != proxyInfo) {
_rpcClient!.proxyInfo = proxyInfo;
_rpcClient!.disconnect(
reason: "Tor proxyInfo does not match current info",
);
}
return;
}
}
}
Future<void> checkElectrumAdapter() async { Future<void> checkElectrumAdapter() async {
({InternetAddress host, int port})? proxyInfo; ({InternetAddress host, int port})? proxyInfo;