Public/monero-gui
1
0
Fork 1
mirror of https://github.com/monero-project/monero-gui.git synced 2026-04-11 14:57:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

main: socks5 proxy support

Browse Source
This commit is contained in:
xiphon
2020-07-30 21:26:40 +00:00
parent a563582d95
commit 749c166b10
3 changed files with 70 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
main.qml
View File

@@ -365,6 +365,7 @@ ApplicationWindow {
currentWallet.deviceButtonPressed.connect(onDeviceButtonPressed);
currentWallet.walletPassphraseNeeded.connect(onWalletPassphraseNeededWallet);
currentWallet.transactionCommitted.connect(onTransactionCommitted);
currentWallet.proxyAddress = Qt.binding(persistentSettings.getWalletProxyAddress);
middlePanel.paymentClicked.connect(handlePayment);
middlePanel.sweepUnmixableClicked.connect(handleSweepUnmixable);
middlePanel.getProofClicked.connect(handleGetProof);
@@ -389,7 +390,9 @@ ApplicationWindow {
0,
persistentSettings.is_recovering,
persistentSettings.is_recovering_from_device,
persistentSettings.restore_height);
persistentSettings.restore_height,
persistentSettings.getWalletProxyAddress());
// save wallet keys in case wallet settings have been changed in the init
currentWallet.setPassword(walletPassword);
}
@@ -607,7 +610,14 @@ ApplicationWindow {
const callback = function() {
persistentSettings.useRemoteNode = true;
currentDaemonAddress = persistentSettings.remoteNodeAddress;
currentWallet.initAsync(currentDaemonAddress, isTrustedDaemon());
currentWallet.initAsync(
currentDaemonAddress,
isTrustedDaemon(),
0,
false,
false,
0,
persistentSettings.getWalletProxyAddress());
walletManager.setDaemonAddressAsync(currentDaemonAddress);
};
@@ -625,7 +635,14 @@ ApplicationWindow {
console.log("disconnecting remote node");
persistentSettings.useRemoteNode = false;
currentDaemonAddress = localDaemonAddress
currentWallet.initAsync(currentDaemonAddress, isTrustedDaemon());
currentWallet.initAsync(
currentDaemonAddress,
isTrustedDaemon(),
0,
false,
false,
0,
persistentSettings.getWalletProxyAddress());
walletManager.setDaemonAddressAsync(currentDaemonAddress);
firstBlockSeen = 0;
}
@@ -1403,6 +1420,24 @@ ApplicationWindow {
property string fiatPriceProvider: "kraken"
property string fiatPriceCurrency: "xmrusd"
property string proxyAddress: "127.0.0.1:9050"
property bool proxyEnabled: false
function getProxyAddress() {
if (!proxyEnabled) {
return "";
}
if (proxyAddress == "") {
return "127.0.0.1:0";
}
return proxyAddress;
}
function getWalletProxyAddress() {
if (!useRemoteNode) {
return "";
}
return getProxyAddress();
}
Component.onCompleted: {
MoneroComponents.Style.blackTheme = persistentSettings.blackTheme
}
@@ -2240,9 +2275,11 @@ ApplicationWindow {
Network {
id: network
proxyAddress: persistentSettings.getProxyAddress()
}
WalletManager {
id: walletManager
proxyAddress: persistentSettings.getProxyAddress()
}
}