From 168aae40da21737aaddb545d19f632ebf53eb27b Mon Sep 17 00:00:00 2001
From: Anthony Laibe <anthony@laibe.cc>
Date: Wed, 27 Jul 2022 08:02:51 +0200
Subject: [PATCH] feat(@wallet): make goerli default testnet

---
 src/app_service/common/network_constants.nim |  6 +++---
 src/app_service/service/network/service.nim  | 11 +++++++----
 vendor/status-go                             |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/app_service/common/network_constants.nim b/src/app_service/common/network_constants.nim
index 410a8454ec..60ed906c45 100644
--- a/src/app_service/common/network_constants.nim
+++ b/src/app_service/common/network_constants.nim
@@ -56,7 +56,7 @@ let NETWORKS* = %* [
     "nativeCurrencyDecimals": 18,
     "isTest": true,
     "layer": 1,
-    "enabled": true,
+    "enabled": false,
   },
   {
     "chainId": 4,
@@ -76,7 +76,7 @@ let NETWORKS* = %* [
   {
     "chainId": 5,
     "chainName": "Goerli",
-    "rpcUrl": "http://goerli.blockscout.com/",
+    "rpcUrl": "https://goerli.infura.io/v3/" & INFURA_TOKEN_RESOLVED,
     "blockExplorerUrl": "https://goerli.etherscan.io/",
     "iconUrl": "network/Network=Tetnet",
     "chainColor": "#939BA1",
@@ -86,7 +86,7 @@ let NETWORKS* = %* [
     "nativeCurrencyDecimals": 18,
     "isTest": true,
     "layer": 1,
-    "enabled": false,
+    "enabled": true,
   },
   {
     "chainId": 10,
diff --git a/src/app_service/service/network/service.nim b/src/app_service/service/network/service.nim
index ca49d7c3c2..9fe8a07e33 100644
--- a/src/app_service/service/network/service.nim
+++ b/src/app_service/service/network/service.nim
@@ -98,18 +98,21 @@ proc toggleNetwork*(self: Service, chainId: int) =
 
 proc getNetworkForEns*(self: Service): NetworkDto =
   if self.settingsService.areTestNetworksEnabled():
-    return self.getNetwork(Ropsten)
+    return self.getNetwork(Goerli)
 
   return self.getNetwork(Mainnet)
 
 proc getNetworkForStickers*(self: Service): NetworkDto =
-    return self.getNetworkForEns()
+  if self.settingsService.areTestNetworksEnabled():
+    return self.getNetwork(Goerli)
+
+  return self.getNetwork(Mainnet)
 
 proc getNetworkForBrowser*(self: Service): NetworkDto =
-    return self.getNetworkForEns()
+  return self.getNetworkForStickers()
 
 proc getNetworkForChat*(self: Service): NetworkDto =
-    return self.getNetworkForEns()
+  return self.getNetworkForStickers()
 
 proc getNetworkForCollectibles*(self: Service): NetworkDto =
   if self.settingsService.areTestNetworksEnabled():
diff --git a/vendor/status-go b/vendor/status-go
index 28b76ce4ca..9e0c9a5875 160000
--- a/vendor/status-go
+++ b/vendor/status-go
@@ -1 +1 @@
-Subproject commit 28b76ce4ca6c5f1b1a43b0317116ed4ef0e43e37
+Subproject commit 9e0c9a58754ed2980f94bd90087a3282cfca0ace