From 3e3a365ffb989ab65164aaa52c83f8f4e9456073 Mon Sep 17 00:00:00 2001
From: Andrea Maria Piana <andrea.maria.piana@gmail.com>
Date: Fri, 2 Dec 2022 09:31:48 +0000
Subject: [PATCH] Enable waku2 by default

---
 .env                         |  2 +-
 .env.e2e                     |  2 +-
 .env.jenkins                 |  2 +-
 .env.nightly                 |  2 +-
 .env.release                 |  2 +-
 src/status_im/node/core.cljs | 10 +++++++++-
 status-go-version.json       |  6 +++---
 7 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/.env b/.env
index 748e81f5e9..f031dd9d65 100644
--- a/.env
+++ b/.env
@@ -4,7 +4,7 @@ DEFAULT_NETWORK=mainnet_rpc
 DEV_BUILD=1
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
-FLEET=eth.prod
+FLEET=status.prod
 GROUP_CHATS_ENABLED=1
 LOG_LEVEL=info
 MAILSERVER_CONFIRMATIONS_ENABLED=1
diff --git a/.env.e2e b/.env.e2e
index 6d722e5208..2b021818f4 100644
--- a/.env.e2e
+++ b/.env.e2e
@@ -2,7 +2,7 @@ DEBUG_WEBVIEW=1
 DEFAULT_NETWORK=goerli_rpc
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
-FLEET=eth.staging
+FLEET=status.prod
 GROUP_CHATS_ENABLED=1
 LOG_LEVEL=debug
 MAILSERVER_CONFIRMATIONS_ENABLED=0
diff --git a/.env.jenkins b/.env.jenkins
index b928cf14a0..394d66e07c 100644
--- a/.env.jenkins
+++ b/.env.jenkins
@@ -3,7 +3,7 @@ DEBUG_WEBVIEW=1
 DEFAULT_NETWORK=goerli_rpc
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
-FLEET=eth.prod
+FLEET=status.prod
 GROUP_CHATS_ENABLED=1
 LOG_LEVEL=debug
 MAILSERVER_CONFIRMATIONS_ENABLED=1
diff --git a/.env.nightly b/.env.nightly
index 0b6e4ea1b7..a81b1fa797 100644
--- a/.env.nightly
+++ b/.env.nightly
@@ -2,7 +2,7 @@ DEBUG_WEBVIEW=1
 DEFAULT_NETWORK=mainnet_rpc
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
-FLEET=eth.prod
+FLEET=status.prod
 GROUP_CHATS_ENABLED=1
 LOG_LEVEL=info
 MAILSERVER_CONFIRMATIONS_ENABLED=1
diff --git a/.env.release b/.env.release
index 924832a34f..a9f588623d 100644
--- a/.env.release
+++ b/.env.release
@@ -2,7 +2,7 @@ DEBUG_WEBVIEW=0
 DEFAULT_NETWORK=mainnet_rpc
 ETHEREUM_DEV_CLUSTER=0
 EXTENSIONS=0
-FLEET=eth.prod
+FLEET=status.prod
 GROUP_CHATS_ENABLED=1
 LOG_LEVEL=
 MAILSERVER_CONFIRMATIONS_ENABLED=1
diff --git a/src/status_im/node/core.cljs b/src/status_im/node/core.cljs
index 1592860b0f..7f737fed78 100644
--- a/src/status_im/node/core.cljs
+++ b/src/status_im/node/core.cljs
@@ -115,6 +115,10 @@
              :Rendezvous (if wakuv2-enabled false (boolean (seq rendezvous-nodes)))
              :ClusterConfig {:Enabled         true
                              :Fleet           (name current-fleet-key)
+                             :DiscV5BootstrapNodes
+                             (if wakuv2-enabled
+                               waku-nodes
+                               [])
                              :BootNodes
                              (if wakuv2-enabled [] (pick-nodes 4 (vals (:boot current-fleet))))
                              :TrustedMailServers
@@ -138,7 +142,11 @@
               :BloomFilterMode waku-bloom-filter-mode
               :LightClient     true
               :MinimumPoW      0.000001}
-             :WakuV2Config (assoc wakuv2-config :Enabled wakuv2-enabled :Host "0.0.0.0")
+             :WakuV2Config (assoc wakuv2-config
+                                  :DiscoveryLimit 20
+                                  :EnableDiscV5 true
+                                  :Enabled wakuv2-enabled
+                                  :Host "0.0.0.0")
              :ShhextConfig
              {:BackupDisabledDataDir      (utils.platform/no-backup-directory)
               :InstallationID             installation-id
diff --git a/status-go-version.json b/status-go-version.json
index 715895bb09..f79f763dc4 100644
--- a/status-go-version.json
+++ b/status-go-version.json
@@ -3,7 +3,7 @@
     "_comment": "Instead use: scripts/update-status-go.sh <rev>",
     "owner": "status-im",
     "repo": "status-go",
-    "version": "v0.115.6",
-    "commit-sha1": "a97b5527305b9f23b15246c5489726f8cd758edd",
-    "src-sha256": "18x506xrxbpabfy0vn82bzyd0f6zmr5khclqbzfwymi5d1m35cjm"
+    "version": "v0.117.1",
+    "commit-sha1": "8593866862175eeab6f30765e5f0b813f3b1b4db",
+    "src-sha256": "1ml22627jadj150y9yj7p9z91vx49min6hzvsg88i3nhx4153nia"
 }