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: add status.test fleet

This commit is contained in:
Richard Ramos 2022-02-18 17:23:35 -04:00 committed by Iuri Matias
parent c855de98b6
commit d4f8b63292
13 changed files with 52 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
fleets.json
View File

@ -63,8 +63,7 @@
},
"mail": {
"mail-01.ac-cn-hongkong-c.eth.staging": "enode://b74859176c9751d314aeeffc26ec9f866a412752e7ddec91b19018a18e7cca8d637cfe2cedcb972f8eb64d816fbd5b4e89c7e8c7fd7df8a1329fa43db80b0bfe@47.52.90.156:443",
"mail-01.do-ams3.eth.staging": "enode://69f72baa7f1722d111a8c9c68c39a31430e9d567695f6108f31ccb6cd8f0adff4991e7fdca8fa770e75bc8a511a87d24690cbc80e008175f40c157d6f6788d48@206.189.240.16:443",
"mail-01.gc-us-central1-a.eth.staging": "enode://e4fc10c1f65c8aed83ac26bc1bfb21a45cc1a8550a58077c8d2de2a0e0cd18e40fd40f7e6f7d02dc6cd06982b014ce88d6e468725ffe2c138e958788d0002a7f@35.239.193.41:443"
"mail-01.do-ams3.eth.staging": "enode://69f72baa7f1722d111a8c9c68c39a31430e9d567695f6108f31ccb6cd8f0adff4991e7fdca8fa770e75bc8a511a87d24690cbc80e008175f40c157d6f6788d48@206.189.240.16:443"
},
"rendezvous": {
"boot-01.ac-cn-hongkong-c.eth.staging": "/ip4/47.91.229.44/tcp/30703/ethv4/16Uiu2HAmRnt2Eyoknh3auxh4fJwkRgqkH1gqrWGes8Pk1k3MV4xu",
@ -111,6 +110,23 @@
"node-01.gc-us-central1-a.go-waku.test": "/dns4/node-01.gc-us-central1-a.go-waku.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAmPz63Xc6AuVkDeujz7YeZta18rcdau3Y1BzaxKAfDrBqz"
}
},
"status.test": {
"tcp/p2p/waku": {
"node-01.ac-cn-hongkong-c.status.test": "/ip4/47.242.233.36/tcp/30303/p2p/16Uiu2HAm2BjXxCp1sYFJQKpLLbPbwd5juxbsYofu3TsS3auvT9Yi",
"node-01.do-ams3.status.test": "/ip4/64.225.81.237/tcp/30303/p2p/16Uiu2HAkukebeXjTQ9QDBeNDWuGfbaSg79wkkhK4vPocLgR6QFDf",
"node-01.gc-us-central1-a.status.test": "/ip4/34.122.252.118/tcp/30303/p2p/16Uiu2HAmGDX3iAFox93PupVYaHa88kULGqMpJ7AEHGwj3jbMtt76"
}
},
"waku.connect": {
"tcp/p2p/waku": {
"nim-01.ac-cn-hongkong-c.waku.connect": "/ip4/47.242.185.35/tcp/30303/p2p/16Uiu2HAm75XUMGev2Ti74G3wUzhyxCtbaDKVWzNwbq3tn5WfzRd4",
"nim-01.do-ams3.waku.connect": "/ip4/206.189.242.0/tcp/30303/p2p/16Uiu2HAm9VLETt1xBwDAwfKxj2XvAZDw73Bn4HQf11U26JGDxqZD"
},
"wss/p2p/waku": {
"nim-01.ac-cn-hongkong-c.waku.connect": "/dns4/node-01.ac-cn-hongkong-c.waku.connect.statusim.net/tcp/443/wss/p2p/16Uiu2HAm75XUMGev2Ti74G3wUzhyxCtbaDKVWzNwbq3tn5WfzRd4",
"nim-01.do-ams3.waku.connect": "/dns4/node-01.do-ams3.waku.connect.statusim.net/tcp/443/wss/p2p/16Uiu2HAm9VLETt1xBwDAwfKxj2XvAZDw73Bn4HQf11U26JGDxqZD"
}
},
"wakuv2.prod": {
"waku": {
"node-01.ac-cn-hongkong-c.wakuv2.prod": "/ip4/8.210.222.231/tcp/30303/p2p/16Uiu2HAm4v86W3bmT1BiH6oSPzcsSr24iDQpSN5Qa992BCjjwgrD",
@ -138,6 +154,6 @@
},
"meta": {
"hostname": "node-01.do-ams3.sites.misc",
"timestamp": "2021-10-19T00:00:15.465044"
"timestamp": "2022-02-18T00:00:25.551634"
}
}

2
src/app/core/fleets/fleet_configuration.nim
View File

@ -8,6 +8,7 @@ type
WakuV2Prod = "wakuv2.prod"
WakuV2Test = "wakuv2.test"
GoWakuTest = "go-waku.test"
StatusTest = "status.test"
FleetNodes* {.pure.} = enum
Bootnodes = "boot",
@ -17,6 +18,7 @@ type
Waku = "waku"
LibP2P = "libp2p"
Websocket = "websocket"
TCP_P2P_Waku = "tcp/p2p/waku"
Meta* = object
hostname*: string

2
src/app/modules/main/node_section/controller.nim
View File

@ -93,7 +93,7 @@ method fetchBitsSet*(self: Controller) =
method getWakuVersion*(self: Controller): int =
var fleet = self.settingsService.getFleet()
let isWakuV2 = if fleet == WakuV2Prod or fleet == WakuV2Test: true else: false
let isWakuV2 = if fleet == WakuV2Prod or fleet == WakuV2Test or fleet == StatusTest: true else: false
if isWakuV2: return 2
return 1

2
src/app/modules/main/profile_section/advanced/controller.nim
View File

@ -68,7 +68,7 @@ method changeFleetTo*(self: Controller, fleet: string) =
return
var wakuVersion = WAKU_VERSION_1
if (fleet == $Fleet.WakuV2Prod or fleet == $Fleet.WakuV2Test):
if (fleet == $Fleet.WakuV2Prod or fleet == $Fleet.WakuV2Test or fleet == $Fleet.StatusTest):
wakuVersion = WAKU_VERSION_2
if (not self.nodeConfigurationService.setWakuVersion(wakuVersion)):

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

@ -78,7 +78,7 @@ QtObject:
proc fetchPeers*(self: Service): seq[string] =
var fleet = self.settingsService.getFleet()
let isWakuV2 = if fleet == WakuV2Prod or fleet == WakuV2Test: true else: false
let isWakuV2 = if fleet == WakuV2Prod or fleet == WakuV2Test or fleet == StatusTest: true else: false
if isWakuV2:
return wakuV2Peers()
else:

10
src/app_service/service/node_configuration/service.nim
View File

@ -174,12 +174,16 @@ method setFleet*(self: Service, fleet: string): bool =
newConfiguration.ClusterConfig.StoreNodes = @["enrtree://AOFTICU2XWDULNLZGRMQS4RIZPAZEHYMV4FYHAPW563HNRAOERP7C@test.waku.nodes.status.im"]
newConfiguration.ClusterConfig.FilterNodes = @["enrtree://AOFTICU2XWDULNLZGRMQS4RIZPAZEHYMV4FYHAPW563HNRAOERP7C@test.waku.nodes.status.im"]
newConfiguration.ClusterConfig.LightpushNodes = @["enrtree://AOFTICU2XWDULNLZGRMQS4RIZPAZEHYMV4FYHAPW563HNRAOERP7C@test.waku.nodes.status.im"]
of Fleet.StatusTest:
newConfiguration.ClusterConfig.RelayNodes = self.fleetConfiguration.getNodes(fleetType, FleetNodes.TCP_P2P_Waku)
newConfiguration.ClusterConfig.StoreNodes = self.fleetConfiguration.getNodes(fleetType, FleetNodes.TCP_P2P_Waku)
newConfiguration.ClusterConfig.FilterNodes = self.fleetConfiguration.getNodes(fleetType, FleetNodes.TCP_P2P_Waku)
newConfiguration.ClusterConfig.LightpushNodes = self.fleetConfiguration.getNodes(fleetType, FleetNodes.TCP_P2P_Waku)
else:
discard
#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
newConfiguration.ClusterConfig.WakuRendezvousNodes = self.fleetConfiguration.getNodes(Fleet.GoWakuTest, FleetNodes.LibP2P)
# Disabling go-waku rendezvous
# newConfiguration.ClusterConfig.WakuRendezvousNodes = self.fleetConfiguration.getNodes(Fleet.GoWakuTest, FleetNodes.LibP2P)
return self.saveConfiguration(newConfiguration)
method getV2LightMode*(self: Service): bool =

6
src/app_service/service/settings/dto/settings.nim
View File

@ -67,6 +67,7 @@ type PinnedMailserver* = object
wakuv2Prod*: string
wakuv2Test*: string
goWakuTest*: string
statusTest*: string
type CurrentUserStatus* = object
statusType*: int
@ -144,6 +145,8 @@ proc toPinnedMailserver*(jsonObj: JsonNode): PinnedMailserver =
discard jsonObj.getProp("wakuv2.prod", result.wakuv2Prod)
discard jsonObj.getProp("wakuv2.test", result.wakuv2Test)
discard jsonObj.getProp("go-waku.test", result.goWakuTest)
discard jsonObj.getProp("status.test", result.statusTest)
proc toCurrentUserStatus*(jsonObj: JsonNode): CurrentUserStatus =
discard jsonObj.getProp("statusType", result.statusType)
@ -262,5 +265,6 @@ proc pinnedMailserverToJsonNode*(mailserver: PinnedMailserver): JsonNode =
"eth.test": mailserver.ethTest,
"wakuv2.prod": mailserver.wakuv2Prod,
"wakuv2.test": mailserver.wakuv2Test,
"go-waku.test": mailserver.goWakuTest
"go-waku.test": mailserver.goWakuTest,
"status.test": mailserver.statusTest,
}

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

@ -351,6 +351,8 @@ method getPinnedMailserver*(self: Service, fleet: Fleet): string =
return self.settings.pinnedMailserver.wakuv2Test
elif (fleet == Fleet.GoWakuTest):
return self.settings.pinnedMailserver.goWakuTest
elif (fleet == Fleet.StatusTest):
return self.settings.pinnedMailserver.statusTest
return ""
method pinMailserver*(self: Service, address: string, fleet: Fleet): bool =
@ -369,6 +371,8 @@ method pinMailserver*(self: Service, address: string, fleet: Fleet): bool =
self.settings.pinnedMailserver.wakuv2Test = address
elif (fleet == Fleet.GoWakuTest):
self.settings.pinnedMailserver.goWakuTest = address
elif (fleet == Fleet.StatusTest):
self.settings.pinnedMailserver.statusTest = address
return true
return false

3
ui/app/AppLayouts/Chat/views/ChatContextMenuView.qml
View File

@ -72,7 +72,8 @@ StatusPopupMenu {
Action {
enabled: root.currentFleet == Constants.waku_prod ||
root.currentFleet === Constants.waku_test
root.currentFleet === Constants.waku_test ||
root.currentFleet === Constants.status_test
//% "Test WakuV2 - requestAllHistoricMessages"
text: qsTrId("test-wakuv2---requestallhistoricmessages")

6
ui/app/AppLayouts/Profile/popups/FleetsModal.qml
View File

@ -61,5 +61,11 @@ ModalPopup {
fleetName: Constants.waku_test
buttonGroup: fleetSettings
}
FleetRadioSelector {
advancedStore: popup.advancedStore
fleetName: Constants.status_test
buttonGroup: fleetSettings
}
}
}

3
ui/app/AppLayouts/Profile/stores/AdvancedStore.qml
View File

@ -19,7 +19,8 @@ QtObject {
property var customNetworksModel: advancedModule? advancedModule.customNetworksModel : []
property bool isWakuV2: root.fleet === Constants.waku_prod ||
root.fleet === Constants.waku_test
root.fleet === Constants.waku_test ||
root.fleet === Constants.status_test
readonly property QtObject experimentalFeatures: QtObject {
readonly property string wallet: "wallet"

1
ui/imports/utils/Constants.qml
View File

@ -150,6 +150,7 @@ QtObject {
readonly property string eth_test: "eth.test"
readonly property string waku_prod: "wakuv2.prod"
readonly property string waku_test: "wakuv2.test"
readonly property string status_test: "status.test"
readonly property int browserSearchEngineNone: 0
readonly property int browserSearchEngineGoogle: 1

2
vendor/status-go vendored

@ -1 +1 @@
Subproject commit 353767aee6bfcb5cbc7b9c44e3c440b4f1a2701a
Subproject commit b559c561d80a3b8b131b81d82e2bfda3ae387824