chore: add status.prod fleet

fleets.json

@@ -111,11 +111,21 @@
                 "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.prod": {
+            "tcp/p2p/waku": {
+                "node-01.ac-cn-hongkong-c.status.prod": "/dns4/node-01.ac-cn-hongkong-c.status.prod.statusim.net/tcp/30303/p2p/16Uiu2HAkvEZgh3KLwhLwXg95e5ojM8XykJ4Kxi2T7hk22rnA7pJC",
+                "node-01.do-ams3.status.prod": "/dns4/node-01.do-ams3.status.prod.statusim.net/tcp/30303/p2p/16Uiu2HAm6HZZr7aToTvEBPpiys4UxajCTU97zj5v7RNR2gbniy1D",
+                "node-01.gc-us-central1-a.status.prod": "/dns4/node-01.gc-us-central1-a.status.prod.statusim.net/tcp/30303/p2p/16Uiu2HAkwBp8T6G77kQXSNMnxgaMky1JeyML5yqoTHRM8dbeCBNb",
+                "node-02.ac-cn-hongkong-c.status.prod": "/dns4/node-02.ac-cn-hongkong-c.status.prod.statusim.net/tcp/30303/p2p/16Uiu2HAmFy8BrJhCEmCYrUfBdSNkrPw6VHExtv4rRp1DSBnCPgx8",
+                "node-02.do-ams3.status.prod": "/dns4/node-02.do-ams3.status.prod.statusim.net/tcp/30303/p2p/16Uiu2HAmSve7tR5YZugpskMv2dmJAsMUKmfWYEKRXNUxRaTCnsXV",
+                "node-02.gc-us-central1-a.status.prod": "/dns4/node-02.gc-us-central1-a.status.prod.statusim.net/tcp/30303/p2p/16Uiu2HAmDQugwDHM3YeUp86iGjrUvbdw3JPRgikC7YoGBsT2ymMg"
+            }
+        },
         "status.test": {
             "tcp/p2p/waku": {
-                "node-01.ac-cn-hongkong-c.status.test": "/ip4/47.242.233.36/tcp/30303/p2p/16Uiu2HAm2BjXxCp1sYFJQKpLLbPbwd5juxbsYofu3TsS3auvT9Yi",
+                "node-01.ac-cn-hongkong-c.status.test": "/dns4/node-01.ac-cn-hongkong-c.status.test.statusim.net/tcp/30303/p2p/16Uiu2HAm2BjXxCp1sYFJQKpLLbPbwd5juxbsYofu3TsS3auvT9Yi",
-                "node-01.do-ams3.status.test": "/ip4/64.225.81.237/tcp/30303/p2p/16Uiu2HAkukebeXjTQ9QDBeNDWuGfbaSg79wkkhK4vPocLgR6QFDf",
+                "node-01.do-ams3.status.test": "/dns4/node-01.do-ams3.status.test.statusim.net/tcp/30303/p2p/16Uiu2HAkukebeXjTQ9QDBeNDWuGfbaSg79wkkhK4vPocLgR6QFDf",
-                "node-01.gc-us-central1-a.status.test": "/ip4/34.122.252.118/tcp/30303/p2p/16Uiu2HAmGDX3iAFox93PupVYaHa88kULGqMpJ7AEHGwj3jbMtt76"
+                "node-01.gc-us-central1-a.status.test": "/dns4/node-01.gc-us-central1-a.status.test.statusim.net/tcp/30303/p2p/16Uiu2HAmGDX3iAFox93PupVYaHa88kULGqMpJ7AEHGwj3jbMtt76"
             }
         },
         "waku.connect": {
@@ -144,20 +154,20 @@
         },
         "wakuv2.test": {
             "waku": {
-                "node-01.ac-cn-hongkong-c.wakuv2.test": "/ip4/47.242.210.73/tcp/30303/p2p/16Uiu2HAkvWiyFsgRhuJEb9JfjYxEkoHLgnUQmr1N5mKWnYjxYRVm",
+                "node-01.ac-cn-hongkong-c.wakuv2.test": "/dns4/node-01.ac-cn-hongkong-c.wakuv2.test.statusim.net/tcp/30303/p2p/16Uiu2HAkvWiyFsgRhuJEb9JfjYxEkoHLgnUQmr1N5mKWnYjxYRVm",
-                "node-01.do-ams3.wakuv2.test": "/ip4/134.209.139.210/tcp/30303/p2p/16Uiu2HAmPLe7Mzm8TsYUubgCAW1aJoeFScxrLj8ppHFivPo97bUZ",
+                "node-01.do-ams3.wakuv2.test": "/dns4/node-01.do-ams3.wakuv2.test.statusim.net/tcp/30303/p2p/16Uiu2HAmPLe7Mzm8TsYUubgCAW1aJoeFScxrLj8ppHFivPo97bUZ",
-                "node-01.gc-us-central1-a.wakuv2.test": "/ip4/104.154.239.128/tcp/30303/p2p/16Uiu2HAmJb2e28qLXxT5kZxVUUoJt72EMzNGXB47Rxx5hw3q4YjS"
+                "node-01.gc-us-central1-a.wakuv2.test": "/dns4/node-01.gc-us-central1-a.wakuv2.test.statusim.net/tcp/30303/p2p/16Uiu2HAmJb2e28qLXxT5kZxVUUoJt72EMzNGXB47Rxx5hw3q4YjS"
             },
             "waku-websocket": {
-                "node-01.ac-cn-hongkong-c.wakuv2.test": "/dns4/node-01.ac-cn-hongkong-c.wakuv2.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAkvWiyFsgRhuJEb9JfjYxEkoHLgnUQmr1N5mKWnYjxYRVm",
+                "node-01.ac-cn-hongkong-c.wakuv2.test": "/dns4/node-01.ac-cn-hongkong-c.wakuv2.test.statusim.net/tcp/8000/wss/p2p/16Uiu2HAkvWiyFsgRhuJEb9JfjYxEkoHLgnUQmr1N5mKWnYjxYRVm",
-                "node-01.do-ams3.wakuv2.test": "/dns4/node-01.do-ams3.wakuv2.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAmPLe7Mzm8TsYUubgCAW1aJoeFScxrLj8ppHFivPo97bUZ",
+                "node-01.do-ams3.wakuv2.test": "/dns4/node-01.do-ams3.wakuv2.test.statusim.net/tcp/8000/wss/p2p/16Uiu2HAmPLe7Mzm8TsYUubgCAW1aJoeFScxrLj8ppHFivPo97bUZ",
-                "node-01.gc-us-central1-a.wakuv2.test": "/dns4/node-01.gc-us-central1-a.wakuv2.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAmJb2e28qLXxT5kZxVUUoJt72EMzNGXB47Rxx5hw3q4YjS"
+                "node-01.gc-us-central1-a.wakuv2.test": "/dns4/node-01.gc-us-central1-a.wakuv2.test.statusim.net/tcp/8000/wss/p2p/16Uiu2HAmJb2e28qLXxT5kZxVUUoJt72EMzNGXB47Rxx5hw3q4YjS"
             }
         }
     },
     "meta": {
         "hostname": "node-01.do-ams3.sites.misc",
-        "timestamp": "2022-02-21T14:40:19.809193",
+        "timestamp": "2022-03-10T11:32:40.427357",
         "warning": "This data should only be used at build time."
     }
 }

src/app/core/fleets/fleet_configuration.nim

@@ -9,6 +9,7 @@ type
     WakuV2Test = "wakuv2.test"
     GoWakuTest = "go-waku.test"
     StatusTest = "status.test"
+    StatusProd = "status.prod"
 
   FleetNodes* {.pure.} = enum
     Bootnodes = "boot",

src/app/modules/main/node_section/controller.nim

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

src/app/modules/main/profile_section/advanced/controller.nim

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

src/app_service/service/node/service.nim

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

src/app_service/service/node_configuration/service.nim

@@ -174,7 +174,7 @@ 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:
+    of Fleet.StatusTest, Fleet.StatusProd:
       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)

src/app_service/service/settings/dto/settings.nim

@@ -72,6 +72,7 @@ type PinnedMailserver* = object
   wakuv2Test*: string
   goWakuTest*: string
   statusTest*: string
+  statusProd*: string
 
 type CurrentUserStatus* = object
   statusType*: int
@@ -148,6 +149,8 @@ proc toPinnedMailserver*(jsonObj: JsonNode): PinnedMailserver =
   discard jsonObj.getProp("wakuv2.test", result.wakuv2Test)
   discard jsonObj.getProp("go-waku.test", result.goWakuTest)
   discard jsonObj.getProp("status.test", result.statusTest)
+  discard jsonObj.getProp("status.prod", result.statusProd)
+
 
 
 proc toCurrentUserStatus*(jsonObj: JsonNode): CurrentUserStatus =
@@ -254,4 +257,5 @@ proc pinnedMailserverToJsonNode*(mailserver: PinnedMailserver): JsonNode =
     "wakuv2.test": mailserver.wakuv2Test,
     "go-waku.test": mailserver.goWakuTest,
     "status.test": mailserver.statusTest,
+    "status.prod": mailserver.statusProd
   }

src/app_service/service/settings/service.nim

@@ -354,6 +354,8 @@ method getPinnedMailserver*(self: Service, fleet: Fleet): string =
     return self.settings.pinnedMailserver.goWakuTest
   elif (fleet == Fleet.StatusTest):
     return self.settings.pinnedMailserver.statusTest
+  elif (fleet == Fleet.StatusProd):
+    return self.settings.pinnedMailserver.statusProd
   return ""
 
 method pinMailserver*(self: Service, address: string, fleet: Fleet): bool =
@@ -374,6 +376,8 @@ method pinMailserver*(self: Service, address: string, fleet: Fleet): bool =
       self.settings.pinnedMailserver.goWakuTest = address
     elif (fleet == Fleet.StatusTest):
       self.settings.pinnedMailserver.statusTest = address
+    elif (fleet == Fleet.StatusProd):
+      self.settings.pinnedMailserver.statusProd = address
     return true
   return false
 

ui/app/AppLayouts/Chat/views/ChatContextMenuView.qml

@@ -85,9 +85,10 @@ StatusPopupMenu {
     }
 
     Action {
-        enabled: root.currentFleet == Constants.waku_prod ||
+        enabled: root.currentFleet === Constants.waku_prod   ||
                  root.currentFleet === Constants.waku_test   || 
-                 root.currentFleet === Constants.status_test
+                 root.currentFleet === Constants.status_test ||
+                 root.currentFleet === Constants.status_prod
 
         //% "Test WakuV2 - requestAllHistoricMessages"
         text: qsTrId("test-wakuv2---requestallhistoricmessages")

ui/app/AppLayouts/Profile/popups/FleetsModal.qml

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

ui/app/AppLayouts/Profile/stores/AdvancedStore.qml

@@ -20,7 +20,8 @@ QtObject {
 
     property bool isWakuV2: root.fleet === Constants.waku_prod   ||
                             root.fleet === Constants.waku_test   ||
-                            root.fleet === Constants.status_test
+                            root.fleet === Constants.status_test ||
+                            root.fleet === Constants.status_prod
 
     readonly property QtObject experimentalFeatures: QtObject {
         readonly property string wallet: "wallet"

ui/imports/utils/Constants.qml

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

vendor/status-go

@@ -1 +1 @@
-Subproject commit 6ac4fcd6e7782ffa2f36a8862de749f4d531aa0e
+Subproject commit ceb3a4f41c54aae1e336b51da96418a46950dcfe