format fixes for gasLine and price, cleanup

Author: benleb

cmd/common.go

@@ -454,10 +454,11 @@ func formatEvent(g *gocui.Gui, event *collections.Event, nodes *node.Nodes, wall
 	eventWithStyle.EtherscanURL = etherscanURL
 
 	// price
+	price, _ := priceEther.Float64()
 	if event.EventType == collections.Listing {
-		out.WriteString(" " + priceStyle.Render(style.TerminalLink(openseaURL, fmt.Sprintf("%6.3f", priceEther))))
+		out.WriteString(" " + priceStyle.Render(style.TerminalLink(openseaURL, fmt.Sprintf("%6.3f", price))))
 	} else {
-		out.WriteString(" " + priceStyle.Render(fmt.Sprintf("%6.3f", priceEther)))
+		out.WriteString(" " + priceStyle.Render(fmt.Sprintf("%6.3f", price)))
 	}
 
 	out.WriteString(formattedCurrencySymbol)

cmd/live.go

@@ -166,9 +166,7 @@ func live(_ *cobra.Command, _ []string) {
 	// create a new chainserver instance
 	cWatcher = server.New()
 	// subscribe to the chain logs/events and start the workers
-	cWatcher.Subscribe(&queueEvents)
-	// old type (while migrating to new snode.Node type (will be renamed from snode to node after))
-	// nodes := cWatcher.GetNodesAsGBNodeCollection()
+	go cWatcher.Subscribe(&queueEvents)
 
 	// websockets server
 	if viper.GetBool("server.websockets.enabled") {
@@ -315,7 +313,7 @@ func live(_ *cobra.Command, _ []string) {
 		}()
 	}
 
-	QueueStatsLive(&queueEvents, queueLogs, queueListings, &queueOutput, &queueOutWS)
+	go QueueStatsLive(&queueEvents, queueLogs, queueListings, &queueOutput, &queueOutWS)
 
 	select {}
 }

internal/ticker/gas.go

@@ -42,18 +42,27 @@ func GasTicker(gasTicker *time.Ticker, nodes *node.Nodes, queueOutput *chan stri
 
 				oldGasPrice = gasPrice
 
+				// // tip / priority fee
+				// var gasTip int
+				// if gasInfo.GasTipWei.Cmp(big.NewInt(0)) > 0 {
+				// 	gasTipGwei, _ := node.WeiToGwei(gasInfo.GasTipWei).Float64()
+				// 	gasTip = int(math.Round(gasTipGwei))
+				// 	fmt.Printf("gasInfo.GasTipWei: %+v | gasTipGwei: %+v | gasTip: %+v\n", gasInfo.GasTipWei, gasTipGwei, gasTip)
+				// }
+
 				intro := style.DarkerGrayStyle.Render("~  ") + style.DarkGrayStyle.Render("gas") + style.DarkerGrayStyle.Render("  ~   ")
 				outro := style.DarkerGrayStyle.Render("   ~   ~")
-				formattedGas := style.LightGrayStyle.Render(fmt.Sprintf("%d", gasPrice)) + style.DarkGrayStyle.Render("gw")
 				divider := style.DarkerGrayStyle.Render("   ~   ~   ~   ~   ~   ~   ")
 
-				gasLine.WriteString(intro + formattedGas + divider + formattedGas + divider + formattedGas + outro)
+				formattedGas := style.GrayStyle.Render(fmt.Sprintf("%d", gasPrice)) + style.DarkGrayStyle.Render("gw")
+				formattedGasAndTip := formattedGas
+
+				// if gasTip > 0 {
+				// 	formattedGasAndTip = formattedGas + "|" + style.GrayStyle.Render(fmt.Sprintf("%d", gasTip)) + style.DarkGrayStyle.Render("gw")
+				// }
+
+				gasLine.WriteString(intro + formattedGas + divider + formattedGasAndTip + divider + formattedGas + outro)
 			}
-			// // tip / priority fee
-			// if gasInfo.GasTipWei.Cmp(big.NewInt(0)) > 0 {
-			// 	gasTipGwei, _ := weiToGwei(gasInfo.GasTipWei).Float64()
-			// 	gasLine.WriteString(style.GrayStyle.Render(fmt.Sprintf("  |  tip: %d", int(math.Ceil(gasTipGwei)))))
-			// }
 		}
 
 		*queueOutput <- gasLine.String()