status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat(@desktop/cpp): Use env variable WAKUV2_PORT 

Issue #8274
This commit is contained in:
Michal Iskierko 2022-11-16 11:23:10 +01:00 committed by Michał Iskierko
parent 312dd72955
commit 13b6d5a0c3
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libs/Onboarding/src/Onboarding/Accounts/AccountsService.cpp
View File

@ -363,26 +363,32 @@ QJsonObject AccountsService::getDefaultNodeConfig(const QString& installationId)
{ {
try try
{ {
const auto envVarInfuraToken = "INFURA_TOKEN";
const auto envVarWakuV2Port = "WAKUV2_PORT";
auto templateNodeConfigJsonStr = getDataFromFile(":/Status/StaticConfig/node-config.json").value(); auto templateNodeConfigJsonStr = getDataFromFile(":/Status/StaticConfig/node-config.json").value();
auto fleetJson = getDataFromFile(":/Status/StaticConfig/fleets.json").value(); auto fleetJson = getDataFromFile(":/Status/StaticConfig/fleets.json").value();
auto envInfuraKey = qEnvironmentVariable("INFURA_TOKEN"); const auto infuraKey = qEnvironmentVariable(envVarInfuraToken, getDataFromFile(":/Status/StaticConfig/infura_key").value());
auto infuraKey =
envInfuraKey.isEmpty() ? getDataFromFile(":/Status/StaticConfig/infura_key").value() : envInfuraKey;
auto templateDefaultNetworksJson = getDataFromFile(":/Status/StaticConfig/default-networks.json").value(); auto templateDefaultNetworksJson = getDataFromFile(":/Status/StaticConfig/default-networks.json").value();
QString defaultNetworksContent = templateDefaultNetworksJson.replace("%INFURA_TOKEN_RESOLVED%", infuraKey); QString defaultNetworksContent = templateDefaultNetworksJson.replace("%INFURA_TOKEN_RESOLVED%", infuraKey);
QJsonArray defaultNetworksJson = QJsonDocument::fromJson(defaultNetworksContent.toUtf8()).array(); QJsonArray defaultNetworksJson = QJsonDocument::fromJson(defaultNetworksContent.toUtf8()).array();
auto DEFAULT_TORRENT_CONFIG_PORT = 9025; const auto DEFAULT_WAKUV2_CONFIG_PORT = "0";
auto DEFAULT_TORRENT_CONFIG_DATADIR = m_statusgoDataDir / "archivedata"; const auto DEFAULT_TORRENT_CONFIG_PORT = 9025;
auto DEFAULT_TORRENT_CONFIG_TORRENTDIR = m_statusgoDataDir / "torrents"; const auto DEFAULT_TORRENT_CONFIG_DATADIR = m_statusgoDataDir / "archivedata";
const auto DEFAULT_TORRENT_CONFIG_TORRENTDIR = m_statusgoDataDir / "torrents";
const auto wakuV2Port = qEnvironmentVariable(envVarWakuV2Port, DEFAULT_WAKUV2_CONFIG_PORT);
auto nodeConfigJsonStr = auto nodeConfigJsonStr =
templateNodeConfigJsonStr.replace("%INSTALLATIONID%", installationId) templateNodeConfigJsonStr.replace("%INSTALLATIONID%", installationId)
.replace("%INFURA_TOKEN_RESOLVED%", infuraKey) .replace("%INFURA_TOKEN_RESOLVED%", infuraKey)
.replace("%DEFAULT_TORRENT_CONFIG_PORT%", QString::number(DEFAULT_TORRENT_CONFIG_PORT)) .replace("%DEFAULT_TORRENT_CONFIG_PORT%", QString::number(DEFAULT_TORRENT_CONFIG_PORT))
.replace("%DEFAULT_TORRENT_CONFIG_DATADIR%", DEFAULT_TORRENT_CONFIG_DATADIR.c_str()) .replace("%DEFAULT_TORRENT_CONFIG_DATADIR%", DEFAULT_TORRENT_CONFIG_DATADIR.c_str())
.replace("%DEFAULT_TORRENT_CONFIG_TORRENTDIR%", DEFAULT_TORRENT_CONFIG_TORRENTDIR.c_str()); .replace("%DEFAULT_TORRENT_CONFIG_TORRENTDIR%", DEFAULT_TORRENT_CONFIG_TORRENTDIR.c_str())
.replace("%DEFAULT_WAKUV2_CONFIG_PORT%", wakuV2Port);
QJsonObject nodeConfigJson = QJsonDocument::fromJson(nodeConfigJsonStr.toUtf8()).object(); QJsonObject nodeConfigJson = QJsonDocument::fromJson(nodeConfigJsonStr.toUtf8()).object();
QJsonObject clusterConfig = nodeConfigJson["ClusterConfig"].toObject(); QJsonObject clusterConfig = nodeConfigJson["ClusterConfig"].toObject();

4
resources/node-config.json
View File

@ -64,11 +64,11 @@
"WakuV2Config": { "WakuV2Config": {
"Enabled": false, "Enabled": false,
"Host": "0.0.0.0", "Host": "0.0.0.0",
"Port": 0, "Port": %DEFAULT_WAKUV2_CONFIG_PORT%,
"LightClient": false, "LightClient": false,
"PersistPeers": true, "PersistPeers": true,
"EnableDiscV5": true, "EnableDiscV5": true,
"UDPPort": 0, "UDPPort": %DEFAULT_WAKUV2_CONFIG_PORT%,
"PeerExchange": true, "PeerExchange": true,
"AutoUpdate": true "AutoUpdate": true
}, },