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

fix(Fleet): Change default fleet to status.prod 

Closes: #7736
This commit is contained in:
Boris Melnik 2022-10-04 17:00:29 +03:00 committed by Iuri Matias
parent e28163a771
commit aa1667bf69
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/app_service/service/accounts/service.nim
View File

@ -268,7 +268,8 @@ proc getAccountSettings(self: Service, accountId: string,
return self.prepareAccountSettingsJsonObject(self.importedAccount, installationId, displayName)
proc getDefaultNodeConfig*(self: Service, installationId: string): JsonNode =
let fleet = Fleet.Prod
let fleet = Fleet.StatusProd
let dnsDiscoveryURL = @["enrtree://AOGECG2SPND25EEFMAJ5WF3KSGJNSGV356DSTL2YVLLZWIV6SAYBM@prod.nodes.status.im"]
result = NODE_CONFIG.copy()
result["ClusterConfig"]["Fleet"] = newJString($fleet)
@ -276,19 +277,28 @@ proc getDefaultNodeConfig*(self: Service, installationId: string): JsonNode =
result["ClusterConfig"]["TrustedMailServers"] = %* self.fleetConfiguration.getNodes(fleet, FleetNodes.Mailservers)
result["ClusterConfig"]["StaticNodes"] = %* self.fleetConfiguration.getNodes(fleet, FleetNodes.Whisper)
result["ClusterConfig"]["RendezvousNodes"] = %* self.fleetConfiguration.getNodes(fleet, FleetNodes.Rendezvous)
result["ClusterConfig"]["DiscV5BootstrapNodes"] = %* (@[]) # TODO: set default status.prod enr
result["NetworkId"] = NETWORKS[0]{"chainId"}
result["DataDir"] = "ethereum".newJString()
result["UpstreamConfig"]["Enabled"] = true.newJBool()
result["UpstreamConfig"]["URL"] = NETWORKS[0]{"rpcUrl"}
result["ShhextConfig"]["InstallationID"] = newJString(installationId)
result["NoDiscovery"] = true.newJBool()
result["Rendezvous"] = false.newJBool()
# TODO: fleet.status.im should have different sections depending on the node type
# or maybe it's not necessary because a node has the identify protocol
result["ClusterConfig"]["RelayNodes"] = %* self.fleetConfiguration.getNodes(fleet, FleetNodes.Waku)
result["ClusterConfig"]["StoreNodes"] = %* self.fleetConfiguration.getNodes(fleet, FleetNodes.Waku)
result["ClusterConfig"]["FilterNodes"] = %* self.fleetConfiguration.getNodes(fleet, FleetNodes.Waku)
result["ClusterConfig"]["LightpushNodes"] = %* self.fleetConfiguration.getNodes(fleet, FleetNodes.Waku)
result["ClusterConfig"]["RelayNodes"] = %* dnsDiscoveryURL
result["ClusterConfig"]["StoreNodes"] = %* dnsDiscoveryURL
result["ClusterConfig"]["FilterNodes"] = %* dnsDiscoveryURL
result["ClusterConfig"]["LightpushNodes"] = %* dnsDiscoveryURL
result["ClusterConfig"]["DiscV5BootstrapNodes"] = %* dnsDiscoveryURL
result["WakuV2Config"]["EnableDiscV5"] = true.newJBool()
result["WakuV2Config"]["DiscoveryLimit"] = 20.newJInt()
result["WakuV2Config"]["Rendezvous"] = true.newJBool()
result["WakuV2Config"]["Enabled"] = true.newJBool()
result["WakuConfig"]["Enabled"] = false.newJBool()
if TEST_PEER_ENR != "":
result["ClusterConfig"]["BootNodes"] = %* @[TEST_PEER_ENR]

2
src/app_service/service/settings/service.nim
View File

@ -18,7 +18,7 @@ export stickers_dto
# Default values:
const DEFAULT_CURRENCY* = "usd"
const DEFAULT_TELEMETRY_SERVER_URL* = "https://telemetry.status.im"
const DEFAULT_FLEET* = $Fleet.Prod
const DEFAULT_FLEET* = $Fleet.StatusProd
const SIGNAL_CURRENT_USER_STATUS_UPDATED* = "currentUserStatusUpdated"
const SIGNAL_SETTING_PROFILE_PICTURES_SHOW_TO_CHANGED* = "profilePicturesShowToChanged"