(BIDS-2841) cleaning temporary changes which were necessary to test l…

…ocally
gobitfly · Jan 23, 2024 · 971d427 · 971d427
1 parent 34f9237
commit 971d427
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 49 deletions.
diff --git a/cmd/explorer/main.go b/cmd/explorer/main.go
@@ -345,8 +345,7 @@ func main() {
 		router.HandleFunc("/api/healthz-loadbalancer", handlers.ApiHealthzLoadbalancer).Methods("GET", "HEAD")
 
 		logrus.Infof("initializing prices")
-		utils.Config.Frontend.ClCurrency = "GNO"
-		utils.Config.Frontend.ElCurrency = "xDAI"
+
 		price.Init(utils.Config.Chain.ClConfig.DepositChainID, utils.Config.Eth1ErigonEndpoint, utils.Config.Frontend.ClCurrency, utils.Config.Frontend.ElCurrency)
 
 		logrus.Infof("prices initialized")

diff --git a/price/price.go b/price/price.go
@@ -66,9 +66,10 @@ func Init(chainId uint64, eth1Endpoint, clCurrencyParam, elCurrencyParam string)
 		setPrice(clCurrency, "USD", 2000.0)
 		setPrice(elCurrency, elCurrency, 1)
 		setPrice(clCurrency, clCurrency, 1)
+		availableCurrencies = []string{"ETH", "USD"}
 		logger.Warnf("chainId not supported for fetching prices: %v", chainId)
 		runOnce.Do(func() { runOnceWg.Done() })
-		//return
+		return
 	}
 
 	clCurrency = clCurrencyParam
@@ -77,20 +78,6 @@ func Init(chainId uint64, eth1Endpoint, clCurrencyParam, elCurrencyParam string)
 	calcPairs[elCurrency] = true
 	calcPairs[clCurrency] = true
 
-	setPrice("xDAI", "GNO", 1.0/200.0)
-	setPrice("GNO", "xDAI", 200.0)
-	setPrice("GNO", "USD", 200.0)
-	setPrice("GNO", "ETH", 200.0/2000.0)
-	setPrice("mGNO", "GNO", float64(1)/float64(32))
-	setPrice("GNO", "mGNO", 32)
-	setPrice("mGNO", "mGNO", float64(1)/float64(32))
-	setPrice("GNO", "GNO", 1)
-
-	calcPairs["GNO"] = true
-
-	availableCurrencies = []string{"GNO", "mGNO", "xDAI", "ETH", "USD"}
-	return
-
 	eClient, err := ethclient.Dial(eth1Endpoint)
 	if err != nil {
 		logger.Errorf("error dialing pricing eth1 endpoint: %v", err)

diff --git a/templates/layout.html b/templates/layout.html
@@ -160,23 +160,23 @@
             </div>
           </div>
           <div class="info-banner-right">
-              <div class="dropdown">
-                <a class="btn btn-transparent btn-sm dropdown-toggle currency-dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                  <div id="currencyFlagDropdown">
-                    <img class="currency-flag-dropdown-image" src="/img/{{ .Rates.SelectedCurrency }}.svg" />
-                  </div>
-                  <div id="currencyDropdown">{{ .Rates.SelectedCurrency }}</div>
-                </a>
-                <div class="dropdown-menu dropdown-menu-right" aria-labelledby="currencyDropdown">
-                  {{ range .AvailableCurrencies }}
-                    <a tabindex="1" class="dropdown-item cursor-pointer" onClick="updateCurrency({{ . }})">
-                      <img class="currency-flag-option" src="/img/{{ . }}.svg" />
-                      <span class="currency-name">{{ getCurrencyLabel . }}</span>
-                      <span class="currency-symbol">{{ . }}</span>
-                    </a>
-                  {{ end }}
+            <div class="dropdown">
+              <a class="btn btn-transparent btn-sm dropdown-toggle currency-dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                <div id="currencyFlagDropdown">
+                  <img class="currency-flag-dropdown-image" src="/img/{{ .Rates.SelectedCurrency }}.svg" />
                 </div>
+                <div id="currencyDropdown">{{ .Rates.SelectedCurrency }}</div>
+              </a>
+              <div class="dropdown-menu dropdown-menu-right" aria-labelledby="currencyDropdown">
+                {{ range .AvailableCurrencies }}
+                  <a tabindex="1" class="dropdown-item cursor-pointer" onClick="updateCurrency({{ . }})">
+                    <img class="currency-flag-option" src="/img/{{ . }}.svg" />
+                    <span class="currency-name">{{ getCurrencyLabel . }}</span>
+                    <span class="currency-symbol">{{ . }}</span>
+                  </a>
+                {{ end }}
               </div>
+            </div>
             {{ if .User.Authenticated }}
               <div class="dropdown">
                 <a class="btn btn-transparent btn-sm dropdown-toggle" id="userDropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">

diff --git a/templates/slot/execTransactions.html b/templates/slot/execTransactions.html
@@ -1,7 +1,7 @@
 {{ define "execution_transactions" }}
-  {{ $data := .Data}}
+  {{ $data := .Data }}
   {{ if eq $.Active "blockchain" }}
-    {{ $data = .Data.ExecutionData}}
+    {{ $data = .Data.ExecutionData }}
   {{ end }}
   {{ with $data }}
     <style>

diff --git a/utils/utils.go b/utils/utils.go
@@ -708,31 +708,31 @@ func ReadConfig(cfg *types.Config, path string) error {
 	}
 
 	if cfg.Frontend.ClCurrency == "" {
-		//switch cfg.Chain.Name {
-		//case "gnosis":
-		cfg.Frontend.MainCurrency = "GNO"
-		cfg.Frontend.ClCurrency = "mGNO"
-		cfg.Frontend.ClCurrencyDecimals = 18
-		cfg.Frontend.ClCurrencyDivisor = 1e9
-		/*default:
+		switch cfg.Chain.Name {
+		case "gnosis":
+			cfg.Frontend.MainCurrency = "GNO"
+			cfg.Frontend.ClCurrency = "mGNO"
+			cfg.Frontend.ClCurrencyDecimals = 18
+			cfg.Frontend.ClCurrencyDivisor = 1e9
+		default:
 			cfg.Frontend.MainCurrency = "ETH"
 			cfg.Frontend.ClCurrency = "ETH"
 			cfg.Frontend.ClCurrencyDecimals = 18
 			cfg.Frontend.ClCurrencyDivisor = 1e9
-		}*/
+		}
 	}
 
 	if cfg.Frontend.ElCurrency == "" {
-		//switch cfg.Chain.Name {
-		//case "gnosis":
-		cfg.Frontend.ElCurrency = "xDAI"
-		cfg.Frontend.ElCurrencyDecimals = 18
-		cfg.Frontend.ElCurrencyDivisor = 1e18
-		/*default:
+		switch cfg.Chain.Name {
+		case "gnosis":
+			cfg.Frontend.ElCurrency = "xDAI"
+			cfg.Frontend.ElCurrencyDecimals = 18
+			cfg.Frontend.ElCurrencyDivisor = 1e18
+		default:
 			cfg.Frontend.ElCurrency = "ETH"
 			cfg.Frontend.ElCurrencyDecimals = 18
 			cfg.Frontend.ElCurrencyDivisor = 1e18
-		}*/
+		}
 	}
 
 	if cfg.Frontend.SiteTitle == "" {