Revert "Use only filecoin mainnet by default"

This reverts commit f391b7a.
brave · Jun 30, 2022 · d77ac11 · d77ac11
1 parent 22bf895
commit d77ac11
Show file tree

Hide file tree

Showing 13 changed files with 47 additions and 144 deletions.
diff --git a/components/brave_wallet/browser/BUILD.gn b/components/brave_wallet/browser/BUILD.gn
@@ -237,7 +237,6 @@ source_set("hd_keyring") {
 
   deps = [
     ":transaction",
-    ":utils",
     "internal:hd_key",
     "//base",
     "//brave/components/brave_wallet/common",

diff --git a/components/brave_wallet/browser/brave_wallet_utils.cc b/components/brave_wallet/browser/brave_wallet_utils.cc
@@ -17,7 +17,6 @@
 #include "base/environment.h"
 #include "base/feature_list.h"
 #include "base/logging.h"
-#include "base/metrics/field_trial_params.h"
 #include "base/notreached.h"
 #include "base/strings/strcat.h"
 #include "base/strings/string_number_conversions.h"
@@ -248,18 +247,6 @@ const brave_wallet::mojom::NetworkInfo kKnownSolNetworks[] = {
      nullptr}};
 
 const brave_wallet::mojom::NetworkInfo kKnownFilNetworks[] = {
-    {brave_wallet::mojom::kFilecoinMainnet,
-     "Filecoin Mainnet",
-     {"https://filscan.io/tipset/message-detail"},
-     {},
-     {"https://api.node.glif.io/rpc/v0"},
-     "FIL",
-     "Filecoin",
-     18,
-     brave_wallet::mojom::CoinType::FIL,
-     nullptr}};
-
-const brave_wallet::mojom::NetworkInfo kKnownFilNetworksWithTestnet[] = {
     {brave_wallet::mojom::kFilecoinMainnet,
      "Filecoin Mainnet",
      {"https://filscan.io/tipset/message-detail"},
@@ -291,27 +278,6 @@ const brave_wallet::mojom::NetworkInfo kKnownFilNetworksWithTestnet[] = {
      brave_wallet::mojom::CoinType::FIL,
      nullptr}};
 
-const std::vector<brave_wallet::mojom::NetworkInfoPtr>&
-GetActualFilNetworksInfo() {
-  static const base::NoDestructor<
-      std::vector<brave_wallet::mojom::NetworkInfoPtr>>
-      networks_info([] {
-        std::vector<brave_wallet::mojom::NetworkInfoPtr> networks_info;
-        if (IsFilecoinTestnetEnabled()) {
-          for (const auto& a : kKnownFilNetworksWithTestnet) {
-            networks_info.push_back(a.Clone());
-          }
-        } else {
-          for (const auto& a : kKnownFilNetworks) {
-            networks_info.push_back(a.Clone());
-          }
-        }
-        return networks_info;
-      }());
-
-  return *networks_info;
-}
-
 const base::flat_map<std::string, std::string> kInfuraSubdomains = {
     {brave_wallet::mojom::kMainnetChainId, "mainnet"},
     {brave_wallet::mojom::kRinkebyChainId, "rinkeby"},
@@ -468,8 +434,8 @@ mojom::NetworkInfoPtr GetChain(PrefService* prefs,
       }
     }
   } else if (coin == mojom::CoinType::FIL) {
-    for (const auto& network : GetActualFilNetworksInfo()) {
-      if (network->chain_id == chain_id) {
+    for (const auto& network : kKnownFilNetworks) {
+      if (network.chain_id == chain_id) {
         return network.Clone();
       }
     }
@@ -562,13 +528,6 @@ bool IsFilecoinEnabled() {
       brave_wallet::features::kBraveWalletFilecoinFeature);
 }
 
-// This is needed only for unit tests, not to be used in prod.
-bool IsFilecoinTestnetEnabled() {
-  return base::FeatureList::IsEnabled(
-             brave_wallet::features::kBraveWalletFilecoinFeature) &&
-         brave_wallet::features::kFilecoinTestnetEnabled.Get();
-}
-
 bool IsDappsSupportEnabled() {
   return base::FeatureList::IsEnabled(
       brave_wallet::features::kBraveWalletDappsSupportFeature);
@@ -932,9 +891,9 @@ GURL GetNetworkURL(PrefService* prefs,
       }
     }
   } else if (coin == mojom::CoinType::FIL) {
-    for (const auto& network : GetActualFilNetworksInfo()) {
-      if (network->chain_id == chain_id && network->rpc_urls.size()) {
-        return GURL(network->rpc_urls.front());
+    for (const auto& network : kKnownFilNetworks) {
+      if (network.chain_id == chain_id && network.rpc_urls.size()) {
+        return GURL(network.rpc_urls.front());
       }
     }
   }
@@ -957,7 +916,7 @@ std::vector<mojom::NetworkInfoPtr> GetAllChains(PrefService* prefs,
 
 std::vector<mojom::NetworkInfoPtr> GetAllKnownFilChains() {
   std::vector<mojom::NetworkInfoPtr> result;
-  for (const auto& network : GetActualFilNetworksInfo())
+  for (const auto& network : kKnownFilNetworks)
     result.push_back(network.Clone());
   return result;
 }
@@ -981,8 +940,8 @@ std::vector<std::string> GetAllKnownSolNetworkIds() {
 
 std::vector<std::string> GetAllKnownFilNetworkIds() {
   std::vector<std::string> network_ids;
-  for (const auto& network : GetActualFilNetworksInfo()) {
-    std::string network_id = GetKnownFilNetworkId(network->chain_id);
+  for (const auto& network : kKnownFilNetworks) {
+    std::string network_id = GetKnownFilNetworkId(network.chain_id);
     if (!network_id.empty())
       network_ids.push_back(network_id);
   }
@@ -1044,9 +1003,9 @@ std::string GetKnownFilNetworkId(const std::string& chain_id) {
   // Separate check for localhost in known networks as it is predefined but
   // does not have predefined subdomain.
   if (chain_id == mojom::kLocalhostChainId) {
-    for (const auto& network : GetActualFilNetworksInfo()) {
-      if (network->chain_id == chain_id) {
-        return GURL(network->rpc_urls.front()).spec();
+    for (const auto& network : kKnownFilNetworks) {
+      if (network.chain_id == chain_id) {
+        return GURL(network.rpc_urls.front()).spec();
       }
     }
   }

diff --git a/components/brave_wallet/browser/brave_wallet_utils.h b/components/brave_wallet/browser/brave_wallet_utils.h
@@ -26,7 +26,6 @@ namespace brave_wallet {
 
 bool IsNativeWalletEnabled();
 bool IsFilecoinEnabled();
-bool IsFilecoinTestnetEnabled();
 bool IsSolanaEnabled();
 bool IsDappsSupportEnabled();