diff options
| -rw-r--r-- | main.qml | 15 | ||||
| -rw-r--r-- | pages/settings/SettingsNode.qml | 4 | ||||
| -rw-r--r-- | wizard/WizardDaemonSettings.qml | 4 |
3 files changed, 17 insertions, 6 deletions
@@ -78,7 +78,7 @@ ApplicationWindow { property bool androidCloseTapped: false; property int userLastActive; // epoch // Default daemon addresses - readonly property string localDaemonAddress : persistentSettings.nettype == NetworkType.MAINNET ? "localhost:18081" : persistentSettings.nettype == NetworkType.TESTNET ? "localhost:28081" : "localhost:38081" + readonly property string localDaemonAddress : "localhost:" + getDefaultDaemonRpcPort(persistentSettings.nettype) property string currentDaemonAddress; property bool startLocalNodeCancelled: false property int estimatedBlockchainSize: 50 // GB @@ -1030,7 +1030,7 @@ ApplicationWindow { property bool allow_background_mining : false property bool miningIgnoreBattery : true property var nettype: NetworkType.MAINNET - property string daemon_address: nettype == NetworkType.TESTNET ? "localhost:28081" : nettype == NetworkType.STAGENET ? "localhost:38081" : "localhost:18081" + property string daemon_address: "localhost:" + getDefaultDaemonRpcPort(nettype) property string payment_id property int restore_height : 0 property bool is_trusted_daemon : false @@ -1892,6 +1892,17 @@ ApplicationWindow { passwordDialog.open(); } + function getDefaultDaemonRpcPort(networkType) { + switch (networkType) { + case NetworkType.STAGENET: + return 38081; + case NetworkType.TESTNET: + return 28081; + default: + return 18081; + } + } + // Daemon console DaemonConsole { id: daemonConsolePopup diff --git a/pages/settings/SettingsNode.qml b/pages/settings/SettingsNode.qml index c350f896..86237446 100644 --- a/pages/settings/SettingsNode.qml +++ b/pages/settings/SettingsNode.qml @@ -295,7 +295,7 @@ Rectangle{ property var rna: persistentSettings.remoteNodeAddress daemonAddrText: rna.search(":") != -1 ? rna.split(":")[0].trim() : "" - daemonPortText: rna.search(":") != -1 ? (rna.split(":")[1].trim() == "") ? "18081" : rna.split(":")[1] : "" + daemonPortText: rna.search(":") != -1 ? (rna.split(":")[1].trim() == "") ? appWindow.getDefaultDaemonRpcPort(persistentSettings.nettype) : rna.split(":")[1] : "" onEditingFinished: { persistentSettings.remoteNodeAddress = remoteNodeEdit.getAddress(); console.log("setting remote node to " + persistentSettings.remoteNodeAddress); @@ -450,7 +450,7 @@ Rectangle{ daemonPortText: { var node_split = persistentSettings.bootstrapNodeAddress.split(":"); if(node_split.length == 2){ - (node_split[1].trim() == "") ? "18081" : node_split[1]; + (node_split[1].trim() == "") ? appWindow.getDefaultDaemonRpcPort(persistentSettings.nettype) : node_split[1]; } else { return "" } diff --git a/wizard/WizardDaemonSettings.qml b/wizard/WizardDaemonSettings.qml index 4303b1a0..a5162e7b 100644 --- a/wizard/WizardDaemonSettings.qml +++ b/wizard/WizardDaemonSettings.qml @@ -196,7 +196,7 @@ ColumnLayout { daemonPortText: { var node_split = persistentSettings.bootstrapNodeAddress.split(":"); if(node_split.length == 2){ - (node_split[1].trim() == "") ? "18081" : node_split[1]; + (node_split[1].trim() == "") ? appWindow.getDefaultDaemonRpcPort(persistentSettings.nettype) : node_split[1]; } else { return "" } @@ -228,7 +228,7 @@ ColumnLayout { id: remoteNodeEdit property var rna: persistentSettings.remoteNodeAddress daemonAddrText: rna.search(":") != -1 ? rna.split(":")[0].trim() : "" - daemonPortText: rna.search(":") != -1 ? (rna.split(":")[1].trim() == "") ? "18081" : persistentSettings.remoteNodeAddress.split(":")[1] : "" + daemonPortText: rna.search(":") != -1 ? (rna.split(":")[1].trim() == "") ? appWindow.getDefaultDaemonRpcPort(persistentSettings.nettype) : persistentSettings.remoteNodeAddress.split(":")[1] : "" placeholderFontBold: true placeholderFontFamily: "Arial" |