From 7095b80cb6204c7b88012edbb3d97f59df330ddc Mon Sep 17 00:00:00 2001 From: Richard Ramos Date: Tue, 9 Nov 2021 15:27:02 -0400 Subject: [PATCH] feat: use DNS Discovery in the configuration (#101) --- status/statusgo_backend/accounts.nim | 14 +++++++++----- status/statusgo_backend/settings.nim | 8 ++++---- vendor/status-go | 2 +- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/status/statusgo_backend/accounts.nim b/status/statusgo_backend/accounts.nim index ad1a485..da993a9 100644 --- a/status/statusgo_backend/accounts.nim +++ b/status/statusgo_backend/accounts.nim @@ -30,11 +30,15 @@ proc getDefaultNodeConfig*(fleetConfig: FleetConfig, installationId: string): Js result["UpstreamConfig"]["URL"] = upstreamUrl result["ShhextConfig"]["InstallationID"] = newJString(installationId) - result["ClusterConfig"]["RelayNodes"] = %* fleetConfig.getNodes(fleet, FleetNodes.Waku) - result["ClusterConfig"]["StoreNodes"] = %* fleetConfig.getNodes(fleet, FleetNodes.Waku) - result["ClusterConfig"]["FilterNodes"] = %* fleetConfig.getNodes(fleet, FleetNodes.Waku) - result["ClusterConfig"]["LightpushNodes"] = %* fleetConfig.getNodes(fleet, FleetNodes.Waku) - result["ClusterConfig"]["WakuRendezvousNodes"] = %* @[] + result["ClusterConfig"]["RelayNodes"] = %* @["enrtree://AOFTICU2XWDULNLZGRMQS4RIZPAZEHYMV4FYHAPW563HNRAOERP7C@test.nodes.vac.dev"] + result["ClusterConfig"]["StoreNodes"] = %* @["enrtree://AOFTICU2XWDULNLZGRMQS4RIZPAZEHYMV4FYHAPW563HNRAOERP7C@test.nodes.vac.dev"] + result["ClusterConfig"]["FilterNodes"] = %* @["enrtree://AOFTICU2XWDULNLZGRMQS4RIZPAZEHYMV4FYHAPW563HNRAOERP7C@test.nodes.vac.dev"] + result["ClusterConfig"]["LightpushNodes"] = %* @["enrtree://AOFTICU2XWDULNLZGRMQS4RIZPAZEHYMV4FYHAPW563HNRAOERP7C@test.nodes.vac.dev"] + + #TODO: in the meantime we're using the go-waku test fleet for rendezvous. + # once we have a prod fleet this code needs to be updated + result["ClusterConfig"]["WakuRendezvousNodes"] = %* fleetConfig.getNodes(Fleet.GoWakuTest, FleetNodes.LibP2P) + # TODO: commented since it's not necessary (we do the connections thru C bindings). Enable it thru an option once status-nodes are able to be configured in desktop # result["ListenAddr"] = if existsEnv("STATUS_PORT"): newJString("0.0.0.0:" & $getEnv("STATUS_PORT")) else: newJString("0.0.0.0:30305") diff --git a/status/statusgo_backend/settings.nim b/status/statusgo_backend/settings.nim index bdc7c93..951f108 100644 --- a/status/statusgo_backend/settings.nim +++ b/status/statusgo_backend/settings.nim @@ -213,10 +213,10 @@ proc setFleet*(fleetConfig: FleetConfig, fleet: Fleet): StatusGoError = nodeConfig["ClusterConfig"]["TrustedMailServers"] = %* fleetConfig.getNodes(fleet, FleetNodes.Mailservers) nodeConfig["ClusterConfig"]["StaticNodes"] = %* fleetConfig.getNodes(fleet, FleetNodes.Whisper) nodeConfig["ClusterConfig"]["RendezvousNodes"] = %* fleetConfig.getNodes(fleet, FleetNodes.Rendezvous) - nodeConfig["ClusterConfig"]["RelayNodes"] = %* fleetConfig.getNodes(fleet, FleetNodes.Waku) - nodeConfig["ClusterConfig"]["StoreNodes"] = %* fleetConfig.getNodes(fleet, FleetNodes.Waku) - nodeConfig["ClusterConfig"]["FilterNodes"] = %* fleetConfig.getNodes(fleet, FleetNodes.Waku) - nodeConfig["ClusterConfig"]["LightpushNodes"] = %* fleetConfig.getNodes(fleet, FleetNodes.Waku) + nodeConfig["ClusterConfig"]["RelayNodes"] = %* @["enrtree://AOFTICU2XWDULNLZGRMQS4RIZPAZEHYMV4FYHAPW563HNRAOERP7C@test.nodes.vac.dev"] + nodeConfig["ClusterConfig"]["StoreNodes"] = %* @["enrtree://AOFTICU2XWDULNLZGRMQS4RIZPAZEHYMV4FYHAPW563HNRAOERP7C@test.nodes.vac.dev"] + nodeConfig["ClusterConfig"]["FilterNodes"] = %* @["enrtree://AOFTICU2XWDULNLZGRMQS4RIZPAZEHYMV4FYHAPW563HNRAOERP7C@test.nodes.vac.dev"] + nodeConfig["ClusterConfig"]["LightpushNodes"] = %* @["enrtree://AOFTICU2XWDULNLZGRMQS4RIZPAZEHYMV4FYHAPW563HNRAOERP7C@test.nodes.vac.dev"] #TODO: in the meantime we're using the go-waku test fleet for rendezvous. # once we have a prod fleet this code needs to be updated diff --git a/vendor/status-go b/vendor/status-go index f47229a..d35e0a3 160000 --- a/vendor/status-go +++ b/vendor/status-go @@ -1 +1 @@ -Subproject commit f47229a466722943ae11c7cdcd52a7ce5d8d2239 +Subproject commit d35e0a339ddfdee0e52e2f6d5859302c7ec54dc6